SOURCES (LINUX_2_6): linux-2.6-vs2.patch - updated to vs2.1.0-pre6...
baggins
baggins at pld-linux.org
Tue Sep 6 13:23:17 CEST 2005
Author: baggins Date: Tue Sep 6 11:23:17 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated to vs2.1.0-pre6
- Bind Mount Extensions merged in upstream
---- Files affected:
SOURCES:
linux-2.6-vs2.patch (1.1.2.7 -> 1.1.2.8)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.patch
diff -u SOURCES/linux-2.6-vs2.patch:1.1.2.7 SOURCES/linux-2.6-vs2.patch:1.1.2.8
--- SOURCES/linux-2.6-vs2.patch:1.1.2.7 Tue Aug 23 17:59:11 2005
+++ SOURCES/linux-2.6-vs2.patch Tue Sep 6 13:23:12 2005
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.12.3/Documentation/vserver/debug.txt linux-2.6.12.3-vs2.0-rc9/Documentation/vserver/debug.txt
---- linux-2.6.12.3/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.12.3-vs2.0-rc9/Documentation/vserver/debug.txt 2005-08-01 10:32:46 +0200
+diff -NurpP --minimal linux-2.6.13/Documentation/vserver/debug.txt linux-2.6.13-vs2.1.0-pre6/Documentation/vserver/debug.txt
+--- linux-2.6.13/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.13-vs2.1.0-pre6/Documentation/vserver/debug.txt 2005-08-29 23:11:08 +0200
@@ -0,0 +1,106 @@
+
+debug_cvirt:
@@ -108,10 +108,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.12.3/arch/alpha/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/alpha/Kconfig
---- linux-2.6.12.3/arch/alpha/Kconfig 2005-06-22 02:37:51 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/alpha/Kconfig 2005-08-01 10:32:37 +0200
-@@ -602,6 +602,8 @@ source "arch/alpha/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.13/arch/alpha/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/alpha/Kconfig
+--- linux-2.6.13/arch/alpha/Kconfig 2005-08-29 22:24:49 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/alpha/Kconfig 2005-08-29 23:11:08 +0200
+@@ -606,6 +606,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -120,9 +120,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/alpha/kernel/entry.S linux-2.6.12.3-vs2.0-rc9/arch/alpha/kernel/entry.S
---- linux-2.6.12.3/arch/alpha/kernel/entry.S 2004-08-14 12:54:46 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/alpha/kernel/entry.S 2005-08-01 10:32:39 +0200
+diff -NurpP --minimal linux-2.6.13/arch/alpha/kernel/entry.S linux-2.6.13-vs2.1.0-pre6/arch/alpha/kernel/entry.S
+--- linux-2.6.13/arch/alpha/kernel/entry.S 2004-08-14 12:54:46 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/alpha/kernel/entry.S 2005-08-29 23:11:08 +0200
@@ -873,22 +873,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -153,9 +153,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.12.3/arch/alpha/kernel/ptrace.c linux-2.6.12.3-vs2.0-rc9/arch/alpha/kernel/ptrace.c
---- linux-2.6.12.3/arch/alpha/kernel/ptrace.c 2005-06-22 02:37:51 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/alpha/kernel/ptrace.c 2005-08-01 10:32:38 +0200
+diff -NurpP --minimal linux-2.6.13/arch/alpha/kernel/ptrace.c linux-2.6.13-vs2.1.0-pre6/arch/alpha/kernel/ptrace.c
+--- linux-2.6.13/arch/alpha/kernel/ptrace.c 2005-06-22 02:37:51 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/alpha/kernel/ptrace.c 2005-08-29 23:11:08 +0200
@@ -289,6 +289,8 @@ do_sys_ptrace(long request, long pid, lo
read_unlock(&tasklist_lock);
if (!child)
@@ -165,9 +165,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
-diff -NurpP --minimal linux-2.6.12.3/arch/alpha/kernel/systbls.S linux-2.6.12.3-vs2.0-rc9/arch/alpha/kernel/systbls.S
---- linux-2.6.12.3/arch/alpha/kernel/systbls.S 2005-06-22 02:37:51 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/alpha/kernel/systbls.S 2005-08-01 10:32:37 +0200
+diff -NurpP --minimal linux-2.6.13/arch/alpha/kernel/systbls.S linux-2.6.13-vs2.1.0-pre6/arch/alpha/kernel/systbls.S
+--- linux-2.6.13/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/alpha/kernel/systbls.S 2005-08-29 23:11:09 +0200
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -177,9 +177,9 @@
.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.3/arch/alpha/mm/init.c linux-2.6.12.3-vs2.0-rc9/arch/alpha/mm/init.c
---- linux-2.6.12.3/arch/alpha/mm/init.c 2005-03-02 12:38:18 +0100
-+++ linux-2.6.12.3-vs2.0-rc9/arch/alpha/mm/init.c 2005-08-01 10:32:30 +0200
+diff -NurpP --minimal linux-2.6.13/arch/alpha/mm/init.c linux-2.6.13-vs2.1.0-pre6/arch/alpha/mm/init.c
+--- linux-2.6.13/arch/alpha/mm/init.c 2005-03-02 12:38:18 +0100
++++ linux-2.6.13-vs2.1.0-pre6/arch/alpha/mm/init.c 2005-08-29 23:11:09 +0200
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
@@ -188,10 +188,10 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.12.3/arch/arm/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/arm/Kconfig
---- linux-2.6.12.3/arch/arm/Kconfig 2005-06-22 02:37:51 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/arm/Kconfig 2005-08-01 10:32:37 +0200
-@@ -739,6 +739,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.13/arch/arm/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/arm/Kconfig
+--- linux-2.6.13/arch/arm/Kconfig 2005-08-29 22:24:49 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/arm/Kconfig 2005-08-29 23:11:09 +0200
+@@ -770,6 +770,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -200,20 +200,21 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/arm/kernel/calls.S linux-2.6.12.3-vs2.0-rc9/arch/arm/kernel/calls.S
---- linux-2.6.12.3/arch/arm/kernel/calls.S 2005-06-22 02:37:52 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/arm/kernel/calls.S 2005-08-01 10:32:37 +0200
-@@ -327,6 +327,7 @@ __syscall_start:
+diff -NurpP --minimal linux-2.6.13/arch/arm/kernel/calls.S linux-2.6.13-vs2.1.0-pre6/arch/arm/kernel/calls.S
+--- linux-2.6.13/arch/arm/kernel/calls.S 2005-08-29 22:24:50 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/arm/kernel/calls.S 2005-08-29 23:11:09 +0200
+@@ -327,7 +327,7 @@ __syscall_start:
/* 310 */ .long sys_request_key
.long sys_keyctl
.long sys_semtimedop
+-/* vserver */ .long sys_ni_syscall
+ .long sys_vserver
- __syscall_end:
-
- .rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.12.3/arch/arm/kernel/ptrace.c linux-2.6.12.3-vs2.0-rc9/arch/arm/kernel/ptrace.c
---- linux-2.6.12.3/arch/arm/kernel/ptrace.c 2005-06-22 02:37:52 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/arm/kernel/ptrace.c 2005-08-01 10:32:38 +0200
+ .long sys_ioprio_set
+ /* 315 */ .long sys_ioprio_get
+ .long sys_inotify_init
+diff -NurpP --minimal linux-2.6.13/arch/arm/kernel/ptrace.c linux-2.6.13-vs2.1.0-pre6/arch/arm/kernel/ptrace.c
+--- linux-2.6.13/arch/arm/kernel/ptrace.c 2005-06-22 02:37:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/arm/kernel/ptrace.c 2005-08-29 23:11:09 +0200
@@ -809,6 +809,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -223,10 +224,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.3/arch/arm26/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/arm26/Kconfig
---- linux-2.6.12.3/arch/arm26/Kconfig 2005-06-22 02:37:53 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/arm26/Kconfig 2005-08-01 10:32:37 +0200
-@@ -224,6 +224,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.13/arch/arm26/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/arm26/Kconfig
+--- linux-2.6.13/arch/arm26/Kconfig 2005-08-29 22:24:51 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/arm26/Kconfig 2005-08-29 23:11:09 +0200
+@@ -228,6 +228,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -235,9 +236,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/arm26/kernel/calls.S linux-2.6.12.3-vs2.0-rc9/arch/arm26/kernel/calls.S
---- linux-2.6.12.3/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.12.3-vs2.0-rc9/arch/arm26/kernel/calls.S 2005-08-01 10:32:37 +0200
+diff -NurpP --minimal linux-2.6.13/arch/arm26/kernel/calls.S linux-2.6.13-vs2.1.0-pre6/arch/arm26/kernel/calls.S
+--- linux-2.6.13/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.13-vs2.1.0-pre6/arch/arm26/kernel/calls.S 2005-08-29 23:11:09 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -250,9 +251,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.12.3/arch/arm26/kernel/ptrace.c linux-2.6.12.3-vs2.0-rc9/arch/arm26/kernel/ptrace.c
---- linux-2.6.12.3/arch/arm26/kernel/ptrace.c 2005-06-22 02:37:53 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/arm26/kernel/ptrace.c 2005-08-01 10:32:38 +0200
+diff -NurpP --minimal linux-2.6.13/arch/arm26/kernel/ptrace.c linux-2.6.13-vs2.1.0-pre6/arch/arm26/kernel/ptrace.c
+--- linux-2.6.13/arch/arm26/kernel/ptrace.c 2005-06-22 02:37:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/arm26/kernel/ptrace.c 2005-08-29 23:11:09 +0200
@@ -692,6 +692,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -262,10 +263,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.3/arch/cris/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/cris/Kconfig
---- linux-2.6.12.3/arch/cris/Kconfig 2005-03-02 12:38:20 +0100
-+++ linux-2.6.12.3-vs2.0-rc9/arch/cris/Kconfig 2005-08-01 10:32:37 +0200
-@@ -173,6 +173,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.13/arch/cris/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/cris/Kconfig
+--- linux-2.6.13/arch/cris/Kconfig 2005-08-29 22:24:51 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/cris/Kconfig 2005-08-29 23:11:09 +0200
+@@ -177,6 +177,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -274,10 +275,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/h8300/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/h8300/Kconfig
---- linux-2.6.12.3/arch/h8300/Kconfig 2005-03-02 12:38:20 +0100
-+++ linux-2.6.12.3-vs2.0-rc9/arch/h8300/Kconfig 2005-08-01 10:32:37 +0200
-@@ -187,6 +187,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.13/arch/h8300/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/h8300/Kconfig
+--- linux-2.6.13/arch/h8300/Kconfig 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/h8300/Kconfig 2005-08-29 23:11:09 +0200
+@@ -191,6 +191,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -286,9 +287,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/h8300/kernel/ptrace.c linux-2.6.12.3-vs2.0-rc9/arch/h8300/kernel/ptrace.c
---- linux-2.6.12.3/arch/h8300/kernel/ptrace.c 2005-06-22 02:37:53 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/h8300/kernel/ptrace.c 2005-08-01 10:32:38 +0200
+diff -NurpP --minimal linux-2.6.13/arch/h8300/kernel/ptrace.c linux-2.6.13-vs2.1.0-pre6/arch/h8300/kernel/ptrace.c
+--- linux-2.6.13/arch/h8300/kernel/ptrace.c 2005-06-22 02:37:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/h8300/kernel/ptrace.c 2005-08-29 23:11:09 +0200
@@ -81,6 +81,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -298,17 +299,17 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.3/arch/i386/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/i386/Kconfig
---- linux-2.6.12.3/arch/i386/Kconfig 2005-06-22 02:37:53 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/i386/Kconfig 2005-08-01 10:32:47 +0200
-@@ -574,6 +574,14 @@ config X86_VISWS_APIC
+diff -NurpP --minimal linux-2.6.13/arch/i386/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/i386/Kconfig
+--- linux-2.6.13/arch/i386/Kconfig 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/Kconfig 2005-08-29 23:11:09 +0200
+@@ -553,6 +553,14 @@ config X86_VISWS_APIC
depends on X86_VISWS
default y
-+config KERNEL_HZ
++config HZ
+ int "Timer Frequency (100-10000)"
+ range 100 10000
-+ default "1000"
++ default "250"
+ help
+ This allows you to specify the frequency at which the
+ kernel timer interrupt will occur.
@@ -316,7 +317,7 @@
config X86_TSC
bool
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
+@@ -738,6 +746,46 @@ config HIGHMEM64G
endchoice
@@ -363,7 +364,7 @@
config HIGHMEM
bool
depends on HIGHMEM64G || HIGHMEM4G
-@@ -1246,6 +1294,8 @@ source "arch/i386/oprofile/Kconfig"
+@@ -1296,6 +1344,8 @@ source "arch/i386/oprofile/Kconfig"
source "arch/i386/Kconfig.debug"
@@ -372,9 +373,32 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/i386/kernel/cpu/proc.c linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/cpu/proc.c
---- linux-2.6.12.3/arch/i386/kernel/cpu/proc.c 2005-06-22 02:37:53 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/cpu/proc.c 2005-08-01 10:32:47 +0200
+diff -NurpP --minimal linux-2.6.13/arch/i386/boot/compressed/misc.c linux-2.6.13-vs2.1.0-pre6/arch/i386/boot/compressed/misc.c
+--- linux-2.6.13/arch/i386/boot/compressed/misc.c 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/boot/compressed/misc.c 2005-08-29 23:11:09 +0200
+@@ -309,7 +309,7 @@ static void setup_normal_output_buffer(v
+ #else
+ if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory");
+ #endif
+- output_data = (char *)__PHYSICAL_START; /* Normally Points to 1M */
++ output_data = (char *)PHYSICAL_START; /* Normally Points to 1M */
+ free_mem_end_ptr = (long)real_mode;
+ }
+
+@@ -334,8 +334,8 @@ static void setup_output_buffer_if_we_ru
+ low_buffer_size = low_buffer_end - LOW_BUFFER_START;
+ high_loaded = 1;
+ free_mem_end_ptr = (long)high_buffer_start;
+- if ( (__PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {
+- high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size);
++ if ((PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {
++ high_buffer_start = (uch *)(PHYSICAL_START + low_buffer_size);
+ mv->hcount = 0; /* say: we need not to move high_buffer */
+ }
+ else mv->hcount = -1;
+diff -NurpP --minimal linux-2.6.13/arch/i386/kernel/cpu/proc.c linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/cpu/proc.c
+--- linux-2.6.13/arch/i386/kernel/cpu/proc.c 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/cpu/proc.c 2005-08-29 23:11:09 +0200
@@ -129,8 +129,8 @@ static int show_cpuinfo(struct seq_file
seq_printf(m, " %s", x86_cap_flags[i]);
@@ -386,9 +410,9 @@
return 0;
}
-diff -NurpP --minimal linux-2.6.12.3/arch/i386/kernel/ptrace.c linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/ptrace.c
---- linux-2.6.12.3/arch/i386/kernel/ptrace.c 2005-06-22 02:37:53 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/ptrace.c 2005-08-01 10:32:38 +0200
+diff -NurpP --minimal linux-2.6.13/arch/i386/kernel/ptrace.c linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/ptrace.c
+--- linux-2.6.13/arch/i386/kernel/ptrace.c 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/ptrace.c 2005-08-29 23:11:09 +0200
@@ -381,6 +381,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -398,10 +422,24 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.3/arch/i386/kernel/smpboot.c linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/smpboot.c
---- linux-2.6.12.3/arch/i386/kernel/smpboot.c 2005-06-22 02:37:53 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/smpboot.c 2005-08-01 10:32:47 +0200
-@@ -1023,8 +1023,8 @@ static void __init smp_boot_cpus(unsigne
+diff -NurpP --minimal linux-2.6.13/arch/i386/kernel/setup.c linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/setup.c
+--- linux-2.6.13/arch/i386/kernel/setup.c 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/setup.c 2005-08-29 23:11:09 +0200
+@@ -1168,8 +1168,8 @@ void __init setup_bootmem_allocator(void
+ * the (very unlikely) case of us accidentally initializing the
+ * bootmem allocator with an invalid RAM area.
+ */
+- reserve_bootmem(__PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
+- bootmap_size + PAGE_SIZE-1) - (__PHYSICAL_START));
++ reserve_bootmem(PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
++ bootmap_size + PAGE_SIZE-1) - (PHYSICAL_START));
+
+ /*
+ * reserve physical page 0 - it's a special BIOS page on many boxes,
+diff -NurpP --minimal linux-2.6.13/arch/i386/kernel/smpboot.c linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/smpboot.c
+--- linux-2.6.13/arch/i386/kernel/smpboot.c 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/smpboot.c 2005-08-29 23:11:09 +0200
+@@ -1206,8 +1206,8 @@ static void __init smp_boot_cpus(unsigne
printk(KERN_INFO
"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
cpucount+1,
@@ -412,9 +450,9 @@
Dprintk("Before bogocount - setting activated=1.\n");
-diff -NurpP --minimal linux-2.6.12.3/arch/i386/kernel/sys_i386.c linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/sys_i386.c
---- linux-2.6.12.3/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/sys_i386.c 2005-08-01 10:32:39 +0200
+diff -NurpP --minimal linux-2.6.13/arch/i386/kernel/sys_i386.c linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/sys_i386.c
+--- linux-2.6.13/arch/i386/kernel/sys_i386.c 2004-08-14 12:56:23 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/sys_i386.c 2005-08-29 23:11:09 +0200
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -462,9 +500,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.12.3/arch/i386/kernel/syscall_table.S linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/syscall_table.S
---- linux-2.6.12.3/arch/i386/kernel/syscall_table.S 2005-06-22 02:37:53 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/syscall_table.S 2005-08-01 10:32:37 +0200
+diff -NurpP --minimal linux-2.6.13/arch/i386/kernel/syscall_table.S linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/syscall_table.S
+--- linux-2.6.13/arch/i386/kernel/syscall_table.S 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/syscall_table.S 2005-08-29 23:11:09 +0200
@@ -273,7 +273,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -474,10 +512,10 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.12.3/arch/i386/kernel/traps.c linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/traps.c
---- linux-2.6.12.3/arch/i386/kernel/traps.c 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/i386/kernel/traps.c 2005-08-01 10:32:46 +0200
-@@ -53,6 +53,7 @@
+diff -NurpP --minimal linux-2.6.13/arch/i386/kernel/traps.c linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/traps.c
+--- linux-2.6.13/arch/i386/kernel/traps.c 2005-08-29 22:24:52 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/i386/kernel/traps.c 2005-08-29 23:11:09 +0200
+@@ -54,6 +54,7 @@
#include <linux/irq.h>
#include <linux/module.h>
@@ -485,26 +523,30 @@
#include "mach_traps.h"
-@@ -306,6 +307,7 @@ void die(const char * str, struct pt_reg
+@@ -311,6 +312,8 @@ void die(const char * str, struct pt_reg
};
static int die_counter;
+ vxh_throw_oops();
- if (die.lock_owner != _smp_processor_id()) {
++
+ if (die.lock_owner != raw_smp_processor_id()) {
console_verbose();
spin_lock_irq(&die.lock);
-@@ -340,6 +342,7 @@ void die(const char * str, struct pt_reg
- bust_spinlocks(0);
- die.lock_owner = -1;
- spin_unlock_irq(&die.lock);
-+ vxh_dump_history();
- if (in_interrupt())
- panic("Fatal exception in interrupt");
-
-diff -NurpP --minimal linux-2.6.12.3/arch/ia64/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/ia64/Kconfig
---- linux-2.6.12.3/arch/ia64/Kconfig 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/ia64/Kconfig 2005-08-01 10:32:37 +0200
-@@ -438,6 +438,8 @@ source "arch/ia64/oprofile/Kconfig"
+@@ -337,8 +340,9 @@ void die(const char * str, struct pt_reg
+ #endif
+ if (nl)
+ printk("\n");
+- notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
++ notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
+ show_registers(regs);
++ vxh_dump_history();
+ } else
+ printk(KERN_ERR "Recursive die() failure, output suppressed\n");
+
+diff -NurpP --minimal linux-2.6.13/arch/ia64/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/ia64/Kconfig
+--- linux-2.6.13/arch/ia64/Kconfig 2005-08-29 22:24:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/ia64/Kconfig 2005-08-29 23:11:09 +0200
+@@ -434,6 +434,8 @@ source "arch/ia64/oprofile/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -513,9 +555,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/ia64/ia32/binfmt_elf32.c linux-2.6.12.3-vs2.0-rc9/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.12.3/arch/ia64/ia32/binfmt_elf32.c 2005-03-02 12:38:21 +0100
-+++ linux-2.6.12.3-vs2.0-rc9/arch/ia64/ia32/binfmt_elf32.c 2005-08-01 10:32:45 +0200
+diff -NurpP --minimal linux-2.6.13/arch/ia64/ia32/binfmt_elf32.c linux-2.6.13-vs2.1.0-pre6/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.13/arch/ia64/ia32/binfmt_elf32.c 2005-03-02 12:38:21 +0100
++++ linux-2.6.13-vs2.1.0-pre6/arch/ia64/ia32/binfmt_elf32.c 2005-08-29 23:11:09 +0200
@@ -199,7 +199,7 @@ ia64_elf32_init (struct pt_regs *regs)
int
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
@@ -548,9 +590,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.12.3/arch/ia64/ia32/ia32_entry.S linux-2.6.12.3-vs2.0-rc9/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.12.3/arch/ia64/ia32/ia32_entry.S 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/ia64/ia32/ia32_entry.S 2005-08-01 10:32:37 +0200
+diff -NurpP --minimal linux-2.6.13/arch/ia64/ia32/ia32_entry.S linux-2.6.13-vs2.1.0-pre6/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.13/arch/ia64/ia32/ia32_entry.S 2005-06-22 02:37:54 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/ia64/ia32/ia32_entry.S 2005-08-29 23:11:09 +0200
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -560,10 +602,10 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.12.3/arch/ia64/kernel/entry.S linux-2.6.12.3-vs2.0-rc9/arch/ia64/kernel/entry.S
---- linux-2.6.12.3/arch/ia64/kernel/entry.S 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/ia64/kernel/entry.S 2005-08-01 10:32:37 +0200
-@@ -1572,7 +1572,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.13/arch/ia64/kernel/entry.S linux-2.6.13-vs2.1.0-pre6/arch/ia64/kernel/entry.S
+--- linux-2.6.13/arch/ia64/kernel/entry.S 2005-08-29 22:24:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/ia64/kernel/entry.S 2005-08-29 23:11:09 +0200
+@@ -1566,7 +1566,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_ni_syscall // reserved for kexec_load
@@ -572,19 +614,19 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.12.3/arch/ia64/kernel/perfmon.c linux-2.6.12.3-vs2.0-rc9/arch/ia64/kernel/perfmon.c
---- linux-2.6.12.3/arch/ia64/kernel/perfmon.c 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/ia64/kernel/perfmon.c 2005-08-01 10:32:45 +0200
-@@ -39,6 +39,8 @@
+diff -NurpP --minimal linux-2.6.13/arch/ia64/kernel/perfmon.c linux-2.6.13-vs2.1.0-pre6/arch/ia64/kernel/perfmon.c
+--- linux-2.6.13/arch/ia64/kernel/perfmon.c 2005-08-29 22:24:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/ia64/kernel/perfmon.c 2005-08-29 23:11:09 +0200
+@@ -38,6 +38,8 @@
+ #include <linux/pagemap.h>
#include <linux/mount.h>
- #include <linux/version.h>
#include <linux/bitops.h>
+#include <linux/vs_memory.h>
+#include <linux/vs_cvirt.h>
#include <asm/errno.h>
#include <asm/intrinsics.h>
-@@ -2348,7 +2350,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+@@ -2347,7 +2349,7 @@ pfm_smpl_buffer_alloc(struct task_struct
*/
insert_vm_struct(mm, vma);
@@ -593,10 +635,10 @@
vm_stat_account(vma);
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.12.3/arch/ia64/kernel/ptrace.c linux-2.6.12.3-vs2.0-rc9/arch/ia64/kernel/ptrace.c
---- linux-2.6.12.3/arch/ia64/kernel/ptrace.c 2005-07-17 02:50:57 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/ia64/kernel/ptrace.c 2005-08-01 10:32:38 +0200
-@@ -1436,6 +1436,9 @@ sys_ptrace (long request, pid_t pid, uns
+diff -NurpP --minimal linux-2.6.13/arch/ia64/kernel/ptrace.c linux-2.6.13-vs2.1.0-pre6/arch/ia64/kernel/ptrace.c
+--- linux-2.6.13/arch/ia64/kernel/ptrace.c 2005-08-29 22:24:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/ia64/kernel/ptrace.c 2005-08-29 23:11:09 +0200
+@@ -1456,6 +1456,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
goto out;
@@ -606,9 +648,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.12.3/arch/ia64/mm/fault.c linux-2.6.12.3-vs2.0-rc9/arch/ia64/mm/fault.c
---- linux-2.6.12.3/arch/ia64/mm/fault.c 2005-06-22 02:37:54 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/ia64/mm/fault.c 2005-08-01 10:32:45 +0200
+diff -NurpP --minimal linux-2.6.13/arch/ia64/mm/fault.c linux-2.6.13-vs2.1.0-pre6/arch/ia64/mm/fault.c
+--- linux-2.6.13/arch/ia64/mm/fault.c 2005-08-29 22:24:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/ia64/mm/fault.c 2005-08-29 23:11:09 +0200
@@ -9,6 +9,7 @@
#include <linux/mm.h>
#include <linux/smp_lock.h>
@@ -617,7 +659,7 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -33,12 +34,17 @@ expand_backing_store (struct vm_area_str
+@@ -34,12 +35,17 @@ expand_backing_store (struct vm_area_str
grow = PAGE_SIZE >> PAGE_SHIFT;
if (address - vma->vm_start > current->signal->rlim[RLIMIT_STACK].rlim_cur
@@ -638,10 +680,10 @@
__vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
return 0;
}
-diff -NurpP --minimal linux-2.6.12.3/arch/m68k/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/m68k/Kconfig
---- linux-2.6.12.3/arch/m68k/Kconfig 2005-03-02 12:38:21 +0100
-+++ linux-2.6.12.3-vs2.0-rc9/arch/m68k/Kconfig 2005-08-01 10:32:37 +0200
-@@ -663,6 +663,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.13/arch/m68k/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/m68k/Kconfig
+--- linux-2.6.13/arch/m68k/Kconfig 2005-08-29 22:24:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/m68k/Kconfig 2005-08-29 23:11:09 +0200
+@@ -667,6 +667,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -650,9 +692,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/m68k/kernel/ptrace.c linux-2.6.12.3-vs2.0-rc9/arch/m68k/kernel/ptrace.c
---- linux-2.6.12.3/arch/m68k/kernel/ptrace.c 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/m68k/kernel/ptrace.c 2005-08-01 10:32:38 +0200
+diff -NurpP --minimal linux-2.6.13/arch/m68k/kernel/ptrace.c linux-2.6.13-vs2.1.0-pre6/arch/m68k/kernel/ptrace.c
+--- linux-2.6.13/arch/m68k/kernel/ptrace.c 2005-06-22 02:37:55 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/m68k/kernel/ptrace.c 2005-08-29 23:11:09 +0200
@@ -141,6 +141,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -662,10 +704,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.3/arch/m68knommu/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/m68knommu/Kconfig
---- linux-2.6.12.3/arch/m68knommu/Kconfig 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/m68knommu/Kconfig 2005-08-01 10:32:37 +0200
-@@ -579,6 +579,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.13/arch/m68knommu/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/m68knommu/Kconfig
+--- linux-2.6.13/arch/m68knommu/Kconfig 2005-08-29 22:24:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/m68knommu/Kconfig 2005-08-29 23:11:09 +0200
+@@ -583,6 +583,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -674,9 +716,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.12.3/arch/m68knommu/kernel/ptrace.c linux-2.6.12.3-vs2.0-rc9/arch/m68knommu/kernel/ptrace.c
---- linux-2.6.12.3/arch/m68knommu/kernel/ptrace.c 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/m68knommu/kernel/ptrace.c 2005-08-01 10:32:38 +0200
+diff -NurpP --minimal linux-2.6.13/arch/m68knommu/kernel/ptrace.c linux-2.6.13-vs2.1.0-pre6/arch/m68knommu/kernel/ptrace.c
+--- linux-2.6.13/arch/m68knommu/kernel/ptrace.c 2005-06-22 02:37:55 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/m68knommu/kernel/ptrace.c 2005-08-29 23:11:09 +0200
@@ -125,6 +125,8 @@ asmlinkage int sys_ptrace(long request,
read_unlock(&tasklist_lock);
if (!child)
@@ -686,10 +728,10 @@
ret = -EPERM;
if (pid == 1) /* you may not mess with init */
-diff -NurpP --minimal linux-2.6.12.3/arch/mips/Kconfig linux-2.6.12.3-vs2.0-rc9/arch/mips/Kconfig
---- linux-2.6.12.3/arch/mips/Kconfig 2005-06-22 02:37:55 +0200
-+++ linux-2.6.12.3-vs2.0-rc9/arch/mips/Kconfig 2005-08-01 10:32:37 +0200
-@@ -1640,6 +1640,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.13/arch/mips/Kconfig linux-2.6.13-vs2.1.0-pre6/arch/mips/Kconfig
+--- linux-2.6.13/arch/mips/Kconfig 2005-08-29 22:24:53 +0200
++++ linux-2.6.13-vs2.1.0-pre6/arch/mips/Kconfig 2005-08-29 23:11:09 +0200
+@@ -1613,6 +1613,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -698,9 +740,9 @@
source "security/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.7&r2=1.1.2.8&f=u
More information about the pld-cvs-commit
mailing list