Commit b49381e7 authored by Linus Torvalds's avatar Linus Torvalds

Fix up some of the basic x86 offenders on __iomem usage.

parent 5d9cb4db
...@@ -72,7 +72,7 @@ void dma_free_coherent(struct device *dev, size_t size, ...@@ -72,7 +72,7 @@ void dma_free_coherent(struct device *dev, size_t size,
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags) dma_addr_t device_addr, size_t size, int flags)
{ {
void *mem_base; void __iomem *mem_base;
int pages = size >> PAGE_SHIFT; int pages = size >> PAGE_SHIFT;
int bitmap_size = (pages + 31)/32; int bitmap_size = (pages + 31)/32;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/* The physical address of the MMCONFIG aperture. Set from ACPI tables. */ /* The physical address of the MMCONFIG aperture. Set from ACPI tables. */
u32 pci_mmcfg_base_addr; u32 pci_mmcfg_base_addr;
#define mmcfg_virt_addr (fix_to_virt(FIX_PCIE_MCFG)) #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
/* The base address of the last MMCONFIG device accessed */ /* The base address of the last MMCONFIG device accessed */
static u32 mmcfg_last_accessed_device; static u32 mmcfg_last_accessed_device;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
/* Simple VGA output */ /* Simple VGA output */
#ifdef __i386__ #ifdef __i386__
#define VGABASE __pa((void *)(__PAGE_OFFSET + 0xb8000UL)) #define VGABASE (__ISA_IO_base + 0xb8000)
#else #else
#define VGABASE 0xffffffff800b8000UL #define VGABASE 0xffffffff800b8000UL
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment