Skip to content

Commit 2715260

Browse files
committed
Merge tag 'libnvdimm-for-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm updates from Ira Weiny: "Header file cleanups. Specifically use specific headers rather than just kernel.h in libnvdimm.h to reduce header file usage. The second patch is a fix to CXL but is going through my tree as a libnvdimm patch caused the issue" * tag 'libnvdimm-for-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: cxl: Include range.h in cxl.h libnvdimm: Don't use "proxy" headers
2 parents c93529a + 9f97e61 commit 2715260

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

drivers/cxl/cxl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/log2.h>
1212
#include <linux/node.h>
1313
#include <linux/io.h>
14+
#include <linux/range.h>
1415

1516
extern const struct nvdimm_security_ops *cxl_security_ops;
1617

include/linux/libnvdimm.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
*/
77
#ifndef __LIBNVDIMM_H__
88
#define __LIBNVDIMM_H__
9-
#include <linux/kernel.h>
9+
10+
#include <linux/io.h>
1011
#include <linux/sizes.h>
12+
#include <linux/spinlock.h>
1113
#include <linux/types.h>
1214
#include <linux/uuid.h>
13-
#include <linux/spinlock.h>
14-
#include <linux/bio.h>
1515

1616
struct badrange_entry {
1717
u64 start;
@@ -80,7 +80,9 @@ typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc,
8080
struct nvdimm *nvdimm, unsigned int cmd, void *buf,
8181
unsigned int buf_len, int *cmd_rc);
8282

83+
struct attribute_group;
8384
struct device_node;
85+
struct module;
8486
struct nvdimm_bus_descriptor {
8587
const struct attribute_group **attr_groups;
8688
unsigned long cmd_mask;
@@ -121,6 +123,8 @@ struct nd_mapping_desc {
121123
int position;
122124
};
123125

126+
struct bio;
127+
struct resource;
124128
struct nd_region;
125129
struct nd_region_desc {
126130
struct resource *res;
@@ -147,8 +151,6 @@ static inline void __iomem *devm_nvdimm_ioremap(struct device *dev,
147151
return (void __iomem *) devm_nvdimm_memremap(dev, offset, size, 0);
148152
}
149153

150-
struct nvdimm_bus;
151-
152154
/*
153155
* Note that separate bits for locked + unlocked are defined so that
154156
* 'flags == 0' corresponds to an error / not-supported state.
@@ -238,6 +240,9 @@ struct nvdimm_fw_ops {
238240
int (*arm)(struct nvdimm *nvdimm, enum nvdimm_fwa_trigger arg);
239241
};
240242

243+
struct kobject;
244+
struct nvdimm_bus;
245+
241246
void badrange_init(struct badrange *badrange);
242247
int badrange_add(struct badrange *badrange, u64 addr, u64 length);
243248
void badrange_forget(struct badrange *badrange, phys_addr_t start,

0 commit comments

Comments
 (0)