From 9c4020f5957da73b474533e6f1a24d0e6668c875 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Wed, 17 Dec 2008 10:09:10 +0000 Subject: [PATCH] --- yaml --- r: 123144 b: refs/heads/master c: 01695a9687e5a8d78589605037cc7828a5b67ac9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/pgtable_32.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4cbfdbb85cac..843a3e9692e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f29c3298b18216198631cbee01c349adecb225d +refs/heads/master: 01695a9687e5a8d78589605037cc7828a5b67ac9 diff --git a/trunk/arch/powerpc/mm/pgtable_32.c b/trunk/arch/powerpc/mm/pgtable_32.c index 341472440137..cd5609759d44 100644 --- a/trunk/arch/powerpc/mm/pgtable_32.c +++ b/trunk/arch/powerpc/mm/pgtable_32.c @@ -173,6 +173,7 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) if (p < 16*1024*1024) p += _ISA_MEM_BASE; +#ifndef CONFIG_CRASH_DUMP /* * Don't allow anybody to remap normal RAM that we're using. * mem_init() sets high_memory so only do the check after that. @@ -182,6 +183,7 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) (unsigned long long)p, __builtin_return_address(0)); return NULL; } +#endif if (size == 0) return NULL;