projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: backport upstream bridge multicast snooping fixes
[oweals/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.10
/
902-debloat_proc.patch
diff --git
a/target/linux/generic/patches-3.10/902-debloat_proc.patch
b/target/linux/generic/patches-3.10/902-debloat_proc.patch
index 526132bf718a100d2f5639b0a00c8b592365ba4c..6f551877da10215134ca5db364ef66a069ab5349 100644
(file)
--- a/
target/linux/generic/patches-3.10/902-debloat_proc.patch
+++ b/
target/linux/generic/patches-3.10/902-debloat_proc.patch
@@
-1,6
+1,6
@@
--- a/fs/locks.c
+++ b/fs/locks.c
--- a/fs/locks.c
+++ b/fs/locks.c
-@@ -226
7,6 +2267
,8 @@ static const struct file_operations proc
+@@ -226
6,6 +2266
,8 @@ static const struct file_operations proc
static int __init proc_locks_init(void)
{
static int __init proc_locks_init(void)
{
@@
-111,7
+111,7
@@
if (!root_irq_dir)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
if (!root_irq_dir)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
-@@ -3
55,6 +355
,8 @@ static int __init init_timer_list_procfs
+@@ -3
62,6 +362
,8 @@ static int __init init_timer_list_procfs
{
struct proc_dir_entry *pe;
{
struct proc_dir_entry *pe;
@@
-133,7
+133,7
@@
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
-@@ -124
1,10 +1241
,12 @@ static int __init setup_vmstat(void)
+@@ -124
2,10 +1242
,12 @@ static int __init setup_vmstat(void)
start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
@@
-173,7
+173,7
@@
goto err;
--- a/net/core/sock.c
+++ b/net/core/sock.c
goto err;
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -28
51,6 +285
1,8 @@ static __net_initdata struct pernet_oper
+@@ -28
91,6 +289
1,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{
static int __init proto_init(void)
{
@@
-184,7
+184,7
@@
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
-@@ -258
9,10 +2589
,12 @@ static const struct file_operations fib_
+@@ -258
7,10 +2587
,12 @@ static const struct file_operations fib_
int __net_init fib_proc_init(struct net *net)
{
int __net_init fib_proc_init(struct net *net)
{
@@
-199,7
+199,7
@@
&fib_triestat_fops))
goto out2;
&fib_triestat_fops))
goto out2;
-@@ -260
2,17 +2604
,21 @@ int __net_init fib_proc_init(struct net
+@@ -260
0,17 +2602
,21 @@ int __net_init fib_proc_init(struct net
return 0;
out3:
return 0;
out3:
@@
-251,7
+251,7
@@
--- a/ipc/msg.c
+++ b/ipc/msg.c
--- a/ipc/msg.c
+++ b/ipc/msg.c
-@@ -13
6,6 +136
,9 @@ void __init msg_init(void)
+@@ -13
4,6 +134
,9 @@ void __init msg_init(void)
printk(KERN_INFO "msgmni has been set to %d\n",
init_ipc_ns.msg_ctlmni);
printk(KERN_INFO "msgmni has been set to %d\n",
init_ipc_ns.msg_ctlmni);
@@
-263,7
+263,7
@@
IPC_MSG_IDS, sysvipc_msg_proc_show);
--- a/ipc/sem.c
+++ b/ipc/sem.c
IPC_MSG_IDS, sysvipc_msg_proc_show);
--- a/ipc/sem.c
+++ b/ipc/sem.c
-@@ -1
84,6 +184
,8 @@ void sem_exit_ns(struct ipc_namespace *n
+@@ -1
91,6 +191
,8 @@ void sem_exit_ns(struct ipc_namespace *n
void __init sem_init (void)
{
sem_init_ns(&init_ipc_ns);
void __init sem_init (void)
{
sem_init_ns(&init_ipc_ns);
@@
-274,7
+274,7
@@
IPC_SEM_IDS, sysvipc_sem_proc_show);
--- a/ipc/shm.c
+++ b/ipc/shm.c
IPC_SEM_IDS, sysvipc_sem_proc_show);
--- a/ipc/shm.c
+++ b/ipc/shm.c
-@@ -11
5,6 +115
,8 @@ pure_initcall(ipc_ns_init);
+@@ -11
8,6 +118
,8 @@ pure_initcall(ipc_ns_init);
void __init shm_init (void)
{
void __init shm_init (void)
{
@@
-285,7
+285,7
@@
" key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n",
--- a/ipc/util.c
+++ b/ipc/util.c
" key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n",
--- a/ipc/util.c
+++ b/ipc/util.c
-@@ -1
50,6 +150
,9 @@ void __init ipc_init_proc_interface(cons
+@@ -1
73,6 +173
,9 @@ void __init ipc_init_proc_interface(cons
struct proc_dir_entry *pde;
struct ipc_proc_iface *iface;
struct proc_dir_entry *pde;
struct ipc_proc_iface *iface;