/[linux-patches]/genpatches-2.6/tags/2.6.19-3/4405_alpha-sysctl-uac.patch
Gentoo

Diff of /genpatches-2.6/tags/2.6.19-3/4405_alpha-sysctl-uac.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 662 Revision 669
1Index: linux-2.6.18/arch/alpha/Kconfig 1Index: linux-2.6.19/arch/alpha/Kconfig
2=================================================================== 2===================================================================
3--- linux-2.6.18.orig/arch/alpha/Kconfig 3--- linux-2.6.19.orig/arch/alpha/Kconfig
4+++ linux-2.6.18/arch/alpha/Kconfig 4+++ linux-2.6.19/arch/alpha/Kconfig
5@@ -590,6 +590,32 @@ config VERBOSE_MCHECK_ON 5@@ -590,6 +590,32 @@ config VERBOSE_MCHECK_ON
6 6
7 Take the default (1) unless you want more control or more info. 7 Take the default (1) unless you want more control or more info.
8 8
9+config ALPHA_UAC_SYSCTL 9+config ALPHA_UAC_SYSCTL
33+ This is pretty harmless. Say Y if you're not sure. 33+ This is pretty harmless. Say Y if you're not sure.
34+ 34+
35 source "drivers/pci/Kconfig" 35 source "drivers/pci/Kconfig"
36 source "drivers/eisa/Kconfig" 36 source "drivers/eisa/Kconfig"
37 37
38Index: linux-2.6.18/arch/alpha/kernel/traps.c 38Index: linux-2.6.19/arch/alpha/kernel/traps.c
39=================================================================== 39===================================================================
40--- linux-2.6.18.orig/arch/alpha/kernel/traps.c 40--- linux-2.6.19.orig/arch/alpha/kernel/traps.c
41+++ linux-2.6.18/arch/alpha/kernel/traps.c 41+++ linux-2.6.19/arch/alpha/kernel/traps.c
42@@ -14,6 +14,7 @@ 42@@ -14,6 +14,7 @@
43 #include <linux/delay.h> 43 #include <linux/delay.h>
44 #include <linux/smp_lock.h> 44 #include <linux/smp_lock.h>
45 #include <linux/module.h> 45 #include <linux/module.h>
46+#include <linux/sysctl.h> 46+#include <linux/sysctl.h>
121 wrent(entSys, 5); 121 wrent(entSys, 5);
122 wrent(entDbg, 6); 122 wrent(entDbg, 6);
123 } 123 }
124+ 124+
125+__initcall(init_uac_sysctl); 125+__initcall(init_uac_sysctl);
126Index: linux-2.6.18/include/linux/sysctl.h 126Index: linux-2.6.19/include/linux/sysctl.h
127=================================================================== 127===================================================================
128--- linux-2.6.18.orig/include/linux/sysctl.h 128--- linux-2.6.19.orig/include/linux/sysctl.h
129+++ linux-2.6.18/include/linux/sysctl.h 129+++ linux-2.6.19/include/linux/sysctl.h
130@@ -151,6 +151,9 @@ enum 130@@ -153,6 +153,9 @@ enum
131 KERN_COMPAT_LOG=73, /* int: print compat layer messages */ 131 KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
132 KERN_MAX_LOCK_DEPTH=74, 132 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
133 KERN_FBSPLASH=75, /* string: path to fbsplash helper */ 133 KERN_FBSPLASH=77, /* string: path to fbsplash helper */
134+#ifdef CONFIG_ALPHA_UAC_SYSCTL 134+#ifdef CONFIG_ALPHA_UAC_SYSCTL
135+ KERN_UAC_POLICY=76, /* int: Alpha unaligned access control policy flags */ 135+ KERN_UAC_POLICY=78, /* int: Alpha unaligned access control policy flags */
136+#endif /* CONFIG_ALPHA_UAC_SYSCTL */ 136+#endif /* CONFIG_ALPHA_UAC_SYSCTL */
137 }; 137 };
138 138
139 139
140@@ -238,6 +241,17 @@ enum 140@@ -241,6 +244,17 @@ enum
141 PTY_NR=2 141 PTY_NR=2
142 }; 142 };
143 143
144+#ifdef CONFIG_ALPHA_UAC_SYSCTL 144+#ifdef CONFIG_ALPHA_UAC_SYSCTL
145+/* /proc/sys/kernel/uac */ 145+/* /proc/sys/kernel/uac */
153+#endif /* CONFIG_ALPHA_UAC_SYSCTL */ 153+#endif /* CONFIG_ALPHA_UAC_SYSCTL */
154+ 154+
155 /* /proc/sys/bus/isa */ 155 /* /proc/sys/bus/isa */
156 enum 156 enum
157 { 157 {
158Index: linux-2.6.18/kernel/sysctl.c 158Index: linux-2.6.19/kernel/sysctl.c
159=================================================================== 159===================================================================
160--- linux-2.6.18.orig/kernel/sysctl.c 160--- linux-2.6.19.orig/kernel/sysctl.c
161+++ linux-2.6.18/kernel/sysctl.c 161+++ linux-2.6.19/kernel/sysctl.c
162@@ -164,6 +164,9 @@ extern ctl_table inotify_table[]; 162@@ -162,6 +162,9 @@ extern ctl_table inotify_table[];
163 #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT 163 #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
164 int sysctl_legacy_va_layout; 164 int sysctl_legacy_va_layout;
165 #endif 165 #endif
166+#ifdef CONFIG_ALPHA_UAC_SYSCTL 166+#ifdef CONFIG_ALPHA_UAC_SYSCTL
167+extern ctl_table uac_table[]; 167+extern ctl_table uac_table[];
168+#endif 168+#endif
169 169
170 /* /proc declarations: */ 170 /* /proc declarations: */
171 171
172@@ -226,7 +229,14 @@ static ctl_table root_table[] = { 172@@ -224,7 +227,14 @@ static ctl_table root_table[] = {
173 .mode = 0555, 173 .mode = 0555,
174 .child = dev_table, 174 .child = dev_table,
175 }, 175 },
176- 176-
177+#ifdef CONFIG_ALPHA_UAC_SYSCTL 177+#ifdef CONFIG_ALPHA_UAC_SYSCTL

Legend:
Removed from v.662  
changed lines
  Added in v.669

  ViewVC Help
Powered by ViewVC 1.1.20