SOURCES (LINUX_2_6_20): linux-2.6-vs2.3.patch - fix for fs/proc/pr...

mguevara mguevara at pld-linux.org
Tue Jan 16 15:47:11 CET 2007


Author: mguevara                     Date: Tue Jan 16 14:47:11 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- fix for fs/proc/proc_misc.c

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.2.19 -> 1.2.2.20) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.2.19 SOURCES/linux-2.6-vs2.3.patch:1.2.2.20
--- SOURCES/linux-2.6-vs2.3.patch:1.2.2.19	Tue Jan 16 15:34:08 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Tue Jan 16 15:47:06 2007
@@ -9985,8 +9985,8 @@
  		LOAD_INT(a), LOAD_FRAC(a),
  		LOAD_INT(b), LOAD_FRAC(b),
  		LOAD_INT(c), LOAD_FRAC(c),
--		nr_running(), nr_threads, init_pspace.last_pid);
-+		running, threads, init_pspace.last_pid);
+-		nr_running(), nr_threads, current->nsproxy->pid_ns->last_pid);
++		running, threads, current->nsproxy->pid_ns->last_pid);
  	return proc_calc_metrics(page, start, off, count, eof, len);
  }
  
@@ -10009,17 +10009,6 @@
  		cached = 0;
  
  	get_vmalloc_info(&vmi);
-@@ -252,8 +272,8 @@ static int version_read_proc(char *page,
- {
- 	int len;
- 
--	strcpy(page, linux_banner);
--	len = strlen(page);
-+	len = sprintf(page, linux_banner,
-+		utsname()->release, utsname()->version);
- 	return proc_calc_metrics(page, start, off, count, eof, len);
- }
- 
 diff -NurpP --minimal linux-2.6.19.1/fs/proc/root.c linux-2.6.19.1-vs2.3.0.6/fs/proc/root.c
 --- linux-2.6.19.1/fs/proc/root.c	2006-11-30 21:19:28 +0100
 +++ linux-2.6.19.1-vs2.3.0.6/fs/proc/root.c	2006-11-08 04:57:41 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.2.19&r2=1.2.2.20&f=u



More information about the pld-cvs-commit mailing list