diff options
| author | Luck, Tony <tony.luck@intel.com> | 2009-12-14 15:00:37 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-12-14 16:40:36 -0800 |
| commit | 430677133fd5a2033222b3b5016bb461fe8fabf2 (patch) | |
| tree | fe4f8972048b2eeb692c537d64a99361c33c1482 /arch/ia64 | |
| parent | 21fc3fded7095f6018e770412b6881ced4c09d6f (diff) | |
| download | kernel_samsung_smdk4412-430677133fd5a2033222b3b5016bb461fe8fabf2.zip kernel_samsung_smdk4412-430677133fd5a2033222b3b5016bb461fe8fabf2.tar.gz kernel_samsung_smdk4412-430677133fd5a2033222b3b5016bb461fe8fabf2.tar.bz2 | |
[IA64] implement early_io{re,un}map for ia64
drivers/pci/dmar.c uses these functions, so provide them for ia64
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/io.h | 2 | ||||
| -rw-r--r-- | arch/ia64/mm/ioremap.c | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h index 0d9d16e..cc8335e 100644 --- a/arch/ia64/include/asm/io.h +++ b/arch/ia64/include/asm/io.h @@ -424,6 +424,8 @@ __writeq (unsigned long val, volatile void __iomem *addr) extern void __iomem * ioremap(unsigned long offset, unsigned long size); extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); extern void iounmap (volatile void __iomem *addr); +extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size); +extern void early_iounmap (volatile void __iomem *addr, unsigned long size); /* * String version of IO memory access ops: diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c index 2a14062..3dccdd8 100644 --- a/arch/ia64/mm/ioremap.c +++ b/arch/ia64/mm/ioremap.c @@ -22,6 +22,12 @@ __ioremap (unsigned long phys_addr) } void __iomem * +early_ioremap (unsigned long phys_addr, unsigned long size) +{ + return __ioremap(phys_addr); +} + +void __iomem * ioremap (unsigned long phys_addr, unsigned long size) { void __iomem *addr; @@ -102,6 +108,11 @@ ioremap_nocache (unsigned long phys_addr, unsigned long size) EXPORT_SYMBOL(ioremap_nocache); void +early_iounmap (volatile void __iomem *addr, unsigned long size) +{ +} + +void iounmap (volatile void __iomem *addr) { if (REGION_NUMBER(addr) == RGN_GATE) |