Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cxl/pci: Rename pci.h to cxlpci.h

Similar to the mem.h rename, if the core wants to reuse definitions from
drivers/cxl/pci.h it is unable to use <pci.h> as that collides with
archs that have an arch/$arch/include/asm/pci.h, like MIPS.

Reported-by: kernel test robot <lkp@intel.com>
Acked-by: Ben Widawsky <ben.widawsky@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/164298422510.3018233.14693126572756675563.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

+4 -3
+1 -1
drivers/cxl/acpi.c
··· 6 6 #include <linux/kernel.h> 7 7 #include <linux/acpi.h> 8 8 #include <linux/pci.h> 9 + #include "cxlpci.h" 9 10 #include "cxl.h" 10 - #include "pci.h" 11 11 12 12 /* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */ 13 13 #define CFMWS_INTERLEAVE_WAYS(x) (1 << (x)->interleave_ways)
+1 -1
drivers/cxl/core/regs.c
··· 5 5 #include <linux/slab.h> 6 6 #include <linux/pci.h> 7 7 #include <cxlmem.h> 8 - #include <pci.h> 8 + #include <cxlpci.h> 9 9 10 10 /** 11 11 * DOC: cxl registers
+1 -1
drivers/cxl/pci.c
··· 10 10 #include <linux/pci.h> 11 11 #include <linux/io.h> 12 12 #include "cxlmem.h" 13 - #include "pci.h" 13 + #include "cxlpci.h" 14 14 #include "cxl.h" 15 15 16 16 /**
+1
drivers/cxl/pci.h drivers/cxl/cxlpci.h
··· 2 2 /* Copyright(c) 2020 Intel Corporation. All rights reserved. */ 3 3 #ifndef __CXL_PCI_H__ 4 4 #define __CXL_PCI_H__ 5 + #include "cxl.h" 5 6 6 7 #define CXL_MEMORY_PROGIF 0x10 7 8