summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-03-28 14:42:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 17:14:36 -0700
commitd034cfab4f7b9e768c5c1caaa56c5bd4805d2b92 (patch)
treedd696a4873b3c6207d5818c91bbc92771f0e5d4d
parent7d7f98488b203cbf78538698cf5d937f670d96d3 (diff)
downloadlinux-stable-d034cfab4f7b9e768c5c1caaa56c5bd4805d2b92.tar.gz
linux-stable-d034cfab4f7b9e768c5c1caaa56c5bd4805d2b92.tar.bz2
linux-stable-d034cfab4f7b9e768c5c1caaa56c5bd4805d2b92.zip
kexec: crash: don't save swapper_pg_dir for !CONFIG_MMU configurations
nommu platforms don't have very interesting swapper_pg_dir pointers and usually just #define them to NULL, meaning that we can't include them in the vmcoreinfo on the kexec crash path. This patch only saves the swapper_pg_dir if we have an MMU. Signed-off-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Simon Horman <horms@verge.net.au> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/kexec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index a6a675cb9818..769e347c5196 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1462,7 +1462,9 @@ static int __init crash_save_vmcoreinfo_init(void)
VMCOREINFO_SYMBOL(init_uts_ns);
VMCOREINFO_SYMBOL(node_online_map);
+#ifdef CONFIG_MMU
VMCOREINFO_SYMBOL(swapper_pg_dir);
+#endif
VMCOREINFO_SYMBOL(_stext);
VMCOREINFO_SYMBOL(vmlist);