Author: hawk Date: Fri Apr 29 11:53:20 2011 GMT
Module: packages Tag: Titanium
---- Log message:
- http://vserver.13thfloor.at/Experimental/patch-2.6.38.4-vs2.3.0.37-rc15.diff
with extraversion killed
---- Files affected:
packages/kernel-bare-vserver:
linux-2.6-vs2.3.patch (1.1.2.17.2.59 -> 1.1.2.17.2.60)
---- Diffs:
================================================================
Index: packages/kernel-bare-vserver/linux-2.6-vs2.3.patch
diff -u packages/kernel-bare-vserver/linux-2.6-vs2.3.patch:1.1.2.17.2.59
packages/kernel-bare-vserver/linux-2.6-vs2.3.patch:1.1.2.17.2.60
--- packages/kernel-bare-vserver/linux-2.6-vs2.3.patch:1.1.2.17.2.59 Thu Oct
7 10:54:24 2010
+++ packages/kernel-bare-vserver/linux-2.6-vs2.3.patch Fri Apr 29 13:53:10 2011
@@ -1,7 +1,165 @@
-diff -NurpP --minimal linux-2.6.32.24/arch/alpha/Kconfig
linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/Kconfig
---- linux-2.6.32.24/arch/alpha/Kconfig 2009-12-03 20:01:49.000000000 +0100
-+++ linux-2.6.32.24-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.38.4/Documentation/vserver/debug.txt
linux-2.6.38.4-vs2.3.0.37-rc15/Documentation/vserver/debug.txt
+--- linux-2.6.38.4/Documentation/vserver/debug.txt 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/Documentation/vserver/debug.txt
2011-01-29 02:01:07.000000000 +0100
+@@ -0,0 +1,154 @@
++
++debug_cvirt:
++
++ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
++ "vx_rmap_tgid: %p/%llx: %d -> %d"
++
++debug_dlim:
++
++ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
++ "FREE (%p,#%d)%c inode"
++ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
++ "FREE (%p,#%d)%c %lld bytes"
++ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
++ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
++ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
++ "rcu_free_dl_info(%p)"
++ 4 10 "alloc_dl_info(%p,%d) = %p"
++ "dealloc_dl_info(%p)"
++ "get_dl_info(%p[#%d.%d])"
++ "put_dl_info(%p[#%d.%d])"
++ 5 20 "alloc_dl_info(%p,%d)*"
++ 6 40 "__hash_dl_info: %p[#%d]"
++ "__unhash_dl_info: %p[#%d]"
++ 7 80 "locate_dl_info(%p,#%d) = %p"
++
++debug_misc:
++
++ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
++ "new_dqhash: %p [#0x%08x]"
++ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
++ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
++ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
++ "vroot_get_real_bdev not set"
++ 1 2 "cow_break_link(�%s�)"
++ "temp copy �%s�"
++ 2 4 "dentry_open(new): %p"
++ "dentry_open(old): %p"
++ "lookup_create(new): %p"
++ "old path �%s�"
++ "path_lookup(old): %d"
++ "vfs_create(new): %d"
++ "vfs_rename: %d"
++ "vfs_sendfile: %d"
++ 3 8 "fput(new_file=%p[#%d])"
++ "fput(old_file=%p[#%d])"
++ 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d"
++ "vx_info_kill(%p[#%d],%d,%d)*"
++ 5 20 "vs_reboot(%p[#%d],%d)"
++ 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]"
++
++debug_net:
++
++ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
++ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
++ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
++ 4 10 "ip_route_connect(%p) %p,%p;%lx"
++ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
++ 6 40 "sk,egf: %p [#%d] (from %d)"
++ "sk,egn: %p [#%d] (from %d)"
++ "sk,req: %p [#%d] (from %d)"
++ "sk: %p [#%d] (from %d)"
++ "tw: %p [#%d] (from %d)"
++ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
++ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
++
++debug_nid:
++
++ 0 1 "__lookup_nx_info(#%u): %p[#%u]"
++ "alloc_nx_info(%d) = %p"
++ "create_nx_info(%d) (dynamic rejected)"
++ "create_nx_info(%d) = %p (already there)"
++ "create_nx_info(%d) = %p (new)"
++ "dealloc_nx_info(%p)"
++ 1 2 "alloc_nx_info(%d)*"
++ "create_nx_info(%d)*"
++ 2 4 "get_nx_info(%p[#%d.%d])"
++ "put_nx_info(%p[#%d.%d])"
++ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p"
++ "clr_nx_info(%p[#%d.%d])"
++ "init_nx_info(%p[#%d.%d])"
++ "release_nx_info(%p[#%d.%d.%d]) %p"
++ "set_nx_info(%p[#%d.%d])"
++ 4 10 "__hash_nx_info: %p[#%d]"
++ "__nx_dynamic_id: [#%d]"
++ "__unhash_nx_info: %p[#%d.%d.%d]"
++ 5 20 "moved task %p into nxi:%p[#%d]"
++ "nx_migrate_task(%p,%p[#%d.%d.%d])"
++ "task_get_nx_info(%p)"
++ 6 40 "nx_clear_persistent(%p[#%d])"
++
++debug_quota:
++
++ 0 1 "quota_sync_dqh(%p,%d) discard inode %p"
++ 1 2 "quota_sync_dqh(%p,%d)"
++ "sync_dquots(%p,%d)"
++ "sync_dquots_dqh(%p,%d)"
++ 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
++
++debug_switch:
++
++ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
++ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
++ 4 10 "%s: (%s %s) returned %s with %d"
++
++debug_tag:
++
++ 7 80 "dx_parse_tag(�%s�): %d:#%d"
++ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
++
++debug_xid:
++
++ 0 1 "__lookup_vx_info(#%u): %p[#%u]"
++ "alloc_vx_info(%d) = %p"
++ "alloc_vx_info(%d)*"
++ "create_vx_info(%d) (dynamic rejected)"
++ "create_vx_info(%d) = %p (already there)"
++ "create_vx_info(%d) = %p (new)"
++ "dealloc_vx_info(%p)"
++ "loc_vx_info(%d) = %p (found)"
++ "loc_vx_info(%d) = %p (new)"
++ "loc_vx_info(%d) = %p (not available)"
++ 1 2 "create_vx_info(%d)*"
++ "loc_vx_info(%d)*"
++ 2 4 "get_vx_info(%p[#%d.%d])"
++ "put_vx_info(%p[#%d.%d])"
++ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p"
++ "clr_vx_info(%p[#%d.%d])"
++ "init_vx_info(%p[#%d.%d])"
++ "release_vx_info(%p[#%d.%d.%d]) %p"
++ "set_vx_info(%p[#%d.%d])"
++ 4 10 "__hash_vx_info: %p[#%d]"
++ "__unhash_vx_info: %p[#%d.%d.%d]"
++ "__vx_dynamic_id: [#%d]"
++ 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
++ "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
++ "moved task %p into vxi:%p[#%d]"
++ "task_get_vx_info(%p)"
++ "vx_migrate_task(%p,%p[#%d.%d])"
++ 6 40 "vx_clear_persistent(%p[#%d])"
++ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
++ "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++ "vx_set_persistent(%p[#%d])"
++ "vx_set_reaper(%p[#%d],%p[#%d,%d])"
++ 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
++
++
++debug_limit:
++
++ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
++ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
++
++ 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.38.4/arch/alpha/Kconfig
linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/Kconfig
+--- linux-2.6.38.4/arch/alpha/Kconfig 2011-03-15 18:06:23.000000000 +0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/Kconfig 2011-03-10
17:21:19.000000000 +0100
+@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,10 +168,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.24/arch/alpha/kernel/entry.S
linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/kernel/entry.S
---- linux-2.6.32.24/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000
+0200
-+++ linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/kernel/entry.S 2009-12-03
20:04:56.000000000 +0100
-@@ -874,24 +874,15 @@ sys_getxgid:
+diff -NurpP --minimal linux-2.6.38.4/arch/alpha/kernel/entry.S
linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/kernel/entry.S
+--- linux-2.6.38.4/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000
+0200
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/kernel/entry.S 2011-01-29
02:01:07.000000000 +0100
+@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
sys_getxpid:
@@ -45,32 +203,20 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.32.24/arch/alpha/kernel/osf_sys.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.24/arch/alpha/kernel/osf_sys.c 2010-10-04
08:55:48.000000000 +0200
-+++ linux-2.6.32.24-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
- {
- if (tv) {
- struct timeval ktv;
-- do_gettimeofday(&ktv);
-+ vx_gettimeofday(&ktv);
- if (put_tv32(tv, &ktv))
- return -EFAULT;
- }
-diff -NurpP --minimal linux-2.6.32.24/arch/alpha/kernel/ptrace.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/kernel/ptrace.c
---- linux-2.6.32.24/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000
+0200
-+++ linux-2.6.32.24-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.38.4/arch/alpha/kernel/ptrace.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/kernel/ptrace.c
+--- linux-2.6.38.4/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000
+0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/kernel/ptrace.c 2011-01-29
02:01:07.000000000 +0100
+@@ -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.24/arch/alpha/kernel/systbls.S
linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/kernel/systbls.S
---- linux-2.6.32.24/arch/alpha/kernel/systbls.S 2009-03-24
14:18:08.000000000 +0100
-+++ linux-2.6.32.24-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.38.4/arch/alpha/kernel/systbls.S
linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/kernel/systbls.S
+--- linux-2.6.38.4/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000
+0200
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/kernel/systbls.S 2011-01-29
02:01:07.000000000 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -80,9 +226,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.32.24/arch/alpha/kernel/traps.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/kernel/traps.c
---- linux-2.6.32.24/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000
+0200
-+++ linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/kernel/traps.c 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.4/arch/alpha/kernel/traps.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/kernel/traps.c
+--- linux-2.6.38.4/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000
+0200
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/alpha/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -93,35 +239,10 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.32.24/arch/alpha/mm/fault.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/alpha/mm/fault.c
---- linux-2.6.32.24/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000
+0200
-+++ linux-2.6.32.24-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.24/arch/arm/include/asm/tlb.h
linux-2.6.32.24-vs2.3.0.36.29.6/arch/arm/include/asm/tlb.h
---- linux-2.6.32.24/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000
+0200
-+++ linux-2.6.32.24-vs2.3.0.36.29.6/arch/arm/include/asm/tlb.h 2010-02-19
16:17:49.000000000 +0100
-@@ -27,6 +27,7 @@
-
- #else /* !CONFIG_MMU */
-
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
-
- /*
-diff -NurpP --minimal linux-2.6.32.24/arch/arm/Kconfig
linux-2.6.32.24-vs2.3.0.36.29.6/arch/arm/Kconfig
---- linux-2.6.32.24/arch/arm/Kconfig 2010-10-04 08:55:48.000000000 +0200
-+++ linux-2.6.32.24-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.38.4/arch/arm/Kconfig
linux-2.6.38.4-vs2.3.0.37-rc15/arch/arm/Kconfig
+--- linux-2.6.38.4/arch/arm/Kconfig 2011-03-15 18:06:23.000000000 +0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/arm/Kconfig 2011-03-07
16:53:25.000000000 +0100
+@@ -1934,6 +1934,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -130,9 +251,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.24/arch/arm/kernel/calls.S
linux-2.6.32.24-vs2.3.0.36.29.6/arch/arm/kernel/calls.S
---- linux-2.6.32.24/arch/arm/kernel/calls.S 2010-10-04 08:55:49.000000000
+0200
-+++ linux-2.6.32.24-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.38.4/arch/arm/kernel/calls.S
linux-2.6.38.4-vs2.3.0.37-rc15/arch/arm/kernel/calls.S
+--- linux-2.6.38.4/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000
+0200
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/arm/kernel/calls.S 2011-01-29
02:01:07.000000000 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -142,10 +263,10 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.32.24/arch/arm/kernel/process.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/arm/kernel/process.c
---- linux-2.6.32.24/arch/arm/kernel/process.c 2009-12-03 20:01:50.000000000
+0100
-+++ linux-2.6.32.24-vs2.3.0.36.29.6/arch/arm/kernel/process.c 2009-12-03
20:04:56.000000000 +0100
-@@ -269,7 +269,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.38.4/arch/arm/kernel/process.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/arm/kernel/process.c
+--- linux-2.6.38.4/arch/arm/kernel/process.c 2011-03-15 18:06:25.000000000
+0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/arm/kernel/process.c 2011-01-29
02:01:07.000000000 +0100
+@@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -155,11 +276,11 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.32.24/arch/arm/kernel/traps.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/arm/kernel/traps.c
---- linux-2.6.32.24/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000
+0100
-+++ linux-2.6.32.24-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.38.4/arch/arm/kernel/traps.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/arm/kernel/traps.c
+--- linux-2.6.38.4/arch/arm/kernel/traps.c 2011-03-15 18:06:25.000000000
+0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/arm/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
+@@ -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,22 +290,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.32.24/arch/avr32/mm/fault.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/avr32/mm/fault.c
---- linux-2.6.32.24/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000
+0200
-+++ linux-2.6.32.24-vs2.3.0.36.29.6/arch/avr32/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
-@@ -216,7 +216,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 (user_mode(regs))
- do_group_exit(SIGKILL);
- goto no_context;
-diff -NurpP --minimal linux-2.6.32.24/arch/cris/Kconfig
linux-2.6.32.24-vs2.3.0.36.29.6/arch/cris/Kconfig
---- linux-2.6.32.24/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
-+++ linux-2.6.32.24-vs2.3.0.36.29.6/arch/cris/Kconfig 2009-12-03
20:04:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.4/arch/cris/Kconfig
linux-2.6.38.4-vs2.3.0.37-rc15/arch/cris/Kconfig
+--- linux-2.6.38.4/arch/cris/Kconfig 2011-03-15 18:06:38.000000000 +0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/cris/Kconfig 2011-01-29
02:01:07.000000000 +0100
@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -194,22 +302,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.24/arch/cris/mm/fault.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/cris/mm/fault.c
---- linux-2.6.32.24/arch/cris/mm/fault.c 2009-12-03 20:01:56.000000000
+0100
-+++ linux-2.6.32.24-vs2.3.0.36.29.6/arch/cris/mm/fault.c 2009-12-03
20:04:56.000000000 +0100
-@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
-
- out_of_memory:
- up_read(&mm->mmap_sem);
-- 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 (user_mode(regs))
- do_exit(SIGKILL);
- goto no_context;
-diff -NurpP --minimal linux-2.6.32.24/arch/frv/kernel/kernel_thread.S
linux-2.6.32.24-vs2.3.0.36.29.6/arch/frv/kernel/kernel_thread.S
---- linux-2.6.32.24/arch/frv/kernel/kernel_thread.S 2008-12-25
00:26:37.000000000 +0100
-+++ linux-2.6.32.24-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.38.4/arch/frv/kernel/kernel_thread.S
linux-2.6.38.4-vs2.3.0.37-rc15/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.38.4/arch/frv/kernel/kernel_thread.S 2008-12-25
00:26:37.000000000 +0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/frv/kernel/kernel_thread.S
2011-01-29 02:01:07.000000000 +0100
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -219,23 +314,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.24/arch/frv/mm/fault.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/frv/mm/fault.c
---- linux-2.6.32.24/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000
+0200
-+++ linux-2.6.32.24-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.24/arch/h8300/Kconfig
linux-2.6.32.24-vs2.3.0.36.29.6/arch/h8300/Kconfig
---- linux-2.6.32.24/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.32.24-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.38.4/arch/h8300/Kconfig
linux-2.6.38.4-vs2.3.0.37-rc15/arch/h8300/Kconfig
+--- linux-2.6.38.4/arch/h8300/Kconfig 2011-03-15 18:06:38.000000000 +0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/h8300/Kconfig 2011-01-29
02:01:07.000000000 +0100
+@@ -217,6 +217,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -244,33 +326,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.24/arch/ia64/ia32/ia32_entry.S
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.32.24/arch/ia64/ia32/ia32_entry.S 2009-06-11
17:11:57.000000000 +0200
-+++ linux-2.6.32.24-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.24/arch/ia64/include/asm/tlb.h
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/include/asm/tlb.h
---- linux-2.6.32.24/arch/ia64/include/asm/tlb.h 2009-09-10
15:25:22.000000000 +0200
-+++ linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/include/asm/tlb.h
2009-12-31 14:37:34.000000000 +0100
-@@ -40,6 +40,7 @@
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgalloc.h>
- #include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.32.24/arch/ia64/Kconfig
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/Kconfig
---- linux-2.6.32.24/arch/ia64/Kconfig 2009-12-03 20:01:56.000000000 +0100
-+++ linux-2.6.32.24-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.38.4/arch/ia64/Kconfig
linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/Kconfig
+--- linux-2.6.38.4/arch/ia64/Kconfig 2011-03-15 18:06:38.000000000 +0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/Kconfig 2011-01-29
02:01:07.000000000 +0100
+@@ -674,6 +674,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -279,10 +338,21 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.24/arch/ia64/kernel/entry.S
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/kernel/entry.S
---- linux-2.6.32.24/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000
+0200
-+++ linux-2.6.32.24-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.38.4/arch/ia64/include/asm/tlb.h
linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/include/asm/tlb.h
+--- linux-2.6.38.4/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000
+0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/include/asm/tlb.h 2011-01-29
02:01:07.000000000 +0100
+@@ -40,6 +40,7 @@
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/pgalloc.h>
+ #include <asm/processor.h>
+diff -NurpP --minimal linux-2.6.38.4/arch/ia64/kernel/entry.S
linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/entry.S
+--- linux-2.6.38.4/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000
+0200
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/entry.S 2011-01-29
02:01:07.000000000 +0100
+@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_kexec_load
@@ -291,30 +361,21 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.32.24/arch/ia64/kernel/perfmon.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/kernel/perfmon.c
---- linux-2.6.32.24/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000
+0200
-+++ linux-2.6.32.24-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.38.4/arch/ia64/kernel/perfmon.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/perfmon.c
+--- linux-2.6.38.4/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000
+0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/perfmon.c 2011-01-29
02:01:07.000000000 +0100
+@@ -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.24/arch/ia64/kernel/process.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/kernel/process.c
---- linux-2.6.32.24/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000
+0100
-+++ linux-2.6.32.24-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.38.4/arch/ia64/kernel/process.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/process.c
+--- linux-2.6.38.4/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000
+0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/process.c 2011-01-29
02:01:07.000000000 +0100
+@@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
print_modules();
@@ -325,10 +386,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.24/arch/ia64/kernel/ptrace.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/kernel/ptrace.c
---- linux-2.6.32.24/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000
+0200
-+++ linux-2.6.32.24-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.38.4/arch/ia64/kernel/ptrace.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/ptrace.c
+--- linux-2.6.38.4/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000
+0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/ptrace.c 2011-01-29
02:01:07.000000000 +0100
+@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <linux/tracehook.h>
@@ -336,10 +397,10 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.32.24/arch/ia64/kernel/traps.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/kernel/traps.c
---- linux-2.6.32.24/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000
+0100
-+++ linux-2.6.32.24-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.38.4/arch/ia64/kernel/traps.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/traps.c
+--- linux-2.6.38.4/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000
+0200
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
+@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
if (++die.lock_owner_depth < 3) {
@@ -351,7 +412,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 +424,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.32.24/arch/ia64/mm/fault.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/ia64/mm/fault.c
---- linux-2.6.32.24/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000
+0200
-+++ linux-2.6.32.24-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.38.4/arch/ia64/mm/fault.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/mm/fault.c
+--- linux-2.6.38.4/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000
+0200
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/ia64/mm/fault.c 2011-01-29
02:01:07.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -374,19 +435,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.24/arch/m32r/kernel/traps.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/m32r/kernel/traps.c
---- linux-2.6.32.24/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000
+0100
-+++ linux-2.6.32.24-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.38.4/arch/m32r/kernel/traps.c
linux-2.6.38.4-vs2.3.0.37-rc15/arch/m32r/kernel/traps.c
+--- linux-2.6.38.4/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000
+0100
++++ linux-2.6.38.4-vs2.3.0.37-rc15/arch/m32r/kernel/traps.c 2011-01-29
02:01:07.000000000 +0100
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -399,23 +450,10 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.32.24/arch/m32r/mm/fault.c
linux-2.6.32.24-vs2.3.0.36.29.6/arch/m32r/mm/fault.c
---- linux-2.6.32.24/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000
+0200
-+++ linux-2.6.32.24-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);
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-bare-vserver/linux-2.6-vs2.3.patch?r1=1.1.2.17.2.59&r2=1.1.2.17.2.60&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
