/[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 32 Revision 34
1diff -X dontdiff -urNp linux-2.6.11-rc1-bk8/arch/alpha/Kconfig linux-dsd/arch/alpha/Kconfig 1diff -urNpX dontdiff linux-2.6.12-gentoo/arch/alpha/Kconfig linux-dsd/arch/alpha/Kconfig
2--- linux-2.6.11-rc1-bk8/arch/alpha/Kconfig 2005-01-21 19:21:07.000000000 +0000 2--- linux-2.6.12-gentoo/arch/alpha/Kconfig 2005-06-18 17:22:51.000000000 +0100
3+++ linux-dsd/arch/alpha/Kconfig 2005-01-21 19:36:16.166878648 +0000 3+++ linux-dsd/arch/alpha/Kconfig 2005-06-18 17:47:00.000000000 +0100
4@@ -558,6 +558,32 @@ config VERBOSE_MCHECK_ON 4@@ -562,6 +562,32 @@ config VERBOSE_MCHECK_ON
5 5
6 Take the default (1) unless you want more control or more info. 6 Take the default (1) unless you want more control or more info.
7 7
8+config ALPHA_UAC_SYSCTL 8+config ALPHA_UAC_SYSCTL
9+ bool "Configure UAC policy via sysctl" 9+ bool "Configure UAC policy via sysctl"
32+ This is pretty harmless. Say Y if you're not sure. 32+ This is pretty harmless. Say Y if you're not sure.
33+ 33+
34 source "drivers/pci/Kconfig" 34 source "drivers/pci/Kconfig"
35 source "drivers/eisa/Kconfig" 35 source "drivers/eisa/Kconfig"
36 36
37diff -X dontdiff -urNp linux-2.6.11-rc1-bk8/arch/alpha/kernel/traps.c linux-dsd/arch/alpha/kernel/traps.c 37diff -urNpX dontdiff linux-2.6.12-gentoo/arch/alpha/kernel/traps.c linux-dsd/arch/alpha/kernel/traps.c
38--- linux-2.6.11-rc1-bk8/arch/alpha/kernel/traps.c 2004-12-24 21:35:24.000000000 +0000 38--- linux-2.6.12-gentoo/arch/alpha/kernel/traps.c 2005-03-02 07:38:20.000000000 +0000
39+++ linux-dsd/arch/alpha/kernel/traps.c 2005-01-21 19:36:16.357849616 +0000 39+++ linux-dsd/arch/alpha/kernel/traps.c 2005-06-18 17:47:00.000000000 +0100
40@@ -15,6 +15,7 @@ 40@@ -15,6 +15,7 @@
41 #include <linux/delay.h> 41 #include <linux/delay.h>
42 #include <linux/smp_lock.h> 42 #include <linux/smp_lock.h>
43 #include <linux/module.h> 43 #include <linux/module.h>
44+#include <linux/sysctl.h> 44+#include <linux/sysctl.h>
119 wrent(entSys, 5); 119 wrent(entSys, 5);
120 wrent(entDbg, 6); 120 wrent(entDbg, 6);
121 } 121 }
122+ 122+
123+__initcall(init_uac_sysctl); 123+__initcall(init_uac_sysctl);
124diff -X dontdiff -urNp linux-2.6.11-rc1-bk8/include/linux/sysctl.h linux-dsd/include/linux/sysctl.h 124diff -urNpX dontdiff linux-2.6.12-gentoo/include/linux/sysctl.h linux-dsd/include/linux/sysctl.h
125--- linux-2.6.11-rc1-bk8/include/linux/sysctl.h 2005-01-21 19:21:45.000000000 +0000 125--- linux-2.6.12-gentoo/include/linux/sysctl.h 2005-06-18 17:37:23.000000000 +0100
126+++ linux-dsd/include/linux/sysctl.h 2005-01-21 19:37:09.469775376 +0000 126+++ linux-dsd/include/linux/sysctl.h 2005-06-18 17:48:24.000000000 +0100
127@@ -135,6 +135,9 @@ enum 127@@ -137,6 +137,9 @@ enum
128 KERN_HZ_TIMER=65, /* int: hz timer on or off */
129 KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
130 KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */ 128 KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
129 KERN_RANDOMIZE=68, /* int: randomize virtual address space */
130 KERN_FBSPLASH=69, /* string: path to fbsplash helper */
131+#ifdef CONFIG_ALPHA_UAC_SYSCTL 131+#ifdef CONFIG_ALPHA_UAC_SYSCTL
132+ KERN_UAC_POLICY=68, /* int: Alpha unaligned access control policy flags */ 132+ KERN_UAC_POLICY=70, /* int: Alpha unaligned access control policy flags */
133+#endif /* CONFIG_ALPHA_UAC_SYSCTL */ 133+#endif /* CONFIG_ALPHA_UAC_SYSCTL */
134 }; 134 };
135 135
136 136
137@@ -212,6 +215,17 @@ enum 137@@ -214,6 +217,17 @@ enum
138 PTY_NR=2 138 PTY_NR=2
139 }; 139 };
140 140
141+#ifdef CONFIG_ALPHA_UAC_SYSCTL 141+#ifdef CONFIG_ALPHA_UAC_SYSCTL
142+/* /proc/sys/kernel/uac */ 142+/* /proc/sys/kernel/uac */
150+#endif /* CONFIG_ALPHA_UAC_SYSCTL */ 150+#endif /* CONFIG_ALPHA_UAC_SYSCTL */
151+ 151+
152 /* /proc/sys/bus/isa */ 152 /* /proc/sys/bus/isa */
153 enum 153 enum
154 { 154 {
155diff -X dontdiff -urNp linux-2.6.11-rc1-bk8/kernel/sysctl.c linux-dsd/kernel/sysctl.c 155diff -urNpX dontdiff linux-2.6.12-gentoo/kernel/sysctl.c linux-dsd/kernel/sysctl.c
156--- linux-2.6.11-rc1-bk8/kernel/sysctl.c 2005-01-21 19:21:45.000000000 +0000 156--- linux-2.6.12-gentoo/kernel/sysctl.c 2005-06-18 17:37:23.000000000 +0100
157+++ linux-dsd/kernel/sysctl.c 2005-01-21 19:36:16.533822864 +0000 157+++ linux-dsd/kernel/sysctl.c 2005-06-18 17:47:00.000000000 +0100
158@@ -144,6 +144,9 @@ extern ctl_table random_table[]; 158@@ -148,6 +148,9 @@ extern ctl_table random_table[];
159 #ifdef CONFIG_UNIX98_PTYS 159 #ifdef CONFIG_UNIX98_PTYS
160 extern ctl_table pty_table[]; 160 extern ctl_table pty_table[];
161 #endif 161 #endif
162+#ifdef CONFIG_ALPHA_UAC_SYSCTL 162+#ifdef CONFIG_ALPHA_UAC_SYSCTL
163+extern ctl_table uac_table[]; 163+extern ctl_table uac_table[];
164+#endif 164+#endif
165 165
166 #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT 166 #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
167 int sysctl_legacy_va_layout; 167 int sysctl_legacy_va_layout;
168@@ -216,6 +219,14 @@ static ctl_table root_table[] = { 168@@ -220,6 +223,14 @@ static ctl_table root_table[] = {
169 .mode = 0555, 169 .mode = 0555,
170 .child = dev_table, 170 .child = dev_table,
171 }, 171 },
172+#ifdef CONFIG_ALPHA_UAC_SYSCTL 172+#ifdef CONFIG_ALPHA_UAC_SYSCTL
173+ { 173+ {

Legend:
Removed from v.32  
changed lines
  Added in v.34

  ViewVC Help
Powered by ViewVC 1.1.20