packages: kernel/kernel-vserver-2.3.patch, kernel/kernel.spec - patch-2.6.3...
arekm
arekm at pld-linux.org
Thu Oct 21 21:39:09 CEST 2010
Author: arekm Date: Thu Oct 21 19:39:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- patch-2.6.36-vs2.3.0.36.36.diff
---- Files affected:
packages/kernel:
kernel-vserver-2.3.patch (1.48 -> 1.49) , kernel.spec (1.843 -> 1.844)
---- Diffs:
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.48 packages/kernel/kernel-vserver-2.3.patch:1.49
--- packages/kernel/kernel-vserver-2.3.patch:1.48 Thu Oct 21 19:13:30 2010
+++ packages/kernel/kernel-vserver-2.3.patch Thu Oct 21 21:39:03 2010
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.36/arch/alpha/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/alpha/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/alpha/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/alpha/Kconfig
--- linux-2.6.36/arch/alpha/Kconfig 2010-10-21 13:06:45.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -677,6 +677,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,9 +10,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/entry.S linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/entry.S
+diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/entry.S linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/entry.S
--- linux-2.6.36/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/ptrace.c
--- linux-2.6.36/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -56,9 +56,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/systbls.S linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/systbls.S
+diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/systbls.S linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/systbls.S
--- linux-2.6.36/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/systbls.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/systbls.S 2010-10-21 13:09:36.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -68,9 +68,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.36/arch/alpha/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/alpha/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/traps.c
--- linux-2.6.36/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/alpha/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/alpha/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -81,9 +81,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.36/arch/arm/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.33/arch/arm/include/asm/tlb.h
+diff -NurpP --minimal linux-2.6.36/arch/arm/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.36/arch/arm/include/asm/tlb.h
--- linux-2.6.36/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200
@@ -27,6 +27,7 @@
#else /* !CONFIG_MMU */
@@ -92,9 +92,9 @@
#include <asm/pgalloc.h>
/*
-diff -NurpP --minimal linux-2.6.36/arch/arm/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/arm/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/arm/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/arm/Kconfig
--- linux-2.6.36/arch/arm/Kconfig 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -1803,6 +1803,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -104,9 +104,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/calls.S linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/calls.S
+diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/calls.S linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/calls.S
--- linux-2.6.36/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/calls.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/calls.S 2010-10-21 13:09:36.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -116,9 +116,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/process.c linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/process.c
+diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/process.c linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/process.c
--- linux-2.6.36/arch/arm/kernel/process.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
@@ -295,7 +295,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -129,9 +129,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/arm/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/traps.c
--- linux-2.6.36/arch/arm/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/arm/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/arm/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -244,8 +244,8 @@ static int __die(const char *str, int er
print_modules();
@@ -143,9 +143,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.36/arch/cris/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/cris/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/cris/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/cris/Kconfig
--- linux-2.6.36/arch/cris/Kconfig 2010-10-21 13:06:51.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/cris/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/cris/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -694,6 +694,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -155,9 +155,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/frv/kernel/kernel_thread.S linux-2.6.36-vs2.3.0.36.33/arch/frv/kernel/kernel_thread.S
+diff -NurpP --minimal linux-2.6.36/arch/frv/kernel/kernel_thread.S linux-2.6.36-vs2.3.0.36.36/arch/frv/kernel/kernel_thread.S
--- linux-2.6.36/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.36-vs2.3.0.36.33/arch/frv/kernel/kernel_thread.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/frv/kernel/kernel_thread.S 2010-10-21 13:09:36.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -167,9 +167,9 @@
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.36/arch/h8300/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/h8300/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/h8300/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/h8300/Kconfig
--- linux-2.6.36/arch/h8300/Kconfig 2010-10-21 13:06:51.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/h8300/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/h8300/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -226,6 +226,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -179,9 +179,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/ia64/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.33/arch/ia64/include/asm/tlb.h
+diff -NurpP --minimal linux-2.6.36/arch/ia64/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.36/arch/ia64/include/asm/tlb.h
--- linux-2.6.36/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -190,9 +190,9 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.36/arch/ia64/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/ia64/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/ia64/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/ia64/Kconfig
--- linux-2.6.36/arch/ia64/Kconfig 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -671,6 +671,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -202,9 +202,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/entry.S linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/entry.S
+diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/entry.S linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/entry.S
--- linux-2.6.36/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/entry.S 2010-10-21 13:09:36.000000000 +0200
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -214,9 +214,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/perfmon.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/perfmon.c
+diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/perfmon.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/perfmon.c
--- linux-2.6.36/arch/ia64/kernel/perfmon.c 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/perfmon.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/perfmon.c 2010-10-21 13:09:36.000000000 +0200
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
@@ -225,9 +225,9 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/process.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/process.c
+diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/process.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/process.c
--- linux-2.6.36/arch/ia64/kernel/process.c 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
@@ -113,8 +113,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -239,9 +239,9 @@
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/ptrace.c
--- linux-2.6.36/arch/ia64/kernel/ptrace.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -250,9 +250,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/ia64/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/traps.c
--- linux-2.6.36/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -277,9 +277,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.36/arch/ia64/mm/fault.c linux-2.6.36-vs2.3.0.36.33/arch/ia64/mm/fault.c
+diff -NurpP --minimal linux-2.6.36/arch/ia64/mm/fault.c linux-2.6.36-vs2.3.0.36.36/arch/ia64/mm/fault.c
--- linux-2.6.36/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/ia64/mm/fault.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/ia64/mm/fault.c 2010-10-21 13:09:36.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -288,9 +288,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.36/arch/m32r/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/m32r/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/m32r/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/m32r/kernel/traps.c
--- linux-2.6.36/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.36-vs2.3.0.36.33/arch/m32r/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/m32r/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -303,9 +303,9 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.36/arch/m68k/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/m68k/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/m68k/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/m68k/Kconfig
--- linux-2.6.36/arch/m68k/Kconfig 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/m68k/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/m68k/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -616,6 +616,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -315,9 +315,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/m68k/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/m68k/kernel/ptrace.c
--- linux-2.6.36/arch/m68k/kernel/ptrace.c 2010-07-07 18:31:02.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/m68k/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/m68k/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -335,9 +335,9 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/m68k/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/m68k/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/m68k/kernel/traps.c
--- linux-2.6.36/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/m68k/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/m68k/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
@@ -349,9 +349,9 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.36/arch/m68knommu/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/m68knommu/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/m68knommu/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/m68knommu/Kconfig
--- linux-2.6.36/arch/m68knommu/Kconfig 2010-10-21 13:06:53.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/m68knommu/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/m68knommu/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -730,6 +730,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -361,9 +361,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/m68knommu/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/m68knommu/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/m68knommu/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/m68knommu/kernel/traps.c
--- linux-2.6.36/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/m68knommu/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/m68knommu/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
@@ -376,9 +376,9 @@
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.36/arch/mips/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/mips/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/mips/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/mips/Kconfig
--- linux-2.6.36/arch/mips/Kconfig 2010-10-21 13:06:53.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -2298,6 +2298,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -388,9 +388,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/ptrace.c
--- linux-2.6.36/arch/mips/kernel/ptrace.c 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -409,9 +409,9 @@
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall32-o32.S linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall32-o32.S
+diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall32-o32.S linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall32-o32.S
--- linux-2.6.36/arch/mips/kernel/scall32-o32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall32-o32.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall32-o32.S 2010-10-21 13:09:36.000000000 +0200
@@ -524,7 +524,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -421,9 +421,9 @@
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-64.S linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-64.S
+diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-64.S linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-64.S
--- linux-2.6.36/arch/mips/kernel/scall64-64.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-64.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-64.S 2010-10-21 13:09:36.000000000 +0200
@@ -363,7 +363,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -433,9 +433,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-n32.S linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-n32.S
+diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-n32.S linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-n32.S
--- linux-2.6.36/arch/mips/kernel/scall64-n32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-n32.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-n32.S 2010-10-21 13:09:36.000000000 +0200
@@ -362,7 +362,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -445,9 +445,9 @@
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-o32.S linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-o32.S
+diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/scall64-o32.S linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-o32.S
--- linux-2.6.36/arch/mips/kernel/scall64-o32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/scall64-o32.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/scall64-o32.S 2010-10-21 13:09:36.000000000 +0200
@@ -481,7 +481,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -457,9 +457,9 @@
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/mips/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/traps.c
--- linux-2.6.36/arch/mips/kernel/traps.c 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/mips/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/mips/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -341,9 +341,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -474,9 +474,9 @@
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.36/arch/parisc/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/parisc/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/parisc/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/parisc/Kconfig
--- linux-2.6.36/arch/parisc/Kconfig 2010-10-21 13:06:55.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/parisc/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/parisc/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -295,6 +295,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -486,9 +486,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/syscall_table.S linux-2.6.36-vs2.3.0.36.33/arch/parisc/kernel/syscall_table.S
+diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/syscall_table.S linux-2.6.36-vs2.3.0.36.36/arch/parisc/kernel/syscall_table.S
--- linux-2.6.36/arch/parisc/kernel/syscall_table.S 2010-07-07 18:31:04.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/parisc/kernel/syscall_table.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/parisc/kernel/syscall_table.S 2010-10-21 13:09:36.000000000 +0200
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -498,9 +498,9 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/parisc/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/parisc/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/parisc/kernel/traps.c
--- linux-2.6.36/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/parisc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/parisc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -524,9 +524,9 @@
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.36/arch/parisc/mm/fault.c linux-2.6.36-vs2.3.0.36.33/arch/parisc/mm/fault.c
+diff -NurpP --minimal linux-2.6.36/arch/parisc/mm/fault.c linux-2.6.36-vs2.3.0.36.36/arch/parisc/mm/fault.c
--- linux-2.6.36/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/parisc/mm/fault.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/parisc/mm/fault.c 2010-10-21 13:09:36.000000000 +0200
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -539,9 +539,9 @@
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-2.6.36/arch/powerpc/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.33/arch/powerpc/include/asm/unistd.h
+diff -NurpP --minimal linux-2.6.36/arch/powerpc/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.36/arch/powerpc/include/asm/unistd.h
--- linux-2.6.36/arch/powerpc/include/asm/unistd.h 2010-10-21 13:06:56.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -551,9 +551,9 @@
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.36/arch/powerpc/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/powerpc/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/powerpc/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/powerpc/Kconfig
--- linux-2.6.36/arch/powerpc/Kconfig 2010-10-21 13:06:55.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -974,6 +974,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -563,9 +563,9 @@
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/process.c linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/process.c
+diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/process.c linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/process.c
--- linux-2.6.36/arch/powerpc/kernel/process.c 2010-10-21 13:06:56.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/process.c 2010-10-21 13:09:36.000000000 +0200
@@ -634,8 +634,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
@@ -578,9 +578,9 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/traps.c linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/traps.c
+diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/traps.c linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/traps.c
--- linux-2.6.36/arch/powerpc/kernel/traps.c 2010-10-21 13:06:57.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/traps.c 2010-10-21 13:09:36.000000000 +0200
@@ -1048,8 +1048,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -593,9 +593,9 @@
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/vdso.c linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/vdso.c
+diff -NurpP --minimal linux-2.6.36/arch/powerpc/kernel/vdso.c linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/vdso.c
--- linux-2.6.36/arch/powerpc/kernel/vdso.c 2010-08-02 16:52:07.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/powerpc/kernel/vdso.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/powerpc/kernel/vdso.c 2010-10-21 13:09:36.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -604,9 +604,9 @@
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.33/arch/s390/include/asm/tlb.h
+diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/tlb.h linux-2.6.36-vs2.3.0.36.36/arch/s390/include/asm/tlb.h
--- linux-2.6.36/arch/s390/include/asm/tlb.h 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/include/asm/tlb.h 2010-10-21 13:09:36.000000000 +0200
@@ -23,6 +23,8 @@
#include <linux/mm.h>
@@ -616,9 +616,9 @@
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/smp.h>
-diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.33/arch/s390/include/asm/unistd.h
+diff -NurpP --minimal linux-2.6.36/arch/s390/include/asm/unistd.h linux-2.6.36-vs2.3.0.36.36/arch/s390/include/asm/unistd.h
--- linux-2.6.36/arch/s390/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/include/asm/unistd.h 2010-10-21 13:09:36.000000000 +0200
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -628,9 +628,9 @@
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-2.6.36/arch/s390/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/s390/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/s390/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/s390/Kconfig
--- linux-2.6.36/arch/s390/Kconfig 2010-10-21 13:06:57.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -620,6 +620,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -640,9 +640,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.33/arch/s390/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/ptrace.c linux-2.6.36-vs2.3.0.36.36/arch/s390/kernel/ptrace.c
--- linux-2.6.36/arch/s390/kernel/ptrace.c 2010-08-02 16:52:09.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/kernel/ptrace.c 2010-10-21 13:09:36.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/regset.h>
#include <linux/tracehook.h>
@@ -651,9 +651,9 @@
#include <trace/syscall.h>
#include <asm/compat.h>
#include <asm/segment.h>
-diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/syscalls.S linux-2.6.36-vs2.3.0.36.33/arch/s390/kernel/syscalls.S
+diff -NurpP --minimal linux-2.6.36/arch/s390/kernel/syscalls.S linux-2.6.36-vs2.3.0.36.36/arch/s390/kernel/syscalls.S
--- linux-2.6.36/arch/s390/kernel/syscalls.S 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/s390/kernel/syscalls.S 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/s390/kernel/syscalls.S 2010-10-21 13:09:36.000000000 +0200
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
@@ -663,9 +663,9 @@
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-2.6.36/arch/sh/Kconfig linux-2.6.36-vs2.3.0.36.33/arch/sh/Kconfig
+diff -NurpP --minimal linux-2.6.36/arch/sh/Kconfig linux-2.6.36-vs2.3.0.36.36/arch/sh/Kconfig
--- linux-2.6.36/arch/sh/Kconfig 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.36-vs2.3.0.36.33/arch/sh/Kconfig 2010-10-21 13:09:36.000000000 +0200
++++ linux-2.6.36-vs2.3.0.36.36/arch/sh/Kconfig 2010-10-21 13:09:36.000000000 +0200
@@ -878,6 +878,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -675,9 +675,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.36/arch/sh/kernel/irq.c linux-2.6.36-vs2.3.0.36.33/arch/sh/kernel/irq.c
+diff -NurpP --minimal linux-2.6.36/arch/sh/kernel/irq.c linux-2.6.36-vs2.3.0.36.36/arch/sh/kernel/irq.c
--- linux-2.6.36/arch/sh/kernel/irq.c 2010-08-02 16:52:10.000000000 +0200
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.48&r2=1.49&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.843&r2=1.844&f=u
More information about the pld-cvs-commit
mailing list