diff options
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/pci/mmconfig.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c index 9c4f907e301c..f16c0d57c552 100644 --- a/arch/x86_64/pci/mmconfig.c +++ b/arch/x86_64/pci/mmconfig.c | |||
@@ -18,11 +18,11 @@ static DECLARE_BITMAP(fallback_slots, 32); | |||
18 | /* Static virtual mapping of the MMCONFIG aperture */ | 18 | /* Static virtual mapping of the MMCONFIG aperture */ |
19 | struct mmcfg_virt { | 19 | struct mmcfg_virt { |
20 | struct acpi_table_mcfg_config *cfg; | 20 | struct acpi_table_mcfg_config *cfg; |
21 | char *virt; | 21 | char __iomem *virt; |
22 | }; | 22 | }; |
23 | static struct mmcfg_virt *pci_mmcfg_virt; | 23 | static struct mmcfg_virt *pci_mmcfg_virt; |
24 | 24 | ||
25 | static char *get_virt(unsigned int seg, unsigned bus) | 25 | static char __iomem *get_virt(unsigned int seg, unsigned bus) |
26 | { | 26 | { |
27 | int cfg_num = -1; | 27 | int cfg_num = -1; |
28 | struct acpi_table_mcfg_config *cfg; | 28 | struct acpi_table_mcfg_config *cfg; |
@@ -43,9 +43,9 @@ static char *get_virt(unsigned int seg, unsigned bus) | |||
43 | } | 43 | } |
44 | } | 44 | } |
45 | 45 | ||
46 | static char *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn) | 46 | static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn) |
47 | { | 47 | { |
48 | char *addr; | 48 | char __iomem *addr; |
49 | if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) | 49 | if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) |
50 | return NULL; | 50 | return NULL; |
51 | addr = get_virt(seg, bus); | 51 | addr = get_virt(seg, bus); |
@@ -57,7 +57,7 @@ static char *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn | |||
57 | static int pci_mmcfg_read(unsigned int seg, unsigned int bus, | 57 | static int pci_mmcfg_read(unsigned int seg, unsigned int bus, |
58 | unsigned int devfn, int reg, int len, u32 *value) | 58 | unsigned int devfn, int reg, int len, u32 *value) |
59 | { | 59 | { |
60 | char *addr; | 60 | char __iomem *addr; |
61 | 61 | ||
62 | /* Why do we have this when nobody checks it. How about a BUG()!? -AK */ | 62 | /* Why do we have this when nobody checks it. How about a BUG()!? -AK */ |
63 | if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095))) | 63 | if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095))) |
@@ -85,7 +85,7 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus, | |||
85 | static int pci_mmcfg_write(unsigned int seg, unsigned int bus, | 85 | static int pci_mmcfg_write(unsigned int seg, unsigned int bus, |
86 | unsigned int devfn, int reg, int len, u32 value) | 86 | unsigned int devfn, int reg, int len, u32 value) |
87 | { | 87 | { |
88 | char *addr; | 88 | char __iomem *addr; |
89 | 89 | ||
90 | /* Why do we have this when nobody checks it. How about a BUG()!? -AK */ | 90 | /* Why do we have this when nobody checks it. How about a BUG()!? -AK */ |
91 | if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) | 91 | if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) |
@@ -127,7 +127,7 @@ static __init void unreachable_devices(void) | |||
127 | int i; | 127 | int i; |
128 | for (i = 0; i < 32; i++) { | 128 | for (i = 0; i < 32; i++) { |
129 | u32 val1; | 129 | u32 val1; |
130 | char *addr; | 130 | char __iomem *addr; |
131 | 131 | ||
132 | pci_conf1_read(0, 0, PCI_DEVFN(i,0), 0, 4, &val1); | 132 | pci_conf1_read(0, 0, PCI_DEVFN(i,0), 0, 4, &val1); |
133 | if (val1 == 0xffffffff) | 133 | if (val1 == 0xffffffff) |