SOURCES (LINUX_2_6): linux-2.6-vs2.patch - updated to vs2.0rc6
baggins
baggins at pld-linux.org
Sat Jul 9 17:16:58 CEST 2005
Author: baggins Date: Sat Jul 9 15:16:58 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated to vs2.0rc6
---- Files affected:
SOURCES:
linux-2.6-vs2.patch (1.1.2.4 -> 1.1.2.5)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.patch
diff -u SOURCES/linux-2.6-vs2.patch:1.1.2.4 SOURCES/linux-2.6-vs2.patch:1.1.2.5
--- SOURCES/linux-2.6-vs2.patch:1.1.2.4 Thu Jul 7 17:28:19 2005
+++ SOURCES/linux-2.6-vs2.patch Sat Jul 9 17:16:53 2005
@@ -1,7 +1,7 @@
-diff -NurpP --minimal linux-2.6.12.2/Documentation/vserver/debug.txt linux-2.6.12.2-vs2.0-rc5/Documentation/vserver/debug.txt
+diff -NurpP --minimal linux-2.6.12.2/Documentation/vserver/debug.txt linux-2.6.12.2-vs2.0-rc6/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 @@
++++ linux-2.6.12.2-vs2.0-rc6/Documentation/vserver/debug.txt 2005-07-09 03:54:45 +0200
+@@ -0,0 +1,106 @@
+
+debug_cvirt:
+
@@ -69,7 +69,8 @@
+debug_switch:
+
+ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p,%d"
-+ 1 2 "%s: (%s %s) returned %s with %d"
++ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld)"
++ 4 10 "%s: (%s %s) returned %s with %d"
+
+debug_xid:
+
@@ -107,9 +108,9 @@
+ 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.12.2/arch/alpha/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/alpha/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/alpha/Kconfig linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/arch/alpha/Kconfig 2005-07-02 22:38:30 +0200
@@ -602,6 +602,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -119,9 +120,42 @@
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/alpha/kernel/entry.S linux-2.6.12.2-vs2.0-rc6/arch/alpha/kernel/entry.S
+--- linux-2.6.12.2/arch/alpha/kernel/entry.S 2004-08-14 12:54:46 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/alpha/kernel/entry.S 2005-07-09 03:54:37 +0200
+@@ -873,22 +873,15 @@ sys_getxgid:
+ .globl sys_getxpid
+ .ent sys_getxpid
+ sys_getxpid:
++ lda $sp, -16($sp)
++ stq $26, 0($sp)
+ .prologue 0
+- ldq $2, TI_TASK($8)
+
+- /* See linux/kernel/timer.c sys_getppid for discussion
+- about this loop. */
+- ldq $3, TASK_REAL_PARENT($2)
+-1: ldl $1, TASK_TGID($3)
+-#ifdef CONFIG_SMP
+- mov $3, $4
+- mb
+- ldq $3, TASK_REAL_PARENT($2)
+- cmpeq $3, $4, $4
+- beq $4, 1b
+-#endif
+- stq $1, 80($sp)
+- ldl $0, TASK_TGID($2)
++ lda $16, 96($sp)
++ jsr $26, do_getxpid
++ ldq $26, 0($sp)
++
++ lda $sp, 16($sp)
+ ret
+ .end sys_getxpid
+
+diff -NurpP --minimal linux-2.6.12.2/arch/alpha/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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)
@@ -131,9 +165,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/alpha/kernel/systbls.S linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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
@@ -143,9 +177,20 @@
.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.12.2/arch/arm/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/arm/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/alpha/mm/init.c linux-2.6.12.2-vs2.0-rc6/arch/alpha/mm/init.c
+--- linux-2.6.12.2/arch/alpha/mm/init.c 2005-03-02 12:38:18 +0100
++++ linux-2.6.12.2-vs2.0-rc6/arch/alpha/mm/init.c 2005-07-09 03:54:37 +0200
+@@ -20,6 +20,7 @@
+ #include <linux/init.h>
+ #include <linux/bootmem.h> /* max_low_pfn */
+ #include <linux/vmalloc.h>
++#include <linux/pagemap.h>
+
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+diff -NurpP --minimal linux-2.6.12.2/arch/arm/Kconfig linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/arch/arm/Kconfig 2005-07-02 22:38:30 +0200
@@ -739,6 +739,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -155,9 +200,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/arm/kernel/calls.S linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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
@@ -166,9 +211,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/arm/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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)
@@ -178,9 +223,9 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.2/arch/arm26/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/arm26/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/arm26/Kconfig linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/arch/arm26/Kconfig 2005-07-02 22:38:30 +0200
@@ -224,6 +224,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -190,9 +235,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/arm26/kernel/calls.S linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/arch/arm26/kernel/calls.S 2005-07-02 22:38:30 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -205,9 +250,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/arm26/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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)
@@ -217,9 +262,9 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.2/arch/cris/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/cris/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/cris/Kconfig linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/arch/cris/Kconfig 2005-07-02 22:38:30 +0200
@@ -173,6 +173,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -229,9 +274,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.2/arch/h8300/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/h8300/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/h8300/Kconfig linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/arch/h8300/Kconfig 2005-07-02 22:38:30 +0200
@@ -187,6 +187,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -241,9 +286,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/h8300/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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)
@@ -253,9 +298,9 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.2/arch/i386/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/i386/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/Kconfig linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/arch/i386/Kconfig 2005-07-02 22:38:30 +0200
@@ -574,6 +574,14 @@ config X86_VISWS_APIC
depends on X86_VISWS
default y
@@ -327,9 +372,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/cpu/proc.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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]);
@@ -341,9 +386,9 @@
return 0;
}
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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)
@@ -353,9 +398,9 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/smpboot.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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",
@@ -367,9 +412,9 @@
Dprintk("Before bogocount - setting activated=1.\n");
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/sys_i386.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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>
@@ -417,9 +462,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-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
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/syscall_table.S linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/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
@@ -429,9 +474,9 @@
.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
+diff -NurpP --minimal linux-2.6.12.2/arch/i386/kernel/traps.c linux-2.6.12.2-vs2.0-rc6/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
++++ linux-2.6.12.2-vs2.0-rc6/arch/i386/kernel/traps.c 2005-07-02 22:38:30 +0200
@@ -53,6 +53,7 @@
#include <linux/irq.h>
@@ -456,9 +501,9 @@
if (in_interrupt())
panic("Fatal exception in interrupt");
-diff -NurpP --minimal linux-2.6.12.2/arch/ia64/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/ia64/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/ia64/Kconfig linux-2.6.12.2-vs2.0-rc6/arch/ia64/Kconfig
--- linux-2.6.12.2/arch/ia64/Kconfig 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/ia64/Kconfig 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/ia64/Kconfig 2005-07-02 22:38:30 +0200
@@ -438,6 +438,8 @@ source "arch/ia64/oprofile/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -468,9 +513,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.2/arch/ia64/ia32/binfmt_elf32.c linux-2.6.12.2-vs2.0-rc5/arch/ia64/ia32/binfmt_elf32.c
+diff -NurpP --minimal linux-2.6.12.2/arch/ia64/ia32/binfmt_elf32.c linux-2.6.12.2-vs2.0-rc6/arch/ia64/ia32/binfmt_elf32.c
--- linux-2.6.12.2/arch/ia64/ia32/binfmt_elf32.c 2005-03-02 12:38:21 +0100
-+++ linux-2.6.12.2-vs2.0-rc5/arch/ia64/ia32/binfmt_elf32.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/ia64/ia32/binfmt_elf32.c 2005-07-02 22:38:30 +0200
@@ -199,7 +199,7 @@ ia64_elf32_init (struct pt_regs *regs)
int
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
@@ -503,9 +548,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.12.2/arch/ia64/ia32/ia32_entry.S linux-2.6.12.2-vs2.0-rc5/arch/ia64/ia32/ia32_entry.S
+diff -NurpP --minimal linux-2.6.12.2/arch/ia64/ia32/ia32_entry.S linux-2.6.12.2-vs2.0-rc6/arch/ia64/ia32/ia32_entry.S
--- linux-2.6.12.2/arch/ia64/ia32/ia32_entry.S 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/ia64/ia32/ia32_entry.S 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/ia64/ia32/ia32_entry.S 2005-07-02 22:38:30 +0200
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -515,9 +560,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.12.2/arch/ia64/kernel/entry.S linux-2.6.12.2-vs2.0-rc5/arch/ia64/kernel/entry.S
+diff -NurpP --minimal linux-2.6.12.2/arch/ia64/kernel/entry.S linux-2.6.12.2-vs2.0-rc6/arch/ia64/kernel/entry.S
--- linux-2.6.12.2/arch/ia64/kernel/entry.S 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/ia64/kernel/entry.S 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/ia64/kernel/entry.S 2005-07-02 22:38:30 +0200
@@ -1572,7 +1572,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -527,9 +572,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.12.2/arch/ia64/kernel/perfmon.c linux-2.6.12.2-vs2.0-rc5/arch/ia64/kernel/perfmon.c
+diff -NurpP --minimal linux-2.6.12.2/arch/ia64/kernel/perfmon.c linux-2.6.12.2-vs2.0-rc6/arch/ia64/kernel/perfmon.c
--- linux-2.6.12.2/arch/ia64/kernel/perfmon.c 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/ia64/kernel/perfmon.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/ia64/kernel/perfmon.c 2005-07-02 22:38:30 +0200
@@ -39,6 +39,8 @@
#include <linux/mount.h>
#include <linux/version.h>
@@ -548,9 +593,9 @@
vm_stat_account(vma);
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.12.2/arch/ia64/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/ia64/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.12.2/arch/ia64/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/arch/ia64/kernel/ptrace.c
--- linux-2.6.12.2/arch/ia64/kernel/ptrace.c 2005-07-02 21:56:06 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/ia64/kernel/ptrace.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/ia64/kernel/ptrace.c 2005-07-02 22:38:30 +0200
@@ -1436,6 +1436,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
@@ -561,9 +606,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.12.2/arch/ia64/mm/fault.c linux-2.6.12.2-vs2.0-rc5/arch/ia64/mm/fault.c
+diff -NurpP --minimal linux-2.6.12.2/arch/ia64/mm/fault.c linux-2.6.12.2-vs2.0-rc6/arch/ia64/mm/fault.c
--- linux-2.6.12.2/arch/ia64/mm/fault.c 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/ia64/mm/fault.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/ia64/mm/fault.c 2005-07-02 22:38:30 +0200
@@ -9,6 +9,7 @@
#include <linux/mm.h>
#include <linux/smp_lock.h>
@@ -593,9 +638,9 @@
__vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
return 0;
}
-diff -NurpP --minimal linux-2.6.12.2/arch/m68k/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/m68k/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/m68k/Kconfig linux-2.6.12.2-vs2.0-rc6/arch/m68k/Kconfig
--- linux-2.6.12.2/arch/m68k/Kconfig 2005-03-02 12:38:21 +0100
-+++ linux-2.6.12.2-vs2.0-rc5/arch/m68k/Kconfig 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/m68k/Kconfig 2005-07-02 22:38:30 +0200
@@ -663,6 +663,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -605,9 +650,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.2/arch/m68k/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/m68k/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.12.2/arch/m68k/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/arch/m68k/kernel/ptrace.c
--- linux-2.6.12.2/arch/m68k/kernel/ptrace.c 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/m68k/kernel/ptrace.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/m68k/kernel/ptrace.c 2005-07-02 22:38:30 +0200
@@ -141,6 +141,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -617,9 +662,9 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.2/arch/m68knommu/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/m68knommu/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/m68knommu/Kconfig linux-2.6.12.2-vs2.0-rc6/arch/m68knommu/Kconfig
--- linux-2.6.12.2/arch/m68knommu/Kconfig 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/m68knommu/Kconfig 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/m68knommu/Kconfig 2005-07-02 22:38:30 +0200
@@ -579,6 +579,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -629,9 +674,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.2/arch/m68knommu/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/m68knommu/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.12.2/arch/m68knommu/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/arch/m68knommu/kernel/ptrace.c
--- linux-2.6.12.2/arch/m68knommu/kernel/ptrace.c 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/m68knommu/kernel/ptrace.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/m68knommu/kernel/ptrace.c 2005-07-02 22:38:30 +0200
@@ -125,6 +125,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -641,9 +686,9 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/mips/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/Kconfig linux-2.6.12.2-vs2.0-rc6/arch/mips/Kconfig
--- linux-2.6.12.2/arch/mips/Kconfig 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/Kconfig 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/Kconfig 2005-07-02 22:38:30 +0200
@@ -1640,6 +1640,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -653,9 +698,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/linux32.c linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/linux32.c
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/linux32.c linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/linux32.c
--- linux-2.6.12.2/arch/mips/kernel/linux32.c 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/linux32.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/linux32.c 2005-07-02 22:38:30 +0200
@@ -1199,7 +1199,7 @@ asmlinkage long sys32_newuname(struct ne
int ret = 0;
@@ -665,9 +710,9 @@
ret = -EFAULT;
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/ptrace.c
--- linux-2.6.12.2/arch/mips/kernel/ptrace.c 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/ptrace.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/ptrace.c 2005-07-02 22:38:30 +0200
@@ -78,6 +78,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -677,9 +722,9 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/scall32-o32.S linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/scall32-o32.S
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/scall32-o32.S linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/scall32-o32.S
--- linux-2.6.12.2/arch/mips/kernel/scall32-o32.S 2005-03-02 12:38:22 +0100
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/scall32-o32.S 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/scall32-o32.S 2005-07-02 22:38:30 +0200
@@ -617,7 +617,7 @@ einval: li v0, -EINVAL
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -689,9 +734,9 @@
sys sys_waitid 4
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/scall64-64.S linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/scall64-64.S
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/scall64-64.S linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/scall64-64.S
--- linux-2.6.12.2/arch/mips/kernel/scall64-64.S 2005-03-02 12:38:22 +0100
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/scall64-64.S 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/scall64-64.S 2005-07-02 22:38:30 +0200
@@ -443,7 +443,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -701,9 +746,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/scall64-n32.S linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/scall64-n32.S
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/scall64-n32.S linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/scall64-n32.S
--- linux-2.6.12.2/arch/mips/kernel/scall64-n32.S 2005-03-02 12:38:22 +0100
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/scall64-n32.S 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/scall64-n32.S 2005-07-02 22:38:30 +0200
@@ -357,7 +357,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -713,9 +758,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/scall64-o32.S linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/scall64-o32.S
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/scall64-o32.S linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/scall64-o32.S
--- linux-2.6.12.2/arch/mips/kernel/scall64-o32.S 2005-03-02 12:38:22 +0100
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/scall64-o32.S 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/scall64-o32.S 2005-07-02 22:38:30 +0200
@@ -479,7 +479,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -725,9 +770,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/syscall.c linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/syscall.c
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/syscall.c linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/syscall.c
--- linux-2.6.12.2/arch/mips/kernel/syscall.c 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/syscall.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/syscall.c 2005-07-02 22:38:30 +0200
@@ -26,6 +26,7 @@
#include <linux/msg.h>
#include <linux/shm.h>
@@ -788,9 +833,9 @@
up_write(&uts_sem);
return 0;
}
-diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/sysirix.c linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/sysirix.c
+diff -NurpP --minimal linux-2.6.12.2/arch/mips/kernel/sysirix.c linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/sysirix.c
--- linux-2.6.12.2/arch/mips/kernel/sysirix.c 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/mips/kernel/sysirix.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/mips/kernel/sysirix.c 2005-07-02 22:38:30 +0200
@@ -30,6 +30,7 @@
#include <linux/socket.h>
#include <linux/security.h>
@@ -809,9 +854,9 @@
ret = -ENOMEM;
goto out;
}
-diff -NurpP --minimal linux-2.6.12.2/arch/parisc/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/parisc/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/parisc/Kconfig linux-2.6.12.2-vs2.0-rc6/arch/parisc/Kconfig
--- linux-2.6.12.2/arch/parisc/Kconfig 2005-06-22 02:37:56 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/parisc/Kconfig 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/parisc/Kconfig 2005-07-02 22:38:30 +0200
@@ -196,6 +196,8 @@ source "arch/parisc/oprofile/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -821,9 +866,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.2/arch/parisc/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc5/arch/parisc/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.12.2/arch/parisc/kernel/ptrace.c linux-2.6.12.2-vs2.0-rc6/arch/parisc/kernel/ptrace.c
--- linux-2.6.12.2/arch/parisc/kernel/ptrace.c 2005-06-22 02:37:56 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/parisc/kernel/ptrace.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/parisc/kernel/ptrace.c 2005-07-02 22:38:30 +0200
@@ -111,6 +111,9 @@ long sys_ptrace(long request, pid_t pid,
read_unlock(&tasklist_lock);
if (!child)
@@ -834,9 +879,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.12.2/arch/parisc/kernel/sys_parisc32.c linux-2.6.12.2-vs2.0-rc5/arch/parisc/kernel/sys_parisc32.c
+diff -NurpP --minimal linux-2.6.12.2/arch/parisc/kernel/sys_parisc32.c linux-2.6.12.2-vs2.0-rc6/arch/parisc/kernel/sys_parisc32.c
--- linux-2.6.12.2/arch/parisc/kernel/sys_parisc32.c 2005-06-22 02:37:56 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/parisc/kernel/sys_parisc32.c 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/parisc/kernel/sys_parisc32.c 2005-07-02 22:38:30 +0200
@@ -657,6 +657,7 @@ asmlinkage int sys32_sysinfo(struct sysi
do {
@@ -845,9 +890,9 @@
val.uptime = jiffies / HZ;
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.12.2/arch/parisc/kernel/syscall_table.S linux-2.6.12.2-vs2.0-rc5/arch/parisc/kernel/syscall_table.S
+diff -NurpP --minimal linux-2.6.12.2/arch/parisc/kernel/syscall_table.S linux-2.6.12.2-vs2.0-rc6/arch/parisc/kernel/syscall_table.S
--- linux-2.6.12.2/arch/parisc/kernel/syscall_table.S 2005-06-22 02:37:56 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/parisc/kernel/syscall_table.S 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/parisc/kernel/syscall_table.S 2005-07-02 22:38:30 +0200
@@ -368,5 +368,16 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -865,9 +910,9 @@
+ ENTRY_DIFF(vserver)
/* Nothing yet */
-diff -NurpP --minimal linux-2.6.12.2/arch/ppc/Kconfig linux-2.6.12.2-vs2.0-rc5/arch/ppc/Kconfig
+diff -NurpP --minimal linux-2.6.12.2/arch/ppc/Kconfig linux-2.6.12.2-vs2.0-rc6/arch/ppc/Kconfig
--- linux-2.6.12.2/arch/ppc/Kconfig 2005-06-22 02:37:56 +0200
-+++ linux-2.6.12.2-vs2.0-rc5/arch/ppc/Kconfig 2005-07-02 22:38:30 +0200
++++ linux-2.6.12.2-vs2.0-rc6/arch/ppc/Kconfig 2005-07-02 22:38:30 +0200
@@ -1332,6 +1332,8 @@ source "arch/ppc/oprofile/Kconfig"
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
More information about the pld-cvs-commit
mailing list