mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 20:32:22 +00:00
move io-64-nonatomic*.h out of asm-generic
These are not implementations of default architecture code but helpers for drivers. Move them to the place they belong to. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Darren Hart <dvhart@linux.intel.com> Acked-by: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
049e6dde7e
commit
2f8e2c8777
@ -27,7 +27,7 @@
|
||||
* For readq() and writeq() on 32-bit builds, the hi-lo, lo-hi order is
|
||||
* irrelevant.
|
||||
*/
|
||||
#include <asm-generic/io-64-nonatomic-hi-lo.h>
|
||||
#include <linux/io-64-nonatomic-hi-lo.h>
|
||||
|
||||
static bool force_enable_dimms;
|
||||
module_param(force_enable_dimms, bool, S_IRUGO|S_IWUSR);
|
||||
|
@ -43,7 +43,7 @@
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include <linux/t10-pi.h>
|
||||
#include <linux/types.h>
|
||||
#include <scsi/sg.h>
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
#define NVME_MINORS (1U << MINORBITS)
|
||||
#define NVME_Q_DEPTH 1024
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <linux/io.h>
|
||||
#include "edac_core.h"
|
||||
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
#define I3200_REVISION "1.1"
|
||||
|
||||
|
@ -39,7 +39,7 @@
|
||||
#include <linux/pci_ids.h>
|
||||
#include <linux/edac.h>
|
||||
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
#include "edac_core.h"
|
||||
|
||||
#define IE31200_REVISION "1.0"
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <linux/pci_ids.h>
|
||||
#include <linux/edac.h>
|
||||
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
#include "edac_core.h"
|
||||
|
||||
#define X38_REVISION "1.1"
|
||||
|
@ -67,7 +67,7 @@
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
/* PCI Address Constants */
|
||||
#define SMBBAR 0
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <linux/highuid.h>
|
||||
|
||||
/* get readq/writeq support for 32 bit kernels, use the low-first version */
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
/* File to be the magic between shared code and
|
||||
* actual OS primitives
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include <linux/pci.h>
|
||||
|
||||
/* get readq/writeq support for 32 bit kernels, use the low-first version */
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
/* File to be the magic between shared code and
|
||||
* actual OS primitives
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include <net/ip_fib.h>
|
||||
#include <net/netevent.h>
|
||||
#include <net/arp.h>
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
#include <generated/utsrelease.h>
|
||||
|
||||
#include "rocker.h"
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <linux/mutex.h>
|
||||
#include <asm/bios_ebda.h>
|
||||
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
static bool force;
|
||||
module_param(force, bool, 0);
|
||||
|
@ -78,7 +78,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include "intel_ips.h"
|
||||
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
#define PCI_DEVICE_ID_INTEL_THERMAL_SENSOR 0x3b32
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include "ql4_glbl.h"
|
||||
#include "ql4_inline.h"
|
||||
|
||||
#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
|
||||
#define TIMEOUT_100_MS 100
|
||||
#define MASK(n) DMA_BIT_MASK(n)
|
||||
|
@ -1,5 +1,5 @@
|
||||
#ifndef _ASM_IO_64_NONATOMIC_HI_LO_H_
|
||||
#define _ASM_IO_64_NONATOMIC_HI_LO_H_
|
||||
#ifndef _LINUX_IO_64_NONATOMIC_HI_LO_H_
|
||||
#define _LINUX_IO_64_NONATOMIC_HI_LO_H_
|
||||
|
||||
#include <linux/io.h>
|
||||
#include <asm-generic/int-ll64.h>
|
||||
@ -29,4 +29,4 @@ static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr)
|
||||
#define writeq hi_lo_writeq
|
||||
#endif
|
||||
|
||||
#endif /* _ASM_IO_64_NONATOMIC_HI_LO_H_ */
|
||||
#endif /* _LINUX_IO_64_NONATOMIC_HI_LO_H_ */
|
@ -1,5 +1,5 @@
|
||||
#ifndef _ASM_IO_64_NONATOMIC_LO_HI_H_
|
||||
#define _ASM_IO_64_NONATOMIC_LO_HI_H_
|
||||
#ifndef _LINUX_IO_64_NONATOMIC_LO_HI_H_
|
||||
#define _LINUX_IO_64_NONATOMIC_LO_HI_H_
|
||||
|
||||
#include <linux/io.h>
|
||||
#include <asm-generic/int-ll64.h>
|
||||
@ -29,4 +29,4 @@ static inline void lo_hi_writeq(__u64 val, volatile void __iomem *addr)
|
||||
#define writeq lo_hi_writeq
|
||||
#endif
|
||||
|
||||
#endif /* _ASM_IO_64_NONATOMIC_LO_HI_H_ */
|
||||
#endif /* _LINUX_IO_64_NONATOMIC_LO_HI_H_ */
|
Loading…
Reference in New Issue
Block a user