diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
| commit | ebf572b448757190027d8ee34e73deb989ec7b60 (patch) | |
| tree | 2320a92b1aed2c9475e291d75c92616af75e195a /arch/arm/mm/ioremap.c | |
| parent | 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' into bcm43xx
Diffstat (limited to 'arch/arm/mm/ioremap.c')
| -rw-r--r-- | arch/arm/mm/ioremap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index dba7dddfe57d..88a999df0ab3 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
| @@ -363,7 +363,9 @@ EXPORT_SYMBOL(__ioremap); | |||
| 363 | 363 | ||
| 364 | void __iounmap(void __iomem *addr) | 364 | void __iounmap(void __iomem *addr) |
| 365 | { | 365 | { |
| 366 | #ifndef CONFIG_SMP | ||
| 366 | struct vm_struct **p, *tmp; | 367 | struct vm_struct **p, *tmp; |
| 368 | #endif | ||
| 367 | unsigned int section_mapping = 0; | 369 | unsigned int section_mapping = 0; |
| 368 | 370 | ||
| 369 | addr = (void __iomem *)(PAGE_MASK & (unsigned long)addr); | 371 | addr = (void __iomem *)(PAGE_MASK & (unsigned long)addr); |