Author: mguevara Date: Wed Jan 31 09:05:25 2007 GMT
Module: SOURCES Tag: LINUX_2_6_20
---- Log message:
- applies after suspend2, utsrelease.h and version.h removed, orig linux_banner
---- Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.2.2.42 -> 1.2.2.43)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.2.42
SOURCES/linux-2.6-vs2.3.patch:1.2.2.43
--- SOURCES/linux-2.6-vs2.3.patch:1.2.2.42 Wed Jan 31 10:01:21 2007
+++ SOURCES/linux-2.6-vs2.3.patch Wed Jan 31 10:05:19 2007
@@ -156,18 +156,6 @@
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-2.6.20-rc2/Makefile
linux-2.6.20-rc2-vs2.3.0.6/Makefile
---- linux-2.6.20-rc2/Makefile 2006-12-29 11:01:04 +0100
-+++ linux-2.6.20-rc2-vs2.3.0.6/Makefile 2006-12-29 11:02:50 +0100
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 20
--EXTRAVERSION =-rc2
-+EXTRAVERSION = -rc2-vs2.3.0.6
- NAME = Homicidal Dwarf Hamster
-
- # *DOCUMENTATION*
diff -NurpP --minimal linux-2.6.20-rc2/arch/alpha/Kconfig
linux-2.6.20-rc2-vs2.3.0.6/arch/alpha/Kconfig
--- linux-2.6.20-rc2/arch/alpha/Kconfig 2006-12-29 11:01:04 +0100
+++ linux-2.6.20-rc2-vs2.3.0.6/arch/alpha/Kconfig 2006-12-29 05:59:12
+0100
@@ -14672,17 +14660,6 @@
#ifdef CONFIG_UID16
/* This is defined by include/asm-{arch}/posix_types.h */
-diff -NurpP --minimal linux-2.6.20-rc2/include/linux/utsrelease.h
linux-2.6.20-rc2-vs2.3.0.6/include/linux/utsrelease.h
---- linux-2.6.20-rc2/include/linux/utsrelease.h 1970-01-01 01:00:00
+0100
-+++ linux-2.6.20-rc2-vs2.3.0.6/include/linux/utsrelease.h 2006-12-29
10:00:06 +0100
-@@ -0,0 +1 @@
-+#define UTS_RELEASE "2.6.20-rc2"
-diff -NurpP --minimal linux-2.6.20-rc2/include/linux/version.h
linux-2.6.20-rc2-vs2.3.0.6/include/linux/version.h
---- linux-2.6.20-rc2/include/linux/version.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.20-rc2-vs2.3.0.6/include/linux/version.h 2006-12-29 10:00:06
+0100
-@@ -0,0 +1,2 @@
-+#define LINUX_VERSION_CODE 132628
-+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff -NurpP --minimal linux-2.6.20-rc2/include/linux/vroot.h
linux-2.6.20-rc2-vs2.3.0.6/include/linux/vroot.h
--- linux-2.6.20-rc2/include/linux/vroot.h 1970-01-01 01:00:00 +0100
+++ linux-2.6.20-rc2-vs2.3.0.6/include/linux/vroot.h 2006-11-08 04:57:51
+0100
@@ -19340,18 +19317,6 @@
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.20-rc2/init/version.c
linux-2.6.20-rc2-vs2.3.0.6/init/version.c
---- linux-2.6.20-rc2/init/version.c 2006-12-29 11:02:05 +0100
-+++ linux-2.6.20-rc2-vs2.3.0.6/init/version.c 2006-12-29 05:59:41 +0100
-@@ -33,3 +33,8 @@ struct uts_namespace init_uts_ns = {
- },
- };
- EXPORT_SYMBOL_GPL(init_uts_ns);
-+
-+const char linux_banner[] =
-+ "Linux version %s (" LINUX_COMPILE_BY "@"
-+ LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") %s\n";
-+
diff -NurpP --minimal linux-2.6.20-rc2/ipc/mqueue.c
linux-2.6.20-rc2-vs2.3.0.6/ipc/mqueue.c
--- linux-2.6.20-rc2/ipc/mqueue.c 2006-12-29 11:02:05 +0100
+++ linux-2.6.20-rc2-vs2.3.0.6/ipc/mqueue.c 2006-12-29 05:59:41 +0100
@@ -21317,9 +21282,9 @@
--- linux-2.6.20-rc2/kernel/timer.c 2006-12-29 11:02:09 +0100
+++ linux-2.6.20-rc2-vs2.3.0.6/kernel/timer.c 2006-12-29 09:56:40 +0100
@@ -34,6 +34,10 @@
- #include <linux/cpu.h>
#include <linux/syscalls.h>
#include <linux/delay.h>
+ #include <linux/freezer.h>
+#include <linux/vs_base.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_pid.h>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.2.42&r2=1.2.2.43&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
