|
@@ -161,10 +161,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);
|
|
@@ -911,7 +914,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,
|
|
@@ -919,6 +922,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,
|