SOURCES (LINUX_2_6): linux-2.6-vs2.patch - updated to 2.0rc5
baggins
baggins at pld-linux.org
Thu Jul 7 17:28:24 CEST 2005
Author: baggins Date: Thu Jul 7 15:28:24 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated to 2.0rc5
---- Files affected:
SOURCES:
linux-2.6-vs2.patch (1.1.2.3 -> 1.1.2.4)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.patch
diff -u SOURCES/linux-2.6-vs2.patch:1.1.2.3 SOURCES/linux-2.6-vs2.patch:1.1.2.4
--- SOURCES/linux-2.6-vs2.patch:1.1.2.3 Sat May 14 01:11:56 2005
+++ SOURCES/linux-2.6-vs2.patch Thu Jul 7 17:28:19 2005
@@ -1,166 +1,102 @@
-diff -NurpP --minimal linux-2.6.11.8/Documentation/vserver/debug.txt linux-2.6.11.8-vs2.0-pre4/Documentation/vserver/debug.txt
---- linux-2.6.11.8/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/Documentation/vserver/debug.txt 2005-05-02 22:12:28 +0200
-@@ -0,0 +1,171 @@
-+
-+debug_switch:
-+
-+ 0 1
-+
-+ 1 2
-+
-+ 2 4
-+
-+ 3 8
-+
-+ 4 16
-+
-+ 5 32
-+
-+ 6 64
-+
-+ 7 128
-+
-+
-+debug_xid:
-+
-+ 0 1 "alloc_vx_info(%d) = %p\n"
-+ "dealloc_vx_info(%p)"
-+ "loc_vx_info(%d) = %p (not available)"
-+ "loc_vx_info(%d) = %p (found)"
-+ "loc_vx_info(%d) = %p (new)"
-+
-+ 1 2 "alloc_vx_info(%d)*"
-+ "loc_vx_info(%d)*"
-+ "locate_vx_info(%d)"
+diff -NurpP --minimal linux-2.6.12.2/Documentation/vserver/debug.txt linux-2.6.12.2-vs2.0-rc5/Documentation/vserver/debug.txt
+--- linux-2.6.12.2/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.12.2-vs2.0-rc5/Documentation/vserver/debug.txt 2005-07-02 22:39:07 +0200
+@@ -0,0 +1,105 @@
+
-+ 2 4 "get_vx_info(%p[#%d.%d])"
-+ "put_vx_info(%p[#%d.%d])"
-+
-+ 3 8 "set_vx_info(%p[#%d.%d.%d])"
-+ "clr_vx_info(%p[#%d.%d.%d])"
-+ "rcu_free_vx_info(%p): uc=%d"
++debug_cvirt:
+
-+ 4 16 "__hash_vx_info: %p[#%d]"
-+ "__unhash_vx_info: %p[#%d]"
-+ "__vx_dynamic_id: [#%d]"
++ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
++ "vx_rmap_tgid: %p/%llx: %d -> %d"
+
-+ 5 32 "vx_migrate_task(%p,%p[#%d.%d])"
-+ "task_get_vx_info(%p)"
++debug_dlim:
+
-+ 6 64 "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
++ "FREE (%p,#%d)%c inode"
++ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
++ "FREE (%p,#%d)%c %lld bytes"
++ 2 4 "ADJUST: %lld,%lld on %d,%d [mult=%d]"
++ 3 8 "ext3_has_free_blocks(%p): %u<%u+1, %c, %u!=%u r=%d"
++ "ext3_has_free_blocks(%p): free=%u, root=%u"
++ "rcu_free_dl_info(%p)"
++ 4 10 "alloc_dl_info(%p,%d) = %p"
++ "dealloc_dl_info(%p)"
++ "get_dl_info(%p[#%d.%d])"
++ "put_dl_info(%p[#%d.%d])"
++ 5 20 "alloc_dl_info(%p,%d)*"
++ 6 40 "__hash_dl_info: %p[#%d]"
++ "__unhash_dl_info: %p[#%d]"
++ 7 80 "locate_dl_info(%p,#%d) = %p"
+
-+ 7 128 "vx_propagate_xid(%p[#%d.%d]): %d"
++debug_net:
+
++ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
++ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
++ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
++ 4 10 "ip_route_connect(%p) %p,%p;%lx"
++ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
++ 6 40 "sk,egf: %p [#%d] (from %d)"
++ "sk,egn: %p [#%d] (from %d)"
++ "sk,req: %p [#%d] (from %d)"
++ "sk: %p [#%d] (from %d)"
++ "tw: %p [#%d] (from %d)"
++ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
++ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
+
+debug_nid:
+
-+ 0 1 "alloc_nx_info() = %p"
++ 0 1 "__lookup_nx_info(#%u): %p[#%u]"
++ "alloc_nx_info(%d) = %p"
++ "create_nx_info(%d) (dynamic rejected)"
++ "create_nx_info(%d) = %p (already there)"
++ "create_nx_info(%d) = %p (new)"
+ "dealloc_nx_info(%p)"
-+ "loc_nx_info(%d) = %p (not available)"
-+ "loc_nx_info(%d) = %p (found)"
-+ "loc_nx_info(%d) = %p (new)"
-+
+ 1 2 "alloc_nx_info(%d)*"
-+ "loc_nx_info(%d)*"
-+
++ "create_nx_info(%d)*"
+ 2 4 "get_nx_info(%p[#%d.%d])"
+ "put_nx_info(%p[#%d.%d])"
-+
-+ 3 8 "set_nx_info(%p[#%d.%d.%d])"
-+ "clr_nx_info(%p[#%d.%d.%d])"
-+ "rcu_free_nx_info(%p): uc=%d"
-+
-+ 4 16 "__hash_nx_info: %p[#%d]"
-+ "__unhash_nx_info: %p[#%d]"
++ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p"
++ "clr_nx_info(%p[#%d.%d])"
++ "init_nx_info(%p[#%d.%d])"
++ "release_nx_info(%p[#%d.%d.%d]) %p"
++ "set_nx_info(%p[#%d.%d])"
++ 4 10 "__hash_nx_info: %p[#%d]"
+ "__nx_dynamic_id: [#%d]"
-+
-+ 5 32 "nx_migrate_task(%p,%p[#%d.%d])"
++ "__unhash_nx_info: %p[#%d]"
++ 5 20 "moved task %p into nxi:%p[#%d]"
++ "nx_migrate_task(%p,%p[#%d.%d.%d])"
+ "task_get_nx_info(%p)"
-+ "create_nx_info()"
-+
-+ 6 64
-+
-+ 7 128
-+
-+
-+debug_dlim:
-+
-+ 0 1 "alloc_dl_info(%p,%d) = %p"
-+ "dealloc_dl_info(%p)"
-+ "locate_dl_info(%p,#%d) = %p"
-+
-+ 1 2 "alloc_dl_info(%p,%d)*"
-+
-+ 2 4 "get_dl_info(%p[#%d.%d])"
-+ "put_dl_info(%p[#%d.%d])"
-+
-+ 3 8 "rcu_free_dl_info(%p)"
-+ "__hash_dl_info: %p[#%d]"
-+ "__unhash_dl_info: %p[#%d]"
-+
-+
-+ 4 16 "ALLOC (%p,#%d)%c inode (%d)"
-+ "FREE (%p,#%d)%c inode"
-+
-+ 5 32 "ALLOC (%p,#%d)%c %lld bytes (%d)"
-+ "FREE (%p,#%d)%c %lld bytes"
-+
-+ 6 64 "ADJUST: %lld,%lld on %d,%d [mult=%d]"
-+
-+ 7 128 "ext3_has_free_blocks(%p): free=%u, root=%u"
-+ "ext3_has_free_blocks(%p): %u<%u+1, %c, %u!=%u r=%d"
-+
-+
+
-+debug_cvirt:
-+
-+
-+ 0 1
-+
-+ 1 2
-+
-+ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
-+ "vx_rmap_tgid: %p/%llx: %d -> %d"
-+
-+ 3 8
-+
-+ 4 16
-+
-+ 5 32
-+
-+ 6 64
-+
-+ 7 128
-+
-+
-+
-+debug_net:
-+
-+
-+ 0 1
-+
-+ 1 2
-+
-+ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
-+
-+ 3 8 "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
-+ "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
-+
-+ 4 16 "ip_route_connect(%p) %p,%p;%lx"
-+
-+ 5 32 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
-+
-+ 6 64 "sk: %p [#%d] (from %d)"
-+ "sk,req: %p [#%d] (from %d)"
-+ "sk,egf: %p [#%d] (from %d)"
-+ "sk,egn: %p [#%d] (from %d)"
-+ "tw: %p [#%d] (from %d)"
++debug_switch:
+
-+ 7 128 "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
-+ "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
++ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p,%d"
++ 1 2 "%s: (%s %s) returned %s with %d"
+
++debug_xid:
+
++ 0 1 "__lookup_vx_info(#%u): %p[#%u]"
++ "alloc_vx_info(%d) = %p"
++ "alloc_vx_info(%d)*"
++ "create_vx_info(%d) (dynamic rejected)"
++ "create_vx_info(%d) = %p (already there)"
++ "create_vx_info(%d) = %p (new)"
++ "dealloc_vx_info(%p)"
++ 1 2 "create_vx_info(%d)*"
++ 2 4 "get_vx_info(%p[#%d.%d])"
++ "put_vx_info(%p[#%d.%d])"
++ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p"
++ "clr_vx_info(%p[#%d.%d])"
++ "init_vx_info(%p[#%d.%d])"
++ "release_vx_info(%p[#%d.%d.%d]) %p"
++ "set_vx_info(%p[#%d.%d])"
++ 4 10 "__hash_vx_info: %p[#%d]"
++ "__unhash_vx_info: %p[#%d]"
++ "__vx_dynamic_id: [#%d]"
++ 5 20 "moved task %p into vxi:%p[#%d]"
++ "task_get_vx_info(%p)"
++ "vx_migrate_task(%p,%p[#%d.%d])"
++ 6 40 "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++ 7 80 "vx_parse_xid(ť%sŤ): %d:#%d"
++ "vx_propagate_xid(%p[#%lu.%d]): %d,%d"
+
+
+debug_limit:
@@ -171,12 +107,10 @@
+ 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.11.8/arch/alpha/Kconfig linux-2.6.11.8-vs2.0-pre4/arch/alpha/Kconfig
---- linux-2.6.11.8/arch/alpha/Kconfig 2005-03-02 12:38:18 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/alpha/Kconfig 2005-05-02 22:12:28 +0200
-@@ -598,6 +598,8 @@ source "arch/alpha/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.12.2/arch/alpha/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/alpha/Kconfig
+--- linux-2.6.12.2/arch/alpha/Kconfig 2005-06-22 02:37:51 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/alpha/Kconfig 2005-07-02 22:38:30 +0200
+@@ -602,6 +602,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -185,10 +119,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.11.8/arch/alpha/kernel/ptrace.c linux-2.6.11.8-vs2.0-pre4/arch/alpha/kernel/ptrace.c
---- linux-2.6.11.8/arch/alpha/kernel/ptrace.c 2004-12-25 01:54:42 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/alpha/kernel/ptrace.c 2005-05-02 22:12:28 +0200
-@@ -288,6 +288,8 @@ do_sys_ptrace(long request, long pid, lo
+diff -NurpP --minimal linux-2.6.12.2/arch/alpha/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/alpha/kernel/ptrace.c
+--- linux-2.6.12.2/arch/alpha/kernel/ptrace.c 2005-06-22 02:37:51 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/alpha/kernel/ptrace.c 2005-07-02 22:38:30 +0200
+@@ -289,6 +289,8 @@ do_sys_ptrace(long request, long pid, lo
read_unlock(&tasklist_lock);
if (!child)
goto out_notsk;
@@ -197,9 +131,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
-diff -NurpP --minimal linux-2.6.11.8/arch/alpha/kernel/systbls.S linux-2.6.11.8-vs2.0-pre4/arch/alpha/kernel/systbls.S
---- linux-2.6.11.8/arch/alpha/kernel/systbls.S 2004-10-23 05:05:56 +0200
-+++ linux-2.6.11.8-vs2.0-pre4/arch/alpha/kernel/systbls.S 2005-05-02 22:12:28 +0200
+diff -NurpP --minimal linux-2.6.12.2/arch/alpha/kernel/systbls.S linux-2.6.12.2-vs2.0-rc5/arch/alpha/kernel/systbls.S
+--- linux-2.6.12.2/arch/alpha/kernel/systbls.S 2005-06-22 02:37:51 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/alpha/kernel/systbls.S 2005-07-02 22:38:30 +0200
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -209,10 +143,10 @@
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.11.8/arch/arm/Kconfig linux-2.6.11.8-vs2.0-pre4/arch/arm/Kconfig
---- linux-2.6.11.8/arch/arm/Kconfig 2005-03-02 12:38:18 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/arm/Kconfig 2005-05-02 22:12:28 +0200
-@@ -731,6 +731,8 @@ source "drivers/mmc/Kconfig"
+diff -NurpP --minimal linux-2.6.12.2/arch/arm/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/arm/Kconfig
+--- linux-2.6.12.2/arch/arm/Kconfig 2005-06-22 02:37:51 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/arm/Kconfig 2005-07-02 22:38:30 +0200
+@@ -739,6 +739,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -221,25 +155,21 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.11.8/arch/arm/kernel/calls.S linux-2.6.11.8-vs2.0-pre4/arch/arm/kernel/calls.S
---- linux-2.6.11.8/arch/arm/kernel/calls.S 2005-03-02 12:38:18 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/arm/kernel/calls.S 2005-05-02 22:12:28 +0200
-@@ -295,6 +295,11 @@ __syscall_start:
- .long sys_mq_notify
- .long sys_mq_getsetattr
- /* 280 */ .long sys_waitid
-+
-+ .rept 313 - (. - __syscall_start) / 4
-+ .long sys_ni_syscall
-+ .endr
-+ .long sys_vserver /* 313 */
+diff -NurpP --minimal linux-2.6.12.2/arch/arm/kernel/calls.S linux-2.6.12.2-vs2.0-rc5/arch/arm/kernel/calls.S
+--- linux-2.6.12.2/arch/arm/kernel/calls.S 2005-06-22 02:37:52 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/arm/kernel/calls.S 2005-07-02 22:38:30 +0200
+@@ -327,6 +327,7 @@ __syscall_start:
+ /* 310 */ .long sys_request_key
+ .long sys_keyctl
+ .long sys_semtimedop
++ .long sys_vserver
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.11.8/arch/arm/kernel/ptrace.c linux-2.6.11.8-vs2.0-pre4/arch/arm/kernel/ptrace.c
---- linux-2.6.11.8/arch/arm/kernel/ptrace.c 2005-03-02 12:38:19 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/arm/kernel/ptrace.c 2005-05-02 22:12:28 +0200
-@@ -759,6 +759,8 @@ asmlinkage int sys_ptrace(long request,
+diff -NurpP --minimal linux-2.6.12.2/arch/arm/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/arm/kernel/ptrace.c
+--- linux-2.6.12.2/arch/arm/kernel/ptrace.c 2005-06-22 02:37:52 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/arm/kernel/ptrace.c 2005-07-02 22:38:30 +0200
+@@ -809,6 +809,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -248,10 +178,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.11.8/arch/arm26/Kconfig linux-2.6.11.8-vs2.0-pre4/arch/arm26/Kconfig
---- linux-2.6.11.8/arch/arm26/Kconfig 2005-03-02 12:38:19 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/arm26/Kconfig 2005-05-02 22:12:28 +0200
-@@ -220,6 +220,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.12.2/arch/arm26/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/arm26/Kconfig
+--- linux-2.6.12.2/arch/arm26/Kconfig 2005-06-22 02:37:53 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/arm26/Kconfig 2005-07-02 22:38:30 +0200
+@@ -224,6 +224,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -260,9 +190,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.11.8/arch/arm26/kernel/calls.S linux-2.6.11.8-vs2.0-pre4/arch/arm26/kernel/calls.S
---- linux-2.6.11.8/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/arm26/kernel/calls.S 2005-05-02 22:12:28 +0200
+diff -NurpP --minimal linux-2.6.12.2/arch/arm26/kernel/calls.S linux-2.6.12.2-vs2.0-rc5/arch/arm26/kernel/calls.S
+--- linux-2.6.12.2/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.12.2-vs2.0-rc5/arch/arm26/kernel/calls.S 2005-07-02 22:38:30 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -275,10 +205,10 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.11.8/arch/arm26/kernel/ptrace.c linux-2.6.11.8-vs2.0-pre4/arch/arm26/kernel/ptrace.c
---- linux-2.6.11.8/arch/arm26/kernel/ptrace.c 2005-03-02 12:38:19 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/arm26/kernel/ptrace.c 2005-05-02 22:12:28 +0200
-@@ -691,6 +691,8 @@ asmlinkage int sys_ptrace(long request,
+diff -NurpP --minimal linux-2.6.12.2/arch/arm26/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/arm26/kernel/ptrace.c
+--- linux-2.6.12.2/arch/arm26/kernel/ptrace.c 2005-06-22 02:37:53 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/arm26/kernel/ptrace.c 2005-07-02 22:38:30 +0200
+@@ -692,6 +692,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -287,9 +217,9 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.11.8/arch/cris/Kconfig linux-2.6.11.8-vs2.0-pre4/arch/cris/Kconfig
---- linux-2.6.11.8/arch/cris/Kconfig 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/cris/Kconfig 2005-05-02 22:12:28 +0200
+diff -NurpP --minimal linux-2.6.12.2/arch/cris/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/cris/Kconfig
+--- linux-2.6.12.2/arch/cris/Kconfig 2005-03-02 12:38:20 +0100
++++ linux-2.6.12.2-vs2.0-rc5/arch/cris/Kconfig 2005-07-02 22:38:30 +0200
@@ -173,6 +173,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -299,9 +229,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.11.8/arch/h8300/Kconfig linux-2.6.11.8-vs2.0-pre4/arch/h8300/Kconfig
---- linux-2.6.11.8/arch/h8300/Kconfig 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/h8300/Kconfig 2005-05-02 22:12:28 +0200
+diff -NurpP --minimal linux-2.6.12.2/arch/h8300/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/h8300/Kconfig
+--- linux-2.6.12.2/arch/h8300/Kconfig 2005-03-02 12:38:20 +0100
++++ linux-2.6.12.2-vs2.0-rc5/arch/h8300/Kconfig 2005-07-02 22:38:30 +0200
@@ -187,6 +187,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -311,10 +241,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.11.8/arch/h8300/kernel/ptrace.c linux-2.6.11.8-vs2.0-pre4/arch/h8300/kernel/ptrace.c
---- linux-2.6.11.8/arch/h8300/kernel/ptrace.c 2004-12-25 01:54:43 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/h8300/kernel/ptrace.c 2005-05-02 22:12:28 +0200
-@@ -80,6 +80,8 @@ asmlinkage int sys_ptrace(long request,
+diff -NurpP --minimal linux-2.6.12.2/arch/h8300/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/h8300/kernel/ptrace.c
+--- linux-2.6.12.2/arch/h8300/kernel/ptrace.c 2005-06-22 02:37:53 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/h8300/kernel/ptrace.c 2005-07-02 22:38:30 +0200
+@@ -81,6 +81,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -323,11 +253,11 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.11.8/arch/i386/Kconfig linux-2.6.11.8-vs2.0-pre4/arch/i386/Kconfig
---- linux-2.6.11.8/arch/i386/Kconfig 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/i386/Kconfig 2005-05-02 22:12:28 +0200
-@@ -568,6 +568,14 @@ config X86_IO_APIC
- depends on !SMP && X86_UP_IOAPIC
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/i386/Kconfig
+--- linux-2.6.12.2/arch/i386/Kconfig 2005-06-22 02:37:53 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/i386/Kconfig 2005-07-02 22:38:30 +0200
+@@ -574,6 +574,14 @@ config X86_VISWS_APIC
+ depends on X86_VISWS
default y
+config KERNEL_HZ
@@ -340,8 +270,8 @@
+
config X86_TSC
bool
- depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2) && !X86_NUMAQ
-@@ -735,6 +743,46 @@ config HIGHMEM64G
+ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ
+@@ -759,6 +767,46 @@ config HIGHMEM64G
endchoice
@@ -388,7 +318,7 @@
config HIGHMEM
bool
depends on HIGHMEM64G || HIGHMEM4G
-@@ -1210,6 +1258,8 @@ source "arch/i386/oprofile/Kconfig"
+@@ -1246,6 +1294,8 @@ source "arch/i386/oprofile/Kconfig"
source "arch/i386/Kconfig.debug"
@@ -397,10 +327,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.11.8/arch/i386/kernel/cpu/proc.c linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/cpu/proc.c
---- linux-2.6.11.8/arch/i386/kernel/cpu/proc.c 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/cpu/proc.c 2005-05-02 22:12:28 +0200
-@@ -124,8 +124,8 @@ static int show_cpuinfo(struct seq_file
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/cpu/proc.c linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/cpu/proc.c
+--- linux-2.6.12.2/arch/i386/kernel/cpu/proc.c 2005-06-22 02:37:53 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/cpu/proc.c 2005-07-02 22:38:30 +0200
+@@ -129,8 +129,8 @@ static int show_cpuinfo(struct seq_file
seq_printf(m, " %s", x86_cap_flags[i]);
seq_printf(m, "\nbogomips\t: %lu.%02lu\n\n",
@@ -408,25 +338,13 @@
- (c->loops_per_jiffy/(5000/HZ)) % 100);
+ HZ*(c->loops_per_jiffy >> 3)/62500,
+ (HZ*(c->loops_per_jiffy >> 3)/625) % 100);
+
return 0;
}
-
-diff -NurpP --minimal linux-2.6.11.8/arch/i386/kernel/entry.S linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/entry.S
---- linux-2.6.11.8/arch/i386/kernel/entry.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/entry.S 2005-05-02 22:12:28 +0200
-@@ -846,7 +846,7 @@ ENTRY(sys_call_table)
- .long sys_tgkill /* 270 */
- .long sys_utimes
- .long sys_fadvise64_64
-- .long sys_ni_syscall /* sys_vserver */
-+ .long sys_vserver
- .long sys_mbind
- .long sys_get_mempolicy
- .long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.11.8/arch/i386/kernel/ptrace.c linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/ptrace.c
---- linux-2.6.11.8/arch/i386/kernel/ptrace.c 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/ptrace.c 2005-05-02 22:12:28 +0200
-@@ -379,6 +379,8 @@ asmlinkage int sys_ptrace(long request,
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/ptrace.c
+--- linux-2.6.12.2/arch/i386/kernel/ptrace.c 2005-06-22 02:37:53 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/ptrace.c 2005-07-02 22:38:30 +0200
+@@ -381,6 +381,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -435,10 +353,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.11.8/arch/i386/kernel/smpboot.c linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/smpboot.c
---- linux-2.6.11.8/arch/i386/kernel/smpboot.c 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/smpboot.c 2005-05-02 22:12:28 +0200
-@@ -1025,8 +1025,8 @@ static void __init smp_boot_cpus(unsigne
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/smpboot.c linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/smpboot.c
+--- linux-2.6.12.2/arch/i386/kernel/smpboot.c 2005-06-22 02:37:53 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/smpboot.c 2005-07-02 22:38:30 +0200
+@@ -1023,8 +1023,8 @@ static void __init smp_boot_cpus(unsigne
printk(KERN_INFO
"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
cpucount+1,
@@ -449,9 +367,9 @@
Dprintk("Before bogocount - setting activated=1.\n");
-diff -NurpP --minimal linux-2.6.11.8/arch/i386/kernel/sys_i386.c linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/sys_i386.c
---- linux-2.6.11.8/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
-+++ linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/sys_i386.c 2005-05-02 22:12:28 +0200
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/sys_i386.c linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/sys_i386.c
+--- linux-2.6.12.2/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/sys_i386.c 2005-07-02 22:38:30 +0200
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -499,9 +417,21 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.11.8/arch/i386/kernel/traps.c linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/traps.c
---- linux-2.6.11.8/arch/i386/kernel/traps.c 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/i386/kernel/traps.c 2005-05-02 22:12:28 +0200
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/syscall_table.S linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/syscall_table.S
+--- linux-2.6.12.2/arch/i386/kernel/syscall_table.S 2005-06-22 02:37:53 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/syscall_table.S 2005-07-02 22:38:30 +0200
+@@ -273,7 +273,7 @@ ENTRY(sys_call_table)
+ .long sys_tgkill /* 270 */
+ .long sys_utimes
+ .long sys_fadvise64_64
+- .long sys_ni_syscall /* sys_vserver */
++ .long sys_vserver
+ .long sys_mbind
+ .long sys_get_mempolicy
+ .long sys_set_mempolicy
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/traps.c linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/traps.c
+--- linux-2.6.12.2/arch/i386/kernel/traps.c 2005-06-22 02:37:54 +0200
++++ linux-2.6.12.2-vs2.0-rc5/arch/i386/kernel/traps.c 2005-07-02 22:38:30 +0200
@@ -53,6 +53,7 @@
#include <linux/irq.h>
@@ -526,43 +456,10 @@
if (in_interrupt())
panic("Fatal exception in interrupt");
-diff -NurpP --minimal linux-2.6.11.8/arch/i386/mm/hugetlbpage.c linux-2.6.11.8-vs2.0-pre4/arch/i386/mm/hugetlbpage.c
---- linux-2.6.11.8/arch/i386/mm/hugetlbpage.c 2005-03-02 12:38:20 +0100
-+++ linux-2.6.11.8-vs2.0-pre4/arch/i386/mm/hugetlbpage.c 2005-05-02 22:12:28 +0200
-@@ -46,7 +46,8 @@ static void set_huge_pte(struct mm_struc
- {
- pte_t entry;
-
-- mm->rss += (HPAGE_SIZE / PAGE_SIZE);
-+ // mm->rss += (HPAGE_SIZE / PAGE_SIZE);
-+ vx_rsspages_add(mm, HPAGE_SIZE / PAGE_SIZE);
- if (write_access) {
- entry =
- pte_mkwrite(pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
-@@ -86,7 +87,8 @@ int copy_hugetlb_page_range(struct mm_st
- ptepage = pte_page(entry);
- get_page(ptepage);
- set_pte(dst_pte, entry);
-- dst->rss += (HPAGE_SIZE / PAGE_SIZE);
-+ // dst->rss += (HPAGE_SIZE / PAGE_SIZE);
-+ vx_rsspages_add(dst, HPAGE_SIZE / PAGE_SIZE);
- addr += HPAGE_SIZE;
- }
- return 0;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
More information about the pld-cvs-commit
mailing list