Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-zesty-kernel.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 4fc9be955c712ca4b68c25b18d1ac9599df2a3ae..467d8b923fcdad7a55dce597e80dd39eab170230 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -162,10 +162,13 @@ extern int unaligned_enabled;
 #endif
 
 #ifdef CONFIG_IA64
-extern int no_unaligned_warning;
 extern int unaligned_dump_stack;
 #endif
 
+#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
+extern int no_unaligned_warning;
+#endif
+
 #ifdef CONFIG_PROC_SYSCTL
 static int proc_do_cad_pid(struct ctl_table *table, int write,
                  void __user *buffer, size_t *lenp, loff_t *ppos);
@@ -919,7 +922,7 @@ static struct ctl_table kern_table[] = {
                .proc_handler   = proc_doulongvec_minmax,
        },
 #endif
-#ifdef CONFIG_IA64
+#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
        {
                .procname       = "ignore-unaligned-usertrap",
                .data           = &no_unaligned_warning,
@@ -927,6 +930,8 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
+#endif
+#ifdef CONFIG_IA64
        {
                .procname       = "unaligned-dump-stack",
                .data           = &unaligned_dump_stack,