summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-06 15:56:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-06 15:56:29 -0800
commit9144f3821d2cba9f16cdf3ff1b881384f4b68b53 (patch)
treef5835554ac585c56e76e6fd66b49d9ca81bcf19c /mm
parent6572a281cfd805dd54718597d6c33261b5be052b (diff)
parent6597cb84c86cefe4e174533b79e17b86f634b5e0 (diff)
downloadop-kernel-dev-9144f3821d2cba9f16cdf3ff1b881384f4b68b53.zip
op-kernel-dev-9144f3821d2cba9f16cdf3ff1b881384f4b68b53.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] xsc3: fix xsc3_l2_inv_range [ARM] mm: fix page table initialization [ARM] fix naming of MODULE_START / MODULE_END ARM: OMAP: Fix define for twl4030 irqs ARM: OMAP: Fix get_irqnr_and_base to clear spurious interrupt bits ARM: OMAP: Fix debugfs_create_*'s error checking method for arm/plat-omap ARM: OMAP: Fix compiler warnings in gpmc.c [ARM] fix VFP+softfloat binaries
Diffstat (limited to 'mm')
-rw-r--r--mm/vmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index f1cc03b..66fad3f 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -178,7 +178,7 @@ static int vmap_page_range(unsigned long addr, unsigned long end,
static inline int is_vmalloc_or_module_addr(const void *x)
{
/*
- * x86-64 and sparc64 put modules in a special place,
+ * ARM, x86-64 and sparc64 put modules in a special place,
* and fall back on vmalloc() if that fails. Others
* just put it in the vmalloc space.
*/
OpenPOWER on IntegriCloud