Commit 27152608 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c93529ad 9f97e61b

drivers/cxl/cxl.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/log2.h>

#include <linux/node.h>

#include <linux/io.h>

#include <linux/range.h>



extern const struct nvdimm_security_ops *cxl_security_ops;

include/linux/libnvdimm.h

+10 −5
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 
 */

#ifndef __LIBNVDIMM_H__

#define __LIBNVDIMM_H__

#include <linux/kernel.h>



#include <linux/io.h>

#include <linux/sizes.h>

#include <linux/spinlock.h>

#include <linux/types.h>

#include <linux/uuid.h>

#include <linux/spinlock.h>

#include <linux/bio.h>



struct badrange_entry {

	u64 start;
@@ -80,7 +80,9 @@ typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc, 
		struct nvdimm *nvdimm, unsigned int cmd, void *buf,

		unsigned int buf_len, int *cmd_rc);



struct attribute_group;

struct device_node;

struct module;

struct nvdimm_bus_descriptor {

	const struct attribute_group **attr_groups;

	unsigned long cmd_mask;
@@ -121,6 +123,8 @@ struct nd_mapping_desc { 
	int position;

};



struct bio;

struct resource;

struct nd_region;

struct nd_region_desc {

	struct resource *res;
@@ -147,8 +151,6 @@ static inline void __iomem *devm_nvdimm_ioremap(struct device *dev, 
	return (void __iomem *) devm_nvdimm_memremap(dev, offset, size, 0);

}



struct nvdimm_bus;



/*

 * Note that separate bits for locked + unlocked are defined so that

 * 'flags == 0' corresponds to an error / not-supported state.
@@ -238,6 +240,9 @@ struct nvdimm_fw_ops { 
	int (*arm)(struct nvdimm *nvdimm, enum nvdimm_fwa_trigger arg);

};



struct kobject;

struct nvdimm_bus;



void badrange_init(struct badrange *badrange);

int badrange_add(struct badrange *badrange, u64 addr, u64 length);

void badrange_forget(struct badrange *badrange, phys_addr_t start,