aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/acpi/nfit.c2
-rw-r--r--drivers/acpi/osl.c2
-rw-r--r--drivers/block/nvme-core.c2
-rw-r--r--drivers/edac/i3200_edac.c2
-rw-r--r--drivers/edac/ie31200_edac.c2
-rw-r--r--drivers/edac/x38_edac.c2
-rw-r--r--drivers/i2c/busses/i2c-ismt.c2
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_osdep.h2
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40e_osdep.h2
-rw-r--r--drivers/net/ethernet/rocker/rocker.c2
-rw-r--r--drivers/platform/x86/ibm_rtl.c2
-rw-r--r--drivers/platform/x86/intel_ips.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_nx.c2
-rw-r--r--include/linux/io-64-nonatomic-hi-lo.h (renamed from include/asm-generic/io-64-nonatomic-hi-lo.h)6
-rw-r--r--include/linux/io-64-nonatomic-lo-hi.h (renamed from include/asm-generic/io-64-nonatomic-lo-hi.h)6
15 files changed, 19 insertions, 19 deletions
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c
index c1b8d03e262e..a14ee291d1a7 100644
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@ -27,7 +27,7 @@
27 * For readq() and writeq() on 32-bit builds, the hi-lo, lo-hi order is 27 * For readq() and writeq() on 32-bit builds, the hi-lo, lo-hi order is
28 * irrelevant. 28 * irrelevant.
29 */ 29 */
30#include <asm-generic/io-64-nonatomic-hi-lo.h> 30#include <linux/io-64-nonatomic-hi-lo.h>
31 31
32static bool force_enable_dimms; 32static bool force_enable_dimms;
33module_param(force_enable_dimms, bool, S_IRUGO|S_IWUSR); 33module_param(force_enable_dimms, bool, S_IRUGO|S_IWUSR);
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 739a4a6b3b9b..7d0848190b75 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -43,7 +43,7 @@
43 43
44#include <asm/io.h> 44#include <asm/io.h>
45#include <asm/uaccess.h> 45#include <asm/uaccess.h>
46#include <asm-generic/io-64-nonatomic-lo-hi.h> 46#include <linux/io-64-nonatomic-lo-hi.h>
47 47
48#include "internal.h" 48#include "internal.h"
49 49
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 6f04771f1019..c962527305f7 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -41,7 +41,7 @@
41#include <linux/t10-pi.h> 41#include <linux/t10-pi.h>
42#include <linux/types.h> 42#include <linux/types.h>
43#include <scsi/sg.h> 43#include <scsi/sg.h>
44#include <asm-generic/io-64-nonatomic-lo-hi.h> 44#include <linux/io-64-nonatomic-lo-hi.h>
45 45
46#define NVME_MINORS (1U << MINORBITS) 46#define NVME_MINORS (1U << MINORBITS)
47#define NVME_Q_DEPTH 1024 47#define NVME_Q_DEPTH 1024
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index 4ad062b0ef26..1f453382258a 100644
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -15,7 +15,7 @@
15#include <linux/io.h> 15#include <linux/io.h>
16#include "edac_core.h" 16#include "edac_core.h"
17 17
18#include <asm-generic/io-64-nonatomic-lo-hi.h> 18#include <linux/io-64-nonatomic-lo-hi.h>
19 19
20#define I3200_REVISION "1.1" 20#define I3200_REVISION "1.1"
21 21
diff --git a/drivers/edac/ie31200_edac.c b/drivers/edac/ie31200_edac.c
index a981dc6fd88e..18d77ace4813 100644
--- a/drivers/edac/ie31200_edac.c
+++ b/drivers/edac/ie31200_edac.c
@@ -39,7 +39,7 @@
39#include <linux/pci_ids.h> 39#include <linux/pci_ids.h>
40#include <linux/edac.h> 40#include <linux/edac.h>
41 41
42#include <asm-generic/io-64-nonatomic-lo-hi.h> 42#include <linux/io-64-nonatomic-lo-hi.h>
43#include "edac_core.h" 43#include "edac_core.h"
44 44
45#define IE31200_REVISION "1.0" 45#define IE31200_REVISION "1.0"
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
index 7c5cdc62f31c..314cf5cf268c 100644
--- a/drivers/edac/x38_edac.c
+++ b/drivers/edac/x38_edac.c
@@ -15,7 +15,7 @@
15#include <linux/pci_ids.h> 15#include <linux/pci_ids.h>
16#include <linux/edac.h> 16#include <linux/edac.h>
17 17
18#include <asm-generic/io-64-nonatomic-lo-hi.h> 18#include <linux/io-64-nonatomic-lo-hi.h>
19#include "edac_core.h" 19#include "edac_core.h"
20 20
21#define X38_REVISION "1.1" 21#define X38_REVISION "1.1"
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c
index f994712d0904..39becbbdfd99 100644
--- a/drivers/i2c/busses/i2c-ismt.c
+++ b/drivers/i2c/busses/i2c-ismt.c
@@ -67,7 +67,7 @@
67#include <linux/acpi.h> 67#include <linux/acpi.h>
68#include <linux/interrupt.h> 68#include <linux/interrupt.h>
69 69
70#include <asm-generic/io-64-nonatomic-lo-hi.h> 70#include <linux/io-64-nonatomic-lo-hi.h>
71 71
72/* PCI Address Constants */ 72/* PCI Address Constants */
73#define SMBBAR 0 73#define SMBBAR 0
diff --git a/drivers/net/ethernet/intel/i40e/i40e_osdep.h b/drivers/net/ethernet/intel/i40e/i40e_osdep.h
index ad802dd0f67a..5b6feb7edeb1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_osdep.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_osdep.h
@@ -35,7 +35,7 @@
35#include <linux/highuid.h> 35#include <linux/highuid.h>
36 36
37/* get readq/writeq support for 32 bit kernels, use the low-first version */ 37/* get readq/writeq support for 32 bit kernels, use the low-first version */
38#include <asm-generic/io-64-nonatomic-lo-hi.h> 38#include <linux/io-64-nonatomic-lo-hi.h>
39 39
40/* File to be the magic between shared code and 40/* File to be the magic between shared code and
41 * actual OS primitives 41 * actual OS primitives
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_osdep.h b/drivers/net/ethernet/intel/i40evf/i40e_osdep.h
index 21a91b14bf81..5e314fd3c016 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_osdep.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_osdep.h
@@ -34,7 +34,7 @@
34#include <linux/pci.h> 34#include <linux/pci.h>
35 35
36/* get readq/writeq support for 32 bit kernels, use the low-first version */ 36/* get readq/writeq support for 32 bit kernels, use the low-first version */
37#include <asm-generic/io-64-nonatomic-lo-hi.h> 37#include <linux/io-64-nonatomic-lo-hi.h>
38 38
39/* File to be the magic between shared code and 39/* File to be the magic between shared code and
40 * actual OS primitives 40 * actual OS primitives
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 34ac41ac9e61..7ca1abbc0d05 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -36,7 +36,7 @@
36#include <net/ip_fib.h> 36#include <net/ip_fib.h>
37#include <net/netevent.h> 37#include <net/netevent.h>
38#include <net/arp.h> 38#include <net/arp.h>
39#include <asm-generic/io-64-nonatomic-lo-hi.h> 39#include <linux/io-64-nonatomic-lo-hi.h>
40#include <generated/utsrelease.h> 40#include <generated/utsrelease.h>
41 41
42#include "rocker.h" 42#include "rocker.h"
diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
index 97c2be195efc..c62e5e11ca4b 100644
--- a/drivers/platform/x86/ibm_rtl.c
+++ b/drivers/platform/x86/ibm_rtl.c
@@ -33,7 +33,7 @@
33#include <linux/mutex.h> 33#include <linux/mutex.h>
34#include <asm/bios_ebda.h> 34#include <asm/bios_ebda.h>
35 35
36#include <asm-generic/io-64-nonatomic-lo-hi.h> 36#include <linux/io-64-nonatomic-lo-hi.h>
37 37
38static bool force; 38static bool force;
39module_param(force, bool, 0); 39module_param(force, bool, 0);
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index e2065e06a3f3..55663b3d7282 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -78,7 +78,7 @@
78#include <asm/processor.h> 78#include <asm/processor.h>
79#include "intel_ips.h" 79#include "intel_ips.h"
80 80
81#include <asm-generic/io-64-nonatomic-lo-hi.h> 81#include <linux/io-64-nonatomic-lo-hi.h>
82 82
83#define PCI_DEVICE_ID_INTEL_THERMAL_SENSOR 0x3b32 83#define PCI_DEVICE_ID_INTEL_THERMAL_SENSOR 0x3b32
84 84
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 7c3365864242..ae87d6c19f17 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -12,7 +12,7 @@
12#include "ql4_glbl.h" 12#include "ql4_glbl.h"
13#include "ql4_inline.h" 13#include "ql4_inline.h"
14 14
15#include <asm-generic/io-64-nonatomic-lo-hi.h> 15#include <linux/io-64-nonatomic-lo-hi.h>
16 16
17#define TIMEOUT_100_MS 100 17#define TIMEOUT_100_MS 100
18#define MASK(n) DMA_BIT_MASK(n) 18#define MASK(n) DMA_BIT_MASK(n)
diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/linux/io-64-nonatomic-hi-lo.h
index 2e29d13fc154..11d7e840d913 100644
--- a/include/asm-generic/io-64-nonatomic-hi-lo.h
+++ b/include/linux/io-64-nonatomic-hi-lo.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_IO_64_NONATOMIC_HI_LO_H_ 1#ifndef _LINUX_IO_64_NONATOMIC_HI_LO_H_
2#define _ASM_IO_64_NONATOMIC_HI_LO_H_ 2#define _LINUX_IO_64_NONATOMIC_HI_LO_H_
3 3
4#include <linux/io.h> 4#include <linux/io.h>
5#include <asm-generic/int-ll64.h> 5#include <asm-generic/int-ll64.h>
@@ -29,4 +29,4 @@ static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr)
29#define writeq hi_lo_writeq 29#define writeq hi_lo_writeq
30#endif 30#endif
31 31
32#endif /* _ASM_IO_64_NONATOMIC_HI_LO_H_ */ 32#endif /* _LINUX_IO_64_NONATOMIC_HI_LO_H_ */
diff --git a/include/asm-generic/io-64-nonatomic-lo-hi.h b/include/linux/io-64-nonatomic-lo-hi.h
index 0efacff0a1ce..1a4315f97360 100644
--- a/include/asm-generic/io-64-nonatomic-lo-hi.h
+++ b/include/linux/io-64-nonatomic-lo-hi.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_IO_64_NONATOMIC_LO_HI_H_ 1#ifndef _LINUX_IO_64_NONATOMIC_LO_HI_H_
2#define _ASM_IO_64_NONATOMIC_LO_HI_H_ 2#define _LINUX_IO_64_NONATOMIC_LO_HI_H_
3 3
4#include <linux/io.h> 4#include <linux/io.h>
5#include <asm-generic/int-ll64.h> 5#include <asm-generic/int-ll64.h>
@@ -29,4 +29,4 @@ static inline void lo_hi_writeq(__u64 val, volatile void __iomem *addr)
29#define writeq lo_hi_writeq 29#define writeq lo_hi_writeq
30#endif 30#endif
31 31
32#endif /* _ASM_IO_64_NONATOMIC_LO_HI_H_ */ 32#endif /* _LINUX_IO_64_NONATOMIC_LO_HI_H_ */
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-27 02:22:50 -0400