aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/traps.c
diff options
context:
space:
mode:
authorJoonsoo Kim <iamjoonsoo.kim@lge.com>2016-03-17 17:17:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 18:09:34 -0400
commite7df0d88c455c915376397b4bd72a83b9ed656f7 (patch)
tree20fedca055774cf883d8d5fd74c427c78dc8ea50 /arch/powerpc/kernel/traps.c
parent505f6d22dbc63f333d1178dc80264e40b5c35268 (diff)
powerpc: query dynamic DEBUG_PAGEALLOC setting
We can disable debug_pagealloc processing even if the code is compiled with CONFIG_DEBUG_PAGEALLOC. This patch changes the code to query whether it is enabled or not in runtime. Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> Acked-by: David Rientjes <rientjes@google.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Christoph Lameter <cl@linux.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
-rw-r--r--arch/powerpc/kernel/traps.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index b6becc795bb5..33c47fcc455a 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -203,9 +203,8 @@ static int __kprobes __die(const char *str, struct pt_regs *regs, long err)
203#ifdef CONFIG_SMP 203#ifdef CONFIG_SMP
204 printk("SMP NR_CPUS=%d ", NR_CPUS); 204 printk("SMP NR_CPUS=%d ", NR_CPUS);
205#endif 205#endif
206#ifdef CONFIG_DEBUG_PAGEALLOC 206 if (debug_pagealloc_enabled())
207 printk("DEBUG_PAGEALLOC "); 207 printk("DEBUG_PAGEALLOC ");
208#endif
209#ifdef CONFIG_NUMA 208#ifdef CONFIG_NUMA
210 printk("NUMA "); 209 printk("NUMA ");
211#endif 210#endif