Author: pawelz Date: Wed Sep 22 10:28:49 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated for 2.6.35.5
---- Files affected: packages/kernel-xenU: linux-2.6-vs2.3.patch (1.11 -> 1.12) ---- Diffs: ================================================================ Index: packages/kernel-xenU/linux-2.6-vs2.3.patch diff -u packages/kernel-xenU/linux-2.6-vs2.3.patch:1.11 packages/kernel-xenU/linux-2.6-vs2.3.patch:1.12 --- packages/kernel-xenU/linux-2.6-vs2.3.patch:1.11 Tue Sep 21 07:20:05 2010 +++ packages/kernel-xenU/linux-2.6-vs2.3.patch Wed Sep 22 12:28:42 2010 @@ -1,7 +1,7 @@ -diff -NurpP --minimal linux-2.6.32.21/arch/alpha/Kconfig linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/Kconfig ---- linux-2.6.32.21/arch/alpha/Kconfig 2009-12-03 20:01:49.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/Kconfig 2009-12-03 20:04:56.000000000 +0100 -@@ -674,6 +674,8 @@ config DUMMY_CONSOLE +diff -NurpP --minimal linux-2.6.35.5/arch/alpha/Kconfig linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/Kconfig +--- linux-2.6.35.5/arch/alpha/Kconfig 2010-08-02 16:51:53.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/Kconfig 2010-08-02 17:05:05.000000000 +0200 +@@ -681,6 +681,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.32.21/arch/alpha/kernel/entry.S linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/entry.S ---- linux-2.6.32.21/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/entry.S 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/entry.S linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/entry.S +--- linux-2.6.35.5/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/entry.S 2010-08-02 17:05:05.000000000 +0200 @@ -874,24 +874,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -45,10 +45,10 @@ ret .end sys_getxpid -diff -NurpP --minimal linux-2.6.32.21/arch/alpha/kernel/osf_sys.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/osf_sys.c ---- linux-2.6.32.21/arch/alpha/kernel/osf_sys.c 2010-09-05 01:11:32.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/osf_sys.c 2010-01-20 04:21:33.000000000 +0100 -@@ -865,7 +865,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct +diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/osf_sys.c linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/osf_sys.c +--- linux-2.6.35.5/arch/alpha/kernel/osf_sys.c 2010-07-07 18:30:51.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/osf_sys.c 2010-08-02 17:05:05.000000000 +0200 +@@ -866,7 +866,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct { if (tv) { struct timeval ktv; @@ -57,20 +57,20 @@ if (put_tv32(tv, &ktv)) return -EFAULT; } -diff -NurpP --minimal linux-2.6.32.21/arch/alpha/kernel/ptrace.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/ptrace.c ---- linux-2.6.32.21/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100 -@@ -14,6 +14,7 @@ - #include <linux/slab.h> +diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/ptrace.c linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/ptrace.c +--- linux-2.6.35.5/arch/alpha/kernel/ptrace.c 2010-07-07 18:30:51.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200 +@@ -13,6 +13,7 @@ + #include <linux/user.h> #include <linux/security.h> #include <linux/signal.h> +#include <linux/vs_base.h> #include <asm/uaccess.h> #include <asm/pgtable.h> -diff -NurpP --minimal linux-2.6.32.21/arch/alpha/kernel/systbls.S linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/systbls.S ---- linux-2.6.32.21/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/systbls.S 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/systbls.S linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/systbls.S +--- linux-2.6.35.5/arch/alpha/kernel/systbls.S 2010-02-25 11:51:19.000000000 +0100 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/systbls.S 2010-08-02 17:05:05.000000000 +0200 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -80,10 +80,10 @@ .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-2.6.32.21/arch/alpha/kernel/traps.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/traps.c ---- linux-2.6.32.21/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100 -@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs +diff -NurpP --minimal linux-2.6.35.5/arch/alpha/kernel/traps.c linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/traps.c +--- linux-2.6.35.5/arch/alpha/kernel/traps.c 2010-07-07 18:30:51.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/alpha/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200 +@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); #endif @@ -93,23 +93,9 @@ dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-2.6.32.21/arch/alpha/mm/fault.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/mm/fault.c ---- linux-2.6.32.21/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/alpha/mm/fault.c 2009-12-03 20:04:56.000000000 +0100 -@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns - down_read(&mm->mmap_sem); - goto survive; - } -- printk(KERN_ALERT "VM: killing process %s(%d)\n", -- current->comm, task_pid_nr(current)); -+ printk(KERN_ALERT "VM: killing process %s(%d:#%u)\n", -+ current->comm, task_pid_nr(current), current->xid); - if (!user_mode(regs)) - goto no_context; - do_group_exit(SIGKILL); -diff -NurpP --minimal linux-2.6.32.21/arch/arm/include/asm/tlb.h linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/include/asm/tlb.h ---- linux-2.6.32.21/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/include/asm/tlb.h 2010-02-19 16:17:49.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/arm/include/asm/tlb.h linux-2.6.35.5-vs2.3.0.36.32/arch/arm/include/asm/tlb.h +--- linux-2.6.35.5/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/arm/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200 @@ -27,6 +27,7 @@ #else /* !CONFIG_MMU */ @@ -118,10 +104,10 @@ #include <asm/pgalloc.h> /* -diff -NurpP --minimal linux-2.6.32.21/arch/arm/Kconfig linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/Kconfig ---- linux-2.6.32.21/arch/arm/Kconfig 2010-09-05 01:11:32.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/Kconfig 2010-08-19 17:35:34.000000000 +0200 -@@ -1524,6 +1524,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-2.6.35.5/arch/arm/Kconfig linux-2.6.35.5-vs2.3.0.36.32/arch/arm/Kconfig +--- linux-2.6.35.5/arch/arm/Kconfig 2010-09-22 02:22:39.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/arm/Kconfig 2010-08-14 18:19:32.000000000 +0200 +@@ -1685,6 +1685,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -130,9 +116,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.32.21/arch/arm/kernel/calls.S linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/kernel/calls.S ---- linux-2.6.32.21/arch/arm/kernel/calls.S 2010-09-05 01:11:32.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/kernel/calls.S 2010-01-20 04:21:33.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/arm/kernel/calls.S linux-2.6.35.5-vs2.3.0.36.32/arch/arm/kernel/calls.S +--- linux-2.6.35.5/arch/arm/kernel/calls.S 2010-07-07 18:30:52.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/arm/kernel/calls.S 2010-08-02 17:05:05.000000000 +0200 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -142,9 +128,9 @@ CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-2.6.32.21/arch/arm/kernel/process.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/kernel/process.c ---- linux-2.6.32.21/arch/arm/kernel/process.c 2009-12-03 20:01:50.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/kernel/process.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/arm/kernel/process.c linux-2.6.35.5-vs2.3.0.36.32/arch/arm/kernel/process.c +--- linux-2.6.35.5/arch/arm/kernel/process.c 2010-08-02 16:51:55.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/arm/kernel/process.c 2010-08-02 17:05:05.000000000 +0200 @@ -269,7 +269,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -155,11 +141,11 @@ __show_regs(regs); __backtrace(); } -diff -NurpP --minimal linux-2.6.32.21/arch/arm/kernel/traps.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/kernel/traps.c ---- linux-2.6.32.21/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/arm/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100 -@@ -234,8 +234,8 @@ static void __die(const char *str, int e - sysfs_printk_last_file(); +diff -NurpP --minimal linux-2.6.35.5/arch/arm/kernel/traps.c linux-2.6.35.5-vs2.3.0.36.32/arch/arm/kernel/traps.c +--- linux-2.6.35.5/arch/arm/kernel/traps.c 2010-07-07 18:30:52.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/arm/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200 +@@ -243,8 +243,8 @@ static int __die(const char *str, int er + print_modules(); __show_regs(regs); - printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n", @@ -169,9 +155,9 @@ if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-2.6.32.21/arch/avr32/mm/fault.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/avr32/mm/fault.c ---- linux-2.6.32.21/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/avr32/mm/fault.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/avr32/mm/fault.c linux-2.6.35.5-vs2.3.0.36.32/arch/avr32/mm/fault.c +--- linux-2.6.35.5/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/avr32/mm/fault.c 2010-08-02 17:05:05.000000000 +0200 @@ -216,7 +216,8 @@ out_of_memory: down_read(&mm->mmap_sem); goto survive; @@ -182,10 +168,10 @@ if (user_mode(regs)) do_group_exit(SIGKILL); goto no_context; -diff -NurpP --minimal linux-2.6.32.21/arch/cris/Kconfig linux-2.6.32.21-vs2.3.0.36.29.6/arch/cris/Kconfig ---- linux-2.6.32.21/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/cris/Kconfig 2009-12-03 20:04:56.000000000 +0100 -@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig" +diff -NurpP --minimal linux-2.6.35.5/arch/cris/Kconfig linux-2.6.35.5-vs2.3.0.36.32/arch/cris/Kconfig +--- linux-2.6.35.5/arch/cris/Kconfig 2010-08-02 16:52:03.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/cris/Kconfig 2010-08-02 17:05:05.000000000 +0200 +@@ -694,6 +694,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -194,9 +180,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.32.21/arch/cris/mm/fault.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/cris/mm/fault.c ---- linux-2.6.32.21/arch/cris/mm/fault.c 2009-12-03 20:01:56.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/cris/mm/fault.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/cris/mm/fault.c linux-2.6.35.5-vs2.3.0.36.32/arch/cris/mm/fault.c +--- linux-2.6.35.5/arch/cris/mm/fault.c 2010-02-25 11:51:26.000000000 +0100 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/cris/mm/fault.c 2010-08-02 17:05:05.000000000 +0200 @@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str out_of_memory: @@ -207,9 +193,9 @@ if (user_mode(regs)) do_exit(SIGKILL); goto no_context; -diff -NurpP --minimal linux-2.6.32.21/arch/frv/kernel/kernel_thread.S linux-2.6.32.21-vs2.3.0.36.29.6/arch/frv/kernel/kernel_thread.S ---- linux-2.6.32.21/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/frv/kernel/kernel_thread.S 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/frv/kernel/kernel_thread.S linux-2.6.35.5-vs2.3.0.36.32/arch/frv/kernel/kernel_thread.S +--- linux-2.6.35.5/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/frv/kernel/kernel_thread.S 2010-08-02 17:05:05.000000000 +0200 @@ -37,7 +37,7 @@ kernel_thread: # start by forking the current process, but with shared VM @@ -219,23 +205,10 @@ 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.32.21/arch/frv/mm/fault.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/frv/mm/fault.c ---- linux-2.6.32.21/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/frv/mm/fault.c 2009-12-03 20:04:56.000000000 +0100 -@@ -257,7 +257,8 @@ asmlinkage void do_page_fault(int datamm - */ - out_of_memory: - up_read(&mm->mmap_sem); -- printk("VM: killing process %s\n", current->comm); -+ printk("VM: killing process %s(%d:#%u)\n", -+ current->comm, task_pid_nr(current), current->xid); - if (user_mode(__frame)) - do_group_exit(SIGKILL); - goto no_context; -diff -NurpP --minimal linux-2.6.32.21/arch/h8300/Kconfig linux-2.6.32.21-vs2.3.0.36.29.6/arch/h8300/Kconfig ---- linux-2.6.32.21/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/h8300/Kconfig 2009-12-03 20:04:56.000000000 +0100 -@@ -226,6 +226,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-2.6.35.5/arch/h8300/Kconfig linux-2.6.35.5-vs2.3.0.36.32/arch/h8300/Kconfig +--- linux-2.6.35.5/arch/h8300/Kconfig 2010-02-25 11:51:26.000000000 +0100 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/h8300/Kconfig 2010-08-02 17:05:05.000000000 +0200 +@@ -230,6 +230,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -244,21 +217,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.32.21/arch/ia64/ia32/ia32_entry.S linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/ia32/ia32_entry.S ---- linux-2.6.32.21/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/ia32/ia32_entry.S 2009-12-03 20:04:56.000000000 +0100 -@@ -451,7 +451,7 @@ ia32_syscall_table: - data8 sys_tgkill /* 270 */ - data8 compat_sys_utimes - data8 sys32_fadvise64_64 -- data8 sys_ni_syscall -+ data8 sys32_vserver - data8 sys_ni_syscall - data8 sys_ni_syscall /* 275 */ - data8 sys_ni_syscall -diff -NurpP --minimal linux-2.6.32.21/arch/ia64/include/asm/tlb.h linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/include/asm/tlb.h ---- linux-2.6.32.21/arch/ia64/include/asm/tlb.h 2009-09-10 15:25:22.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/include/asm/tlb.h 2009-12-31 14:37:34.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/ia64/include/asm/tlb.h linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/include/asm/tlb.h +--- linux-2.6.35.5/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/include/asm/tlb.h 2010-08-02 17:05:05.000000000 +0200 @@ -40,6 +40,7 @@ #include <linux/mm.h> #include <linux/pagemap.h> @@ -267,10 +228,10 @@ #include <asm/pgalloc.h> #include <asm/processor.h> -diff -NurpP --minimal linux-2.6.32.21/arch/ia64/Kconfig linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/Kconfig ---- linux-2.6.32.21/arch/ia64/Kconfig 2009-12-03 20:01:56.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/Kconfig 2009-12-03 20:04:56.000000000 +0100 -@@ -685,6 +685,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-2.6.35.5/arch/ia64/Kconfig linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/Kconfig +--- linux-2.6.35.5/arch/ia64/Kconfig 2010-08-02 16:52:03.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/Kconfig 2010-08-02 17:05:05.000000000 +0200 +@@ -676,6 +676,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -279,10 +240,10 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.32.21/arch/ia64/kernel/entry.S linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/entry.S ---- linux-2.6.32.21/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/entry.S 2009-12-03 20:04:56.000000000 +0100 -@@ -1753,7 +1753,7 @@ sys_call_table: +diff -NurpP --minimal linux-2.6.35.5/arch/ia64/kernel/entry.S linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/entry.S +--- linux-2.6.35.5/arch/ia64/kernel/entry.S 2010-07-07 18:31:01.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/entry.S 2010-08-02 17:05:05.000000000 +0200 +@@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr data8 sys_kexec_load @@ -291,30 +252,21 @@ data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-2.6.32.21/arch/ia64/kernel/perfmon.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/perfmon.c ---- linux-2.6.32.21/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/perfmon.c 2009-12-03 20:04:56.000000000 +0100 -@@ -41,6 +41,7 @@ - #include <linux/rcupdate.h> +diff -NurpP --minimal linux-2.6.35.5/arch/ia64/kernel/perfmon.c linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/perfmon.c +--- linux-2.6.35.5/arch/ia64/kernel/perfmon.c 2010-07-07 18:31:01.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/perfmon.c 2010-08-02 17:05:05.000000000 +0200 +@@ -42,6 +42,7 @@ #include <linux/completion.h> #include <linux/tracehook.h> + #include <linux/slab.h> +#include <linux/vs_memory.h> #include <asm/errno.h> #include <asm/intrinsics.h> -@@ -2372,7 +2373,7 @@ pfm_smpl_buffer_alloc(struct task_struct - */ - insert_vm_struct(mm, vma); - -- mm->total_vm += size >> PAGE_SHIFT; -+ vx_vmpages_add(mm, size >> PAGE_SHIFT); - vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, - vma_pages(vma)); - up_write(&task->mm->mmap_sem); -diff -NurpP --minimal linux-2.6.32.21/arch/ia64/kernel/process.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/process.c ---- linux-2.6.32.21/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/process.c 2009-12-03 20:04:56.000000000 +0100 -@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs) +diff -NurpP --minimal linux-2.6.35.5/arch/ia64/kernel/process.c linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/process.c +--- linux-2.6.35.5/arch/ia64/kernel/process.c 2010-07-07 18:31:01.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/process.c 2010-08-02 17:05:05.000000000 +0200 +@@ -113,8 +113,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; print_modules(); @@ -325,10 +277,10 @@ 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.32.21/arch/ia64/kernel/ptrace.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/ptrace.c ---- linux-2.6.32.21/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100 -@@ -22,6 +22,7 @@ +diff -NurpP --minimal linux-2.6.35.5/arch/ia64/kernel/ptrace.c linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/ptrace.c +--- linux-2.6.35.5/arch/ia64/kernel/ptrace.c 2010-08-02 16:52:04.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200 +@@ -21,6 +21,7 @@ #include <linux/regset.h> #include <linux/elf.h> #include <linux/tracehook.h> @@ -336,10 +288,10 @@ #include <asm/pgtable.h> #include <asm/processor.h> -diff -NurpP --minimal linux-2.6.32.21/arch/ia64/kernel/traps.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/traps.c ---- linux-2.6.32.21/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100 -@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re +diff -NurpP --minimal linux-2.6.35.5/arch/ia64/kernel/traps.c linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/traps.c +--- linux-2.6.35.5/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200 +@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re put_cpu(); if (++die.lock_owner_depth < 3) { @@ -351,7 +303,7 @@ if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) != NOTIFY_STOP) show_regs(regs); -@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_ +@@ -323,8 +324,9 @@ handle_fpu_swa (int fp_fault, struct pt_ if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) { last.time = current_jiffies + 5 * HZ; printk(KERN_WARNING @@ -363,9 +315,9 @@ } } } -diff -NurpP --minimal linux-2.6.32.21/arch/ia64/mm/fault.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/mm/fault.c ---- linux-2.6.32.21/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/ia64/mm/fault.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/ia64/mm/fault.c linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/mm/fault.c +--- linux-2.6.35.5/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/ia64/mm/fault.c 2010-08-02 17:05:05.000000000 +0200 @@ -10,6 +10,7 @@ #include <linux/interrupt.h> #include <linux/kprobes.h> @@ -374,19 +326,9 @@ #include <asm/pgtable.h> #include <asm/processor.h> -@@ -281,7 +282,8 @@ ia64_do_page_fault (unsigned long addres - down_read(&mm->mmap_sem); - goto survive; - } -- printk(KERN_CRIT "VM: killing process %s\n", current->comm); -+ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n", -+ current->comm, task_pid_nr(current), current->xid); - if (user_mode(regs)) - do_group_exit(SIGKILL); - goto no_context; -diff -NurpP --minimal linux-2.6.32.21/arch/m32r/kernel/traps.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/m32r/kernel/traps.c ---- linux-2.6.32.21/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/m32r/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/m32r/kernel/traps.c linux-2.6.35.5-vs2.3.0.36.32/arch/m32r/kernel/traps.c +--- linux-2.6.35.5/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/m32r/kernel/traps.c 2010-08-02 17:05:05.000000000 +0200 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -399,23 +341,10 @@ /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-2.6.32.21/arch/m32r/mm/fault.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/m32r/mm/fault.c ---- linux-2.6.32.21/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/m32r/mm/fault.c 2009-12-03 20:04:56.000000000 +0100 -@@ -276,7 +276,8 @@ out_of_memory: - down_read(&mm->mmap_sem); - goto survive; - } -- printk("VM: killing process %s\n", tsk->comm); -+ printk("VM: killing process %s(%d:#%u)\n", -+ tsk->comm, task_pid_nr(tsk), tsk->xid); - if (error_code & ACE_USERMODE) - do_group_exit(SIGKILL); - goto no_context; -diff -NurpP --minimal linux-2.6.32.21/arch/m68k/Kconfig linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68k/Kconfig ---- linux-2.6.32.21/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68k/Kconfig 2009-12-03 20:04:56.000000000 +0100 -@@ -622,6 +622,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-2.6.35.5/arch/m68k/Kconfig linux-2.6.35.5-vs2.3.0.36.32/arch/m68k/Kconfig +--- linux-2.6.35.5/arch/m68k/Kconfig 2010-08-02 16:52:04.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/m68k/Kconfig 2010-08-02 17:05:05.000000000 +0200 +@@ -619,6 +619,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -424,9 +353,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.32.21/arch/m68k/kernel/ptrace.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68k/kernel/ptrace.c ---- linux-2.6.32.21/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68k/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/m68k/kernel/ptrace.c linux-2.6.35.5-vs2.3.0.36.32/arch/m68k/kernel/ptrace.c +--- linux-2.6.35.5/arch/m68k/kernel/ptrace.c 2010-07-07 18:31:02.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/m68k/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/ptrace.h> #include <linux/user.h> @@ -435,7 +364,7 @@ #include <asm/uaccess.h> #include <asm/page.h> -@@ -269,6 +270,8 @@ long arch_ptrace(struct task_struct *chi +@@ -254,6 +255,8 @@ long arch_ptrace(struct task_struct *chi ret = ptrace_request(child, request, addr, data); break; } @@ -444,9 +373,9 @@ return ret; out_eio: -diff -NurpP --minimal linux-2.6.32.21/arch/m68k/kernel/traps.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68k/kernel/traps.c ---- linux-2.6.32.21/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68k/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/m68k/kernel/traps.c linux-2.6.35.5-vs2.3.0.36.32/arch/m68k/kernel/traps.c +--- linux-2.6.35.5/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/m68k/kernel/traps.c 2010-08-02 17:05:05.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); @@ -458,23 +387,10 @@ addr = (unsigned long)&fp->un; printk("Frame format=%X ", regs->format); switch (regs->format) { -diff -NurpP --minimal linux-2.6.32.21/arch/m68k/mm/fault.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68k/mm/fault.c ---- linux-2.6.32.21/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68k/mm/fault.c 2009-12-03 20:04:56.000000000 +0100 -@@ -186,7 +186,8 @@ out_of_memory: - goto survive; - } - -- printk("VM: killing process %s\n", current->comm); -+ printk("VM: killing process %s(%d:#%u)\n", -+ current->comm, task_pid_nr(current), current->xid); - if (user_mode(regs)) - do_group_exit(SIGKILL); - -diff -NurpP --minimal linux-2.6.32.21/arch/m68knommu/Kconfig linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68knommu/Kconfig ---- linux-2.6.32.21/arch/m68knommu/Kconfig 2009-12-03 20:01:57.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68knommu/Kconfig 2009-12-03 20:04:56.000000000 +0100 -@@ -727,6 +727,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-2.6.35.5/arch/m68knommu/Kconfig linux-2.6.35.5-vs2.3.0.36.32/arch/m68knommu/Kconfig +--- linux-2.6.35.5/arch/m68knommu/Kconfig 2010-08-02 16:52:04.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/m68knommu/Kconfig 2010-08-02 17:05:05.000000000 +0200 +@@ -734,6 +734,8 @@ source "fs/Kconfig" source "arch/m68knommu/Kconfig.debug" @@ -483,9 +399,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.32.21/arch/m68knommu/kernel/traps.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68knommu/kernel/traps.c ---- linux-2.6.32.21/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/m68knommu/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/m68knommu/kernel/traps.c linux-2.6.35.5-vs2.3.0.36.32/arch/m68knommu/kernel/traps.c +--- linux-2.6.35.5/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/m68knommu/kernel/traps.c 2010-08-02 17:05:05.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); @@ -498,23 +414,10 @@ show_stack(NULL, (unsigned long *)(fp + 1)); add_taint(TAINT_DIE); do_exit(SIGSEGV); -diff -NurpP --minimal linux-2.6.32.21/arch/microblaze/mm/fault.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/microblaze/mm/fault.c ---- linux-2.6.32.21/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000 +0200 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/microblaze/mm/fault.c 2009-12-03 20:04:56.000000000 +0100 -@@ -279,7 +279,8 @@ out_of_memory: - goto survive; - } - up_read(&mm->mmap_sem); -- printk(KERN_WARNING "VM: killing process %s\n", current->comm); -+ printk(KERN_WARNING "VM: killing process %s(%d:#%u)\n", -+ current->comm, task_pid_nr(current), current->xid); - if (user_mode(regs)) - do_exit(SIGKILL); - bad_page_fault(regs, address, SIGKILL); -diff -NurpP --minimal linux-2.6.32.21/arch/mips/Kconfig linux-2.6.32.21-vs2.3.0.36.29.6/arch/mips/Kconfig ---- linux-2.6.32.21/arch/mips/Kconfig 2009-12-03 20:01:58.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/mips/Kconfig 2009-12-03 20:04:56.000000000 +0100 -@@ -2188,6 +2188,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-2.6.35.5/arch/mips/Kconfig linux-2.6.35.5-vs2.3.0.36.32/arch/mips/Kconfig +--- linux-2.6.35.5/arch/mips/Kconfig 2010-08-02 16:52:05.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/mips/Kconfig 2010-08-02 17:05:05.000000000 +0200 +@@ -2253,6 +2253,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -523,9 +426,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-2.6.32.21/arch/mips/kernel/ptrace.c linux-2.6.32.21-vs2.3.0.36.29.6/arch/mips/kernel/ptrace.c ---- linux-2.6.32.21/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/mips/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/mips/kernel/ptrace.c linux-2.6.35.5-vs2.3.0.36.32/arch/mips/kernel/ptrace.c +--- linux-2.6.35.5/arch/mips/kernel/ptrace.c 2010-07-07 18:31:04.000000000 +0200 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/mips/kernel/ptrace.c 2010-08-02 17:05:05.000000000 +0200 @@ -25,6 +25,7 @@ #include <linux/security.h> #include <linux/audit.h> @@ -544,9 +447,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.32.21/arch/mips/kernel/scall32-o32.S linux-2.6.32.21-vs2.3.0.36.29.6/arch/mips/kernel/scall32-o32.S ---- linux-2.6.32.21/arch/mips/kernel/scall32-o32.S 2009-12-03 20:01:59.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/mips/kernel/scall32-o32.S 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/mips/kernel/scall32-o32.S linux-2.6.35.5-vs2.3.0.36.32/arch/mips/kernel/scall32-o32.S +--- linux-2.6.35.5/arch/mips/kernel/scall32-o32.S 2010-02-25 11:51:28.000000000 +0100 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/mips/kernel/scall32-o32.S 2010-08-02 17:05:05.000000000 +0200 @@ -525,7 +525,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -556,9 +459,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.32.21/arch/mips/kernel/scall64-64.S linux-2.6.32.21-vs2.3.0.36.29.6/arch/mips/kernel/scall64-64.S ---- linux-2.6.32.21/arch/mips/kernel/scall64-64.S 2009-12-03 20:01:59.000000000 +0100 -+++ linux-2.6.32.21-vs2.3.0.36.29.6/arch/mips/kernel/scall64-64.S 2009-12-03 20:04:56.000000000 +0100 +diff -NurpP --minimal linux-2.6.35.5/arch/mips/kernel/scall64-64.S linux-2.6.35.5-vs2.3.0.36.32/arch/mips/kernel/scall64-64.S +--- linux-2.6.35.5/arch/mips/kernel/scall64-64.S 2010-02-25 11:51:28.000000000 +0100 ++++ linux-2.6.35.5-vs2.3.0.36.32/arch/mips/kernel/scall64-64.S 2010-08-02 17:05:05.000000000 +0200 @@ -362,7 +362,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-xenU/linux-2.6-vs2.3.patch?r1=1.11&r2=1.12&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit