OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 27... Line 27...
27 net/ipv4/route.c | 3 +++ 27 net/ipv4/route.c | 3 +++
28 20 files changed, 105 insertions(+), 17 deletions(-) 28 20 files changed, 105 insertions(+), 17 deletions(-)
Line 29... Line 29...
29   29  
30 --- a/fs/locks.c 30 --- a/fs/locks.c
31 +++ b/fs/locks.c 31 +++ b/fs/locks.c
Line 32... Line 32...
32 @@ -2812,6 +2812,8 @@ static const struct file_operations proc 32 @@ -2805,6 +2805,8 @@ static const struct file_operations proc
33 33
34 static int __init proc_locks_init(void) 34 static int __init proc_locks_init(void)
35 { 35 {
Line 225... Line 225...
225 { 225 {
226 struct proc_dir_entry *pe; 226 struct proc_dir_entry *pe;
Line 227... Line 227...
227 227
228 + if (IS_ENABLED(CONFIG_PROC_STRIPPED)) 228 + if (IS_ENABLED(CONFIG_PROC_STRIPPED))
229 + return 0; 229 + return 0;
230 pe = proc_create("timer_list", 0400, NULL, &timer_list_fops); 230 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
231 if (!pe) 231 if (!pe)
232 return -ENOMEM; 232 return -ENOMEM;
233 --- a/mm/vmalloc.c 233 --- a/mm/vmalloc.c
234 +++ b/mm/vmalloc.c 234 +++ b/mm/vmalloc.c
Line 241... Line 241...
241 proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations); 241 proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
242 return 0; 242 return 0;
243 } 243 }
244 --- a/mm/vmstat.c 244 --- a/mm/vmstat.c
245 +++ b/mm/vmstat.c 245 +++ b/mm/vmstat.c
246 @@ -1955,10 +1955,12 @@ void __init init_mm_internals(void) 246 @@ -1944,10 +1944,12 @@ void __init init_mm_internals(void)
247 start_shepherd_timer(); 247 start_shepherd_timer();
248 #endif 248 #endif
249 #ifdef CONFIG_PROC_FS 249 #ifdef CONFIG_PROC_FS
250 - proc_create("buddyinfo", 0444, NULL, &buddyinfo_file_operations); 250 - proc_create("buddyinfo", 0444, NULL, &buddyinfo_file_operations);
251 - proc_create("pagetypeinfo", 0444, NULL, &pagetypeinfo_file_operations); 251 - proc_create("pagetypeinfo", 0444, NULL, &pagetypeinfo_file_operations);
Line 325... Line 325...
325 remove_proc_entry("dev", net->proc_net); 325 remove_proc_entry("dev", net->proc_net);
326 } 326 }
Line 327... Line 327...
327 327
328 --- a/net/core/sock.c 328 --- a/net/core/sock.c
329 +++ b/net/core/sock.c 329 +++ b/net/core/sock.c
Line 330... Line 330...
330 @@ -3382,6 +3382,8 @@ static __net_initdata struct pernet_oper 330 @@ -3378,6 +3378,8 @@ static __net_initdata struct pernet_oper
331 331
332 static int __init proto_init(void) 332 static int __init proto_init(void)
333 { 333 {
334 + if (IS_ENABLED(CONFIG_PROC_STRIPPED)) 334 + if (IS_ENABLED(CONFIG_PROC_STRIPPED))
335 + return 0; 335 + return 0;
Line 336... Line 336...
336 return register_pernet_subsys(&proto_net_ops); 336 return register_pernet_subsys(&proto_net_ops);
337 } 337 }
338 338
Line 339... Line 339...
339 --- a/net/ipv4/fib_trie.c 339 --- a/net/ipv4/fib_trie.c
340 +++ b/net/ipv4/fib_trie.c 340 +++ b/net/ipv4/fib_trie.c
341 @@ -2740,10 +2740,12 @@ static const struct file_operations fib_ 341 @@ -2731,10 +2731,12 @@ static const struct file_operations fib_
342 342
Line 351... Line 351...
351 + if (!IS_ENABLED(CONFIG_PROC_STRIPPED) && 351 + if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
352 + !proc_create("fib_triestat", S_IRUGO, net->proc_net, 352 + !proc_create("fib_triestat", S_IRUGO, net->proc_net,
353 &fib_triestat_fops)) 353 &fib_triestat_fops))
354 goto out2; 354 goto out2;
Line 355... Line 355...
355 355
356 @@ -2753,17 +2755,21 @@ int __net_init fib_proc_init(struct net 356 @@ -2744,17 +2746,21 @@ int __net_init fib_proc_init(struct net
Line 357... Line 357...
357 return 0; 357 return 0;
358 358
359 out3: 359 out3:
Line 379... Line 379...
379 remove_proc_entry("route", net->proc_net); 379 remove_proc_entry("route", net->proc_net);
380 } 380 }
Line 381... Line 381...
381 381
382 --- a/net/ipv4/proc.c 382 --- a/net/ipv4/proc.c
383 +++ b/net/ipv4/proc.c 383 +++ b/net/ipv4/proc.c
Line 384... Line 384...
384 @@ -558,6 +558,9 @@ static __net_initdata struct pernet_oper 384 @@ -557,6 +557,9 @@ static __net_initdata struct pernet_oper
385 385
386 int __init ip_misc_proc_init(void) 386 int __init ip_misc_proc_init(void)
387 { 387 {