]>
Commit | Line | Data |
---|---|---|
fca75ef8 | 1 | --- linux-2.6.27/init/Kconfig~ 2008-11-20 23:26:34.000000000 +0100 |
2 | +++ linux-2.6.27/init/Kconfig 2008-12-01 20:37:12.000000000 +0100 | |
3 | @@ -781,8 +781,8 @@ | |
4 | source "arch/Kconfig" | |
5 | ||
6 | config PROC_PAGE_MONITOR | |
7 | - default n | |
8 | - depends on PROC_FS && MMU && !GRKERNSEC | |
9 | + default y | |
10 | + depends on PROC_FS && MMU | |
11 | bool "Enable /proc page monitoring" if EMBEDDED | |
12 | help | |
13 | Various /proc files exist to monitor process memory utilization: | |
14 | @@ -798,9 +798,9 @@ | |
15 | ||
16 | config SLABINFO | |
17 | bool | |
18 | - depends on PROC_FS && !GRKERNSEC_PROC_ADD | |
19 | + depends on PROC_FS | |
20 | depends on SLAB || SLUB_DEBUG | |
21 | - default n | |
22 | + default y | |
23 | ||
24 | config RT_MUTEXES | |
25 | boolean | |
26 | --- linux-2.6.27/fs/proc/proc_misc.c~ 2008-11-20 23:26:30.000000000 +0100 | |
27 | +++ linux-2.6.27/fs/proc/proc_misc.c 2008-12-01 20:35:55.000000000 +0100 | |
28 | @@ -934,8 +934,12 @@ | |
29 | #endif | |
30 | proc_create("stat", 0, NULL, &proc_stat_operations); | |
31 | proc_create("interrupts", 0, NULL, &proc_interrupts_operations); | |
32 | -#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) | |
33 | +#ifdef CONFIG_SLABINFO | |
34 | +#ifdef CONFIG_GRKERNSEC_PROC_ADD | |
35 | + proc_create("slabinfo",gr_mode,NULL,&proc_slabinfo_operations); | |
36 | +#else | |
37 | proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations); | |
38 | +#endif | |
39 | #ifdef CONFIG_DEBUG_SLAB_LEAK | |
40 | proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations); | |
41 | #endif |