| Message ID | 20250122235159.2716036-13-dave.jiang@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | cxl: Add CXL feature commands support via fwctl | expand |
On Wed, 22 Jan 2025 16:50:43 -0700 Dave Jiang <dave.jiang@intel.com> wrote: > In preparation of more cxl headers, create a cxl directory under > uapi. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Dave Jiang wrote: > In preparation of more cxl headers, create a cxl directory under > uapi. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> This theoretically build breaks userspace that was looking at the old directory path. What's wrong with adding to cxl_mem.h?
diff --git a/MAINTAINERS b/MAINTAINERS index 877eb301b1e5..d5a38bdbf2c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5775,7 +5775,6 @@ S: Maintained F: Documentation/driver-api/cxl F: drivers/cxl/ F: include/cxl/ -F: include/uapi/linux/cxl_mem.h F: tools/testing/cxl/ COMPUTE EXPRESS LINK PMU (CPMU) diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 55c55685cb39..e82c84b2edb5 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -2,7 +2,7 @@ /* Copyright(c) 2020-2021 Intel Corporation. */ #ifndef __CXL_MEM_H__ #define __CXL_MEM_H__ -#include <uapi/linux/cxl_mem.h> +#include <uapi/cxl/mem.h> #include <linux/pci.h> #include <linux/cdev.h> #include <linux/uuid.h> diff --git a/include/cxl/mailbox.h b/include/cxl/mailbox.h index 1157b19175a5..9b7bd59f5fa4 100644 --- a/include/cxl/mailbox.h +++ b/include/cxl/mailbox.h @@ -4,8 +4,8 @@ #define __CXL_MBOX_H__ #include <linux/rcuwait.h> #include <cxl/features.h> +#include <uapi/cxl/mem.h> #include <uapi/fwctl/cxl.h> -#include <uapi/linux/cxl_mem.h> /** * struct cxl_mbox_cmd - A command to be submitted to hardware. diff --git a/include/uapi/linux/cxl_mem.h b/include/uapi/cxl/mem.h similarity index 100% rename from include/uapi/linux/cxl_mem.h rename to include/uapi/cxl/mem.h
In preparation of more cxl headers, create a cxl directory under uapi. Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- MAINTAINERS | 1 - drivers/cxl/cxlmem.h | 2 +- include/cxl/mailbox.h | 2 +- include/uapi/{linux/cxl_mem.h => cxl/mem.h} | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename include/uapi/{linux/cxl_mem.h => cxl/mem.h} (100%)