Author: cieciwa Date: Thu Mar 10 10:37:11 2005 GMT
Module: SOURCES Tag: LINUX_2_6_11
---- Log message:
- vserver for 2.6.11.2
---- Files affected:
SOURCES:
linux-2.6-vs.patch (1.1.2.3 -> 1.1.2.3.4.1)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs.patch
diff -u SOURCES/linux-2.6-vs.patch:1.1.2.3
SOURCES/linux-2.6-vs.patch:1.1.2.3.4.1
--- SOURCES/linux-2.6-vs.patch:1.1.2.3 Thu Jan 6 16:54:38 2005
+++ SOURCES/linux-2.6-vs.patch Thu Mar 10 11:37:05 2005
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.10/Documentation/vserver/debug.txt
linux-2.6.10-vs1.9.3.17/Documentation/vserver/debug.txt
---- linux-2.6.10/Documentation/vserver/debug.txt 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/Documentation/vserver/debug.txt 2004-12-26
19:40:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/Documentation/vserver/debug.txt
linux-2.6.11-rc3-vs1.9.4/Documentation/vserver/debug.txt
+--- linux-2.6.11-rc3/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
++++ linux-2.6.11-rc3-vs1.9.4/Documentation/vserver/debug.txt 2005-02-11
23:57:27 +0100
@@ -0,0 +1,171 @@
+
+debug_switch:
@@ -173,22 +173,10 @@
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
+
+
-diff -NurpP --minimal linux-2.6.10/Makefile linux-2.6.10-vs1.9.3.17/Makefile
---- linux-2.6.10/Makefile 2004-12-25 01:54:42.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/Makefile 2005-01-06 07:53:34.000000000 +0100
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 10
--EXTRAVERSION =
-+EXTRAVERSION = -vs1.9.3.17
- NAME=Woozy Numbat
-
- # *DOCUMENTATION*
-diff -NurpP --minimal linux-2.6.10/arch/alpha/Kconfig
linux-2.6.10-vs1.9.3.17/arch/alpha/Kconfig
---- linux-2.6.10/arch/alpha/Kconfig 2004-10-23 05:05:56.000000000 +0200
-+++ linux-2.6.10-vs1.9.3.17/arch/alpha/Kconfig 2004-12-26 19:40:21.000000000
+0100
-@@ -594,6 +594,8 @@ source "arch/alpha/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/alpha/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/alpha/Kconfig
+--- linux-2.6.11-rc3/arch/alpha/Kconfig 2005-02-03 15:19:50 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/alpha/Kconfig 2005-02-11 23:57:20
+0100
+@@ -598,6 +598,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -197,9 +185,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/alpha/kernel/ptrace.c
linux-2.6.10-vs1.9.3.17/arch/alpha/kernel/ptrace.c
---- linux-2.6.10/arch/alpha/kernel/ptrace.c 2004-12-25 01:54:42.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/alpha/kernel/ptrace.c 2004-12-26
19:40:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/alpha/kernel/ptrace.c
linux-2.6.11-rc3-vs1.9.4/arch/alpha/kernel/ptrace.c
+--- linux-2.6.11-rc3/arch/alpha/kernel/ptrace.c 2004-12-25 01:54:42
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/alpha/kernel/ptrace.c 2005-02-11
23:57:20 +0100
@@ -288,6 +288,8 @@ do_sys_ptrace(long request, long pid, lo
read_unlock(&tasklist_lock);
if (!child)
@@ -209,22 +197,22 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
-diff -NurpP --minimal linux-2.6.10/arch/alpha/kernel/systbls.S
linux-2.6.10-vs1.9.3.17/arch/alpha/kernel/systbls.S
---- linux-2.6.10/arch/alpha/kernel/systbls.S 2004-10-23 05:05:56.000000000
+0200
-+++ linux-2.6.10-vs1.9.3.17/arch/alpha/kernel/systbls.S 2004-12-26
19:40:23.000000000 +0100
-@@ -291,7 +291,7 @@ sys_call_table:
- .quad alpha_ni_syscall /* 270 */
- .quad alpha_ni_syscall
- .quad alpha_ni_syscall
-- .quad alpha_ni_syscall
-+ .quad sys_vserver /* 273 sys_vserver */
- .quad alpha_ni_syscall
- .quad alpha_ni_syscall /* 275 */
- .quad alpha_ni_syscall
-diff -NurpP --minimal linux-2.6.10/arch/arm/Kconfig
linux-2.6.10-vs1.9.3.17/arch/arm/Kconfig
---- linux-2.6.10/arch/arm/Kconfig 2004-12-25 01:54:42.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/arch/arm/Kconfig 2004-12-26 19:40:21.000000000
+0100
-@@ -709,6 +709,8 @@ source "drivers/mmc/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/alpha/kernel/systbls.S
linux-2.6.11-rc3-vs1.9.4/arch/alpha/kernel/systbls.S
+--- linux-2.6.11-rc3/arch/alpha/kernel/systbls.S 2004-10-23 05:05:56
+0200
++++ linux-2.6.11-rc3-vs1.9.4/arch/alpha/kernel/systbls.S 2005-02-11
23:57:20 +0100
+@@ -447,7 +447,7 @@ sys_call_table:
+ .quad sys_stat64 /* 425 */
+ .quad sys_lstat64
+ .quad sys_fstat64
+- .quad sys_ni_syscall /* sys_vserver */
++ .quad sys_vserver /* sys_vserver */
+ .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-rc3/arch/arm/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/arm/Kconfig
+--- linux-2.6.11-rc3/arch/arm/Kconfig 2005-02-03 15:19:50 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/arm/Kconfig 2005-02-11 23:57:20 +0100
+@@ -731,6 +731,8 @@ source "drivers/mmc/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -233,10 +221,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/arm/kernel/ptrace.c
linux-2.6.10-vs1.9.3.17/arch/arm/kernel/ptrace.c
---- linux-2.6.10/arch/arm/kernel/ptrace.c 2004-12-25 01:54:42.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/arm/kernel/ptrace.c 2004-12-26
19:40:28.000000000 +0100
-@@ -754,6 +754,8 @@ asmlinkage int sys_ptrace(long request,
+diff -NurpP --minimal linux-2.6.11-rc3/arch/arm/kernel/ptrace.c
linux-2.6.11-rc3-vs1.9.4/arch/arm/kernel/ptrace.c
+--- linux-2.6.11-rc3/arch/arm/kernel/ptrace.c 2005-02-03 15:19:50 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/arm/kernel/ptrace.c 2005-02-11 23:57:20
+0100
+@@ -759,6 +759,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -245,10 +233,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.10/arch/arm26/Kconfig
linux-2.6.10-vs1.9.3.17/arch/arm26/Kconfig
---- linux-2.6.10/arch/arm26/Kconfig 2004-10-23 05:05:57.000000000 +0200
-+++ linux-2.6.10-vs1.9.3.17/arch/arm26/Kconfig 2004-12-26 19:40:21.000000000
+0100
-@@ -216,6 +216,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/arm26/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/arm26/Kconfig
+--- linux-2.6.11-rc3/arch/arm26/Kconfig 2005-02-03 15:19:51 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/arm26/Kconfig 2005-02-11 23:57:20
+0100
+@@ -220,6 +220,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -257,9 +245,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/arm26/kernel/ptrace.c
linux-2.6.10-vs1.9.3.17/arch/arm26/kernel/ptrace.c
---- linux-2.6.10/arch/arm26/kernel/ptrace.c 2004-12-25 01:54:43.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/arm26/kernel/ptrace.c 2004-12-26
19:40:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/arm26/kernel/ptrace.c
linux-2.6.11-rc3-vs1.9.4/arch/arm26/kernel/ptrace.c
+--- linux-2.6.11-rc3/arch/arm26/kernel/ptrace.c 2005-02-03 15:19:51
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/arm26/kernel/ptrace.c 2005-02-11
23:57:20 +0100
@@ -691,6 +691,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -269,10 +257,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.10/arch/cris/Kconfig
linux-2.6.10-vs1.9.3.17/arch/cris/Kconfig
---- linux-2.6.10/arch/cris/Kconfig 2004-10-23 05:05:57.000000000 +0200
-+++ linux-2.6.10-vs1.9.3.17/arch/cris/Kconfig 2004-12-26 19:40:21.000000000
+0100
-@@ -169,6 +169,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/cris/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/cris/Kconfig
+--- linux-2.6.11-rc3/arch/cris/Kconfig 2005-02-03 15:19:51 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/cris/Kconfig 2005-02-11 23:57:20 +0100
+@@ -173,6 +173,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -281,10 +269,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/h8300/Kconfig
linux-2.6.10-vs1.9.3.17/arch/h8300/Kconfig
---- linux-2.6.10/arch/h8300/Kconfig 2004-10-23 05:05:57.000000000 +0200
-+++ linux-2.6.10-vs1.9.3.17/arch/h8300/Kconfig 2004-12-26 19:40:21.000000000
+0100
-@@ -183,6 +183,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/h8300/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/h8300/Kconfig
+--- linux-2.6.11-rc3/arch/h8300/Kconfig 2005-02-03 15:19:51 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/h8300/Kconfig 2005-02-11 23:57:20
+0100
+@@ -187,6 +187,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -293,9 +281,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/h8300/kernel/ptrace.c
linux-2.6.10-vs1.9.3.17/arch/h8300/kernel/ptrace.c
---- linux-2.6.10/arch/h8300/kernel/ptrace.c 2004-12-25 01:54:43.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/h8300/kernel/ptrace.c 2004-12-26
19:40:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/h8300/kernel/ptrace.c
linux-2.6.11-rc3-vs1.9.4/arch/h8300/kernel/ptrace.c
+--- linux-2.6.11-rc3/arch/h8300/kernel/ptrace.c 2004-12-25 01:54:43
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/h8300/kernel/ptrace.c 2005-02-11
23:57:20 +0100
@@ -80,6 +80,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -305,10 +293,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.10/arch/i386/Kconfig
linux-2.6.10-vs1.9.3.17/arch/i386/Kconfig
---- linux-2.6.10/arch/i386/Kconfig 2004-12-25 01:54:43.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/Kconfig 2004-12-26 19:40:36.000000000
+0100
-@@ -553,6 +553,14 @@ config X86_IO_APIC
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/i386/Kconfig
+--- linux-2.6.11-rc3/arch/i386/Kconfig 2005-02-03 15:19:51 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/Kconfig 2005-02-11 23:57:30 +0100
+@@ -568,6 +568,14 @@ config X86_IO_APIC
depends on !SMP && X86_UP_IOAPIC
default y
@@ -323,7 +311,7 @@
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
-@@ -720,6 +728,46 @@ config HIGHMEM64G
+@@ -735,6 +743,46 @@ config HIGHMEM64G
endchoice
@@ -370,7 +358,7 @@
config HIGHMEM
bool
depends on HIGHMEM64G || HIGHMEM4G
-@@ -1194,6 +1242,8 @@ source "arch/i386/oprofile/Kconfig"
+@@ -1210,6 +1258,8 @@ source "arch/i386/oprofile/Kconfig"
source "arch/i386/Kconfig.debug"
@@ -379,42 +367,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/i386/kernel/apic.c
linux-2.6.10-vs1.9.3.17/arch/i386/kernel/apic.c
---- linux-2.6.10/arch/i386/kernel/apic.c 2004-12-25 01:54:43.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/kernel/apic.c 2005-01-02
10:57:33.000000000 +0100
-@@ -877,23 +877,18 @@ static unsigned int __init get_8254_time
- /* next tick in 8254 can be caught by catching timer wraparound */
- static void __init wait_8254_wraparound(void)
- {
-- unsigned int curr_count, prev_count=~0;
-- int delta;
-+ unsigned int curr_count, prev_count;
-
- curr_count = get_8254_timer_count();
--
- do {
- prev_count = curr_count;
- curr_count = get_8254_timer_count();
-- delta = curr_count-prev_count;
-
-- /*
-- * This limit for delta seems arbitrary, but it isn't, it's
-- * slightly above the level of error a buggy Mercury/Neptune
-- * chipset timer can cause.
-- */
-+ /* workaround for broken Mercury/Neptune */
-+ if (prev_count >= curr_count + 0x100)
-+ curr_count = get_8254_timer_count();
-
-- } while (delta < 300);
-+ } while (prev_count >= curr_count);
- }
-
- /*
-diff -NurpP --minimal linux-2.6.10/arch/i386/kernel/cpu/proc.c
linux-2.6.10-vs1.9.3.17/arch/i386/kernel/cpu/proc.c
---- linux-2.6.10/arch/i386/kernel/cpu/proc.c 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/kernel/cpu/proc.c 2004-12-26
19:40:36.000000000 +0100
-@@ -121,8 +121,8 @@ static int show_cpuinfo(struct seq_file
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/kernel/cpu/proc.c
linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/cpu/proc.c
+--- linux-2.6.11-rc3/arch/i386/kernel/cpu/proc.c 2005-02-03 15:19:52
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/cpu/proc.c 2005-02-11
23:57:30 +0100
+@@ -124,8 +124,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",
@@ -425,10 +381,10 @@
return 0;
}
-diff -NurpP --minimal linux-2.6.10/arch/i386/kernel/entry.S
linux-2.6.10-vs1.9.3.17/arch/i386/kernel/entry.S
---- linux-2.6.10/arch/i386/kernel/entry.S 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/kernel/entry.S 2004-12-26
19:40:23.000000000 +0100
-@@ -849,7 +849,7 @@ ENTRY(sys_call_table)
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/kernel/entry.S
linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/entry.S
+--- linux-2.6.11-rc3/arch/i386/kernel/entry.S 2005-02-03 15:19:52 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/entry.S 2005-02-11 23:57:20
+0100
+@@ -846,7 +846,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
.long sys_fadvise64_64
@@ -437,10 +393,10 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.10/arch/i386/kernel/io_apic.c
linux-2.6.10-vs1.9.3.17/arch/i386/kernel/io_apic.c
---- linux-2.6.10/arch/i386/kernel/io_apic.c 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/kernel/io_apic.c 2005-01-02
10:43:41.000000000 +0100
-@@ -1764,7 +1764,7 @@ static int __init timer_irq_works(void)
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/kernel/io_apic.c
linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/io_apic.c
+--- linux-2.6.11-rc3/arch/i386/kernel/io_apic.c 2005-02-03 15:19:52
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/io_apic.c 2005-02-11
23:57:30 +0100
+@@ -1765,7 +1765,7 @@ static int __init timer_irq_works(void)
local_irq_enable();
/* Let ten ticks pass... */
@@ -449,10 +405,10 @@
/*
* Expect a few ticks at least, to be sure some possible
-diff -NurpP --minimal linux-2.6.10/arch/i386/kernel/ptrace.c
linux-2.6.10-vs1.9.3.17/arch/i386/kernel/ptrace.c
---- linux-2.6.10/arch/i386/kernel/ptrace.c 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/kernel/ptrace.c 2004-12-26
19:40:28.000000000 +0100
-@@ -278,6 +278,8 @@ asmlinkage int sys_ptrace(long request,
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/kernel/ptrace.c
linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/ptrace.c
+--- linux-2.6.11-rc3/arch/i386/kernel/ptrace.c 2005-02-03 15:19:52 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/ptrace.c 2005-02-11 23:57:20
+0100
+@@ -379,6 +379,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -461,10 +417,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.10/arch/i386/kernel/smpboot.c
linux-2.6.10-vs1.9.3.17/arch/i386/kernel/smpboot.c
---- linux-2.6.10/arch/i386/kernel/smpboot.c 2004-10-23 05:05:58.000000000
+0200
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/kernel/smpboot.c 2004-12-26
19:40:36.000000000 +0100
-@@ -1024,8 +1024,8 @@ static void __init smp_boot_cpus(unsigne
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/kernel/smpboot.c
linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/smpboot.c
+--- linux-2.6.11-rc3/arch/i386/kernel/smpboot.c 2005-02-03 15:19:52
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/smpboot.c 2005-02-11
23:57:30 +0100
+@@ -1025,8 +1025,8 @@ static void __init smp_boot_cpus(unsigne
printk(KERN_INFO
"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
cpucount+1,
@@ -475,9 +431,9 @@
Dprintk("Before bogocount - setting activated=1.\n");
-diff -NurpP --minimal linux-2.6.10/arch/i386/kernel/sys_i386.c
linux-2.6.10-vs1.9.3.17/arch/i386/kernel/sys_i386.c
---- linux-2.6.10/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23.000000000
+0200
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/kernel/sys_i386.c 2004-12-26
19:40:30.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/kernel/sys_i386.c
linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/sys_i386.c
+--- linux-2.6.11-rc3/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23
+0200
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/sys_i386.c 2005-02-11
23:57:22 +0100
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -525,9 +481,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.10/arch/i386/kernel/traps.c
linux-2.6.10-vs1.9.3.17/arch/i386/kernel/traps.c
---- linux-2.6.10/arch/i386/kernel/traps.c 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/kernel/traps.c 2005-01-02
10:28:58.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/kernel/traps.c
linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/traps.c
+--- linux-2.6.11-rc3/arch/i386/kernel/traps.c 2005-02-03 15:19:52 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/kernel/traps.c 2005-02-11 23:57:27
+0100
@@ -53,6 +53,7 @@
#include <linux/irq.h>
@@ -541,7 +497,7 @@
static int die_counter;
+ vxh_throw_oops();
- if (die.lock_owner != smp_processor_id()) {
+ if (die.lock_owner != _smp_processor_id()) {
console_verbose();
spin_lock_irq(&die.lock);
@@ -340,6 +342,7 @@ void die(const char * str, struct pt_reg
@@ -552,10 +508,10 @@
if (in_interrupt())
panic("Fatal exception in interrupt");
-diff -NurpP --minimal linux-2.6.10/arch/i386/mm/hugetlbpage.c
linux-2.6.10-vs1.9.3.17/arch/i386/mm/hugetlbpage.c
---- linux-2.6.10/arch/i386/mm/hugetlbpage.c 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/i386/mm/hugetlbpage.c 2004-12-26
19:40:35.000000000 +0100
-@@ -42,7 +42,8 @@ static void set_huge_pte(struct mm_struc
+diff -NurpP --minimal linux-2.6.11-rc3/arch/i386/mm/hugetlbpage.c
linux-2.6.11-rc3-vs1.9.4/arch/i386/mm/hugetlbpage.c
+--- linux-2.6.11-rc3/arch/i386/mm/hugetlbpage.c 2005-02-03 15:19:52
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/i386/mm/hugetlbpage.c 2005-02-11
23:57:27 +0100
+@@ -46,7 +46,8 @@ static void set_huge_pte(struct mm_struc
{
pte_t entry;
@@ -565,7 +521,7 @@
if (write_access) {
entry =
pte_mkwrite(pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
-@@ -82,7 +83,8 @@ int copy_hugetlb_page_range(struct mm_st
+@@ -86,7 +87,8 @@ int copy_hugetlb_page_range(struct mm_st
ptepage = pte_page(entry);
get_page(ptepage);
set_pte(dst_pte, entry);
@@ -575,7 +531,7 @@
addr += HPAGE_SIZE;
}
return 0;
-@@ -218,7 +220,8 @@ void unmap_hugepage_range(struct vm_area
+@@ -222,7 +224,8 @@ void unmap_hugepage_range(struct vm_area
page = pte_page(pte);
put_page(page);
}
@@ -585,10 +541,10 @@
flush_tlb_range(vma, start, end);
}
-diff -NurpP --minimal linux-2.6.10/arch/ia64/Kconfig
linux-2.6.10-vs1.9.3.17/arch/ia64/Kconfig
---- linux-2.6.10/arch/ia64/Kconfig 2004-10-23 05:05:58.000000000 +0200
-+++ linux-2.6.10-vs1.9.3.17/arch/ia64/Kconfig 2004-12-26 19:40:21.000000000
+0100
-@@ -387,6 +387,8 @@ source "arch/ia64/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/ia64/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/ia64/Kconfig
+--- linux-2.6.11-rc3/arch/ia64/Kconfig 2005-02-03 15:19:52 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/ia64/Kconfig 2005-02-11 23:57:20 +0100
+@@ -422,6 +422,8 @@ source "arch/ia64/oprofile/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -597,9 +553,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.10-vs1.9.3.17/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.10/arch/ia64/ia32/binfmt_elf32.c 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/ia64/ia32/binfmt_elf32.c 2004-12-26
19:40:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.11-rc3-vs1.9.4/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.11-rc3/arch/ia64/ia32/binfmt_elf32.c 2005-02-03 15:19:52
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/ia64/ia32/binfmt_elf32.c 2005-02-11
23:57:27 +0100
@@ -199,7 +199,7 @@ ia64_elf32_init (struct pt_regs *regs)
int
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
@@ -633,10 +589,10 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.10/arch/ia64/kernel/entry.S
linux-2.6.10-vs1.9.3.17/arch/ia64/kernel/entry.S
---- linux-2.6.10/arch/ia64/kernel/entry.S 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/ia64/kernel/entry.S 2004-12-26
19:40:23.000000000 +0100
-@@ -1526,7 +1526,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.11-rc3/arch/ia64/kernel/entry.S
linux-2.6.11-rc3-vs1.9.4/arch/ia64/kernel/entry.S
+--- linux-2.6.11-rc3/arch/ia64/kernel/entry.S 2005-02-03 15:19:52 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/ia64/kernel/entry.S 2005-02-11 23:57:20
+0100
+@@ -1571,7 +1571,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_ni_syscall // reserved for kexec_load
@@ -645,9 +601,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.10/arch/ia64/kernel/perfmon.c
linux-2.6.10-vs1.9.3.17/arch/ia64/kernel/perfmon.c
---- linux-2.6.10/arch/ia64/kernel/perfmon.c 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/ia64/kernel/perfmon.c 2004-12-26
19:40:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/ia64/kernel/perfmon.c
linux-2.6.11-rc3-vs1.9.4/arch/ia64/kernel/perfmon.c
+--- linux-2.6.11-rc3/arch/ia64/kernel/perfmon.c 2005-02-03 15:19:52
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/ia64/kernel/perfmon.c 2005-02-11
23:57:27 +0100
@@ -39,6 +39,8 @@
#include <linux/mount.h>
#include <linux/version.h>
@@ -657,7 +613,7 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-@@ -2341,7 +2343,8 @@ pfm_smpl_buffer_alloc(struct task_struct
+@@ -2339,7 +2341,8 @@ pfm_smpl_buffer_alloc(struct task_struct
*/
insert_vm_struct(mm, vma);
@@ -667,10 +623,10 @@
vm_stat_account(vma);
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.10/arch/ia64/kernel/ptrace.c
linux-2.6.10-vs1.9.3.17/arch/ia64/kernel/ptrace.c
---- linux-2.6.10/arch/ia64/kernel/ptrace.c 2004-12-25 01:54:44.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/ia64/kernel/ptrace.c 2004-12-26
19:40:28.000000000 +0100
-@@ -1326,6 +1326,9 @@ sys_ptrace (long request, pid_t pid, uns
+diff -NurpP --minimal linux-2.6.11-rc3/arch/ia64/kernel/ptrace.c
linux-2.6.11-rc3-vs1.9.4/arch/ia64/kernel/ptrace.c
+--- linux-2.6.11-rc3/arch/ia64/kernel/ptrace.c 2005-02-03 15:19:52 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/ia64/kernel/ptrace.c 2005-02-11 23:57:20
+0100
+@@ -1323,6 +1323,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -680,9 +636,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.10/arch/ia64/mm/fault.c
linux-2.6.10-vs1.9.3.17/arch/ia64/mm/fault.c
---- linux-2.6.10/arch/ia64/mm/fault.c 2004-12-25 01:54:44.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/arch/ia64/mm/fault.c 2004-12-26
19:40:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/ia64/mm/fault.c
linux-2.6.11-rc3-vs1.9.4/arch/ia64/mm/fault.c
+--- linux-2.6.11-rc3/arch/ia64/mm/fault.c 2005-02-03 15:19:52 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/ia64/mm/fault.c 2005-02-11 23:57:27
+0100
@@ -9,6 +9,7 @@
#include <linux/mm.h>
#include <linux/smp_lock.h>
@@ -714,10 +670,10 @@
__vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
return 0;
}
-diff -NurpP --minimal linux-2.6.10/arch/ia64/mm/hugetlbpage.c
linux-2.6.10-vs1.9.3.17/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.10/arch/ia64/mm/hugetlbpage.c 2004-08-14 12:55:32.000000000
+0200
-+++ linux-2.6.10-vs1.9.3.17/arch/ia64/mm/hugetlbpage.c 2004-12-26
19:40:35.000000000 +0100
-@@ -65,7 +65,8 @@ set_huge_pte (struct mm_struct *mm, stru
+diff -NurpP --minimal linux-2.6.11-rc3/arch/ia64/mm/hugetlbpage.c
linux-2.6.11-rc3-vs1.9.4/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.11-rc3/arch/ia64/mm/hugetlbpage.c 2005-02-03 15:19:52
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/ia64/mm/hugetlbpage.c 2005-02-11
23:57:27 +0100
+@@ -73,7 +73,8 @@ set_huge_pte (struct mm_struct *mm, stru
{
pte_t entry;
@@ -727,7 +683,7 @@
if (write_access) {
entry =
pte_mkwrite(pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
-@@ -108,7 +109,8 @@ int copy_hugetlb_page_range(struct mm_st
+@@ -116,7 +117,8 @@ int copy_hugetlb_page_range(struct mm_st
ptepage = pte_page(entry);
get_page(ptepage);
set_pte(dst_pte, entry);
@@ -737,7 +693,7 @@
addr += HPAGE_SIZE;
}
return 0;
-@@ -249,7 +251,8 @@ void unmap_hugepage_range(struct vm_area
+@@ -246,7 +248,8 @@ void unmap_hugepage_range(struct vm_area
put_page(page);
pte_clear(pte);
}
@@ -747,10 +703,10 @@
flush_tlb_range(vma, start, end);
}
-diff -NurpP --minimal linux-2.6.10/arch/m68k/Kconfig
linux-2.6.10-vs1.9.3.17/arch/m68k/Kconfig
---- linux-2.6.10/arch/m68k/Kconfig 2004-12-25 01:54:45.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/arch/m68k/Kconfig 2004-12-26 19:40:22.000000000
+0100
-@@ -659,6 +659,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/m68k/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/m68k/Kconfig
+--- linux-2.6.11-rc3/arch/m68k/Kconfig 2005-02-03 15:19:53 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/m68k/Kconfig 2005-02-11 23:57:20 +0100
+@@ -663,6 +663,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -759,9 +715,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/m68k/atari/stram.c
linux-2.6.10-vs1.9.3.17/arch/m68k/atari/stram.c
---- linux-2.6.10/arch/m68k/atari/stram.c 2004-08-14 12:55:48.000000000
+0200
-+++ linux-2.6.10-vs1.9.3.17/arch/m68k/atari/stram.c 2004-12-26
19:40:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/m68k/atari/stram.c
linux-2.6.11-rc3-vs1.9.4/arch/m68k/atari/stram.c
+--- linux-2.6.11-rc3/arch/m68k/atari/stram.c 2005-02-03 15:19:53 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/m68k/atari/stram.c 2005-02-11 23:57:27
+0100
@@ -635,7 +635,8 @@ static inline void unswap_pte(struct vm_
set_pte(dir, pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
swap_free(entry);
@@ -772,9 +728,9 @@
}
static inline void unswap_pmd(struct vm_area_struct * vma, pmd_t *dir,
-diff -NurpP --minimal linux-2.6.10/arch/m68k/kernel/ptrace.c
linux-2.6.10-vs1.9.3.17/arch/m68k/kernel/ptrace.c
---- linux-2.6.10/arch/m68k/kernel/ptrace.c 2004-12-25 01:54:45.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/m68k/kernel/ptrace.c 2004-12-26
19:40:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/m68k/kernel/ptrace.c
linux-2.6.11-rc3-vs1.9.4/arch/m68k/kernel/ptrace.c
+--- linux-2.6.11-rc3/arch/m68k/kernel/ptrace.c 2004-12-25 01:54:45 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/m68k/kernel/ptrace.c 2005-02-11 23:57:20
+0100
@@ -140,6 +140,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -784,10 +740,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.10/arch/m68knommu/Kconfig
linux-2.6.10-vs1.9.3.17/arch/m68knommu/Kconfig
---- linux-2.6.10/arch/m68knommu/Kconfig 2004-12-25 01:54:45.000000000
+0100
-+++ linux-2.6.10-vs1.9.3.17/arch/m68knommu/Kconfig 2004-12-26
19:40:23.000000000 +0100
-@@ -581,6 +581,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/m68knommu/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/m68knommu/Kconfig
+--- linux-2.6.11-rc3/arch/m68knommu/Kconfig 2005-02-03 15:19:53 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/m68knommu/Kconfig 2005-02-11 23:57:20
+0100
+@@ -574,6 +574,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -796,9 +752,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.10/arch/m68knommu/kernel/ptrace.c
linux-2.6.10-vs1.9.3.17/arch/m68knommu/kernel/ptrace.c
---- linux-2.6.10/arch/m68knommu/kernel/ptrace.c 2004-12-25
01:54:45.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/arch/m68knommu/kernel/ptrace.c 2004-12-26
19:40:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.11-rc3/arch/m68knommu/kernel/ptrace.c
linux-2.6.11-rc3-vs1.9.4/arch/m68knommu/kernel/ptrace.c
+--- linux-2.6.11-rc3/arch/m68knommu/kernel/ptrace.c 2004-12-25 01:54:45
+0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/m68knommu/kernel/ptrace.c 2005-02-11
23:57:20 +0100
@@ -124,6 +124,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -808,10 +764,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.10/arch/mips/Kconfig
linux-2.6.10-vs1.9.3.17/arch/mips/Kconfig
---- linux-2.6.10/arch/mips/Kconfig 2004-12-25 01:54:45.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/arch/mips/Kconfig 2004-12-26 19:40:23.000000000
+0100
-@@ -1581,6 +1581,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.11-rc3/arch/mips/Kconfig
linux-2.6.11-rc3-vs1.9.4/arch/mips/Kconfig
+--- linux-2.6.11-rc3/arch/mips/Kconfig 2005-02-03 15:19:53 +0100
++++ linux-2.6.11-rc3-vs1.9.4/arch/mips/Kconfig 2005-02-11 23:57:20 +0100
+@@ -1645,6 +1645,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-vs.patch?r1=1.1.2.3&r2=1.1.2.3.4.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
