Author: arekm Date: Tue Apr 5 19:20:11 2011 GMT
Module: packages Tag: LINUX_2_6_37
---- Log message:
- up to 2.6.37.6; vserver up to patch-2.6.37.4-vs2.3.0.37-rc5
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.61.2.3 -> 1.61.2.4) , kernel-vserver-2.3.patch
(1.57 -> 1.57.2.1) , kernel.spec (1.888.2.5 -> 1.888.2.6)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.61.2.3
packages/kernel/kernel-grsec_full.patch:1.61.2.4
--- packages/kernel/kernel-grsec_full.patch:1.61.2.3 Wed Mar 23 23:21:07 2011
+++ packages/kernel/kernel-grsec_full.patch Tue Apr 5 21:20:02 2011
@@ -34147,8 +34147,8 @@
+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0),
+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack :
0),
+#else
- mm ? mm->start_code : 0,
- mm ? mm->end_code : 0,
+ mm ? (permitted ? mm->start_code : 1) : 0,
+ mm ? (permitted ? mm->end_code : 1) : 0,
(permitted && mm) ? mm->start_stack : 0,
+#endif
esp,
@@ -34893,8 +34893,8 @@
const char *name = arch_vma_name(vma);
if (!name) {
if (mm) {
-- if (vma->vm_start <= mm->start_brk &&
-- vma->vm_end >= mm->brk) {
+- if (vma->vm_start <= mm->brk &&
+- vma->vm_end >= mm->start_brk) {
+ if (vma->vm_start <= mm->brk && vma->vm_end >=
mm->start_brk) {
name = "[heap]";
- } else if (vma->vm_start <= mm->start_stack &&
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.57
packages/kernel/kernel-vserver-2.3.patch:1.57.2.1
--- packages/kernel/kernel-vserver-2.3.patch:1.57 Tue Mar 8 21:38:28 2011
+++ packages/kernel/kernel-vserver-2.3.patch Tue Apr 5 21:20:03 2011
@@ -1,6 +1,164 @@
-diff -NurpP --minimal linux-2.6.37/arch/alpha/Kconfig
linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/Kconfig
---- linux-2.6.37/arch/alpha/Kconfig 2011-01-05 21:48:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/Kconfig 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/Documentation/vserver/debug.txt
linux-2.6.37.4-vs2.3.0.37-rc5/Documentation/vserver/debug.txt
+--- linux-2.6.37.4/Documentation/vserver/debug.txt 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/Documentation/vserver/debug.txt
2010-11-23 02:09:40.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.37.4/arch/alpha/Kconfig
linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/Kconfig
+--- linux-2.6.37.4/arch/alpha/Kconfig 2011-01-05 21:48:40.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/Kconfig 2010-11-23
02:09:40.000000000 +0100
@@ -677,6 +677,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,9 +168,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/entry.S
linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/kernel/entry.S
---- linux-2.6.37/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/kernel/entry.S 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/alpha/kernel/entry.S
linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/kernel/entry.S
+--- linux-2.6.37.4/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/kernel/entry.S 2010-11-23
02:09:40.000000000 +0100
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +203,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/ptrace.c
linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/kernel/ptrace.c
---- linux-2.6.37/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/kernel/ptrace.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/alpha/kernel/ptrace.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/kernel/ptrace.c
+--- linux-2.6.37.4/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/kernel/ptrace.c 2010-11-23
02:09:40.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -56,9 +214,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/systbls.S
linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/kernel/systbls.S
---- linux-2.6.37/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/kernel/systbls.S 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/alpha/kernel/systbls.S
linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/kernel/systbls.S
+--- linux-2.6.37.4/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/kernel/systbls.S 2010-11-23
02:09:40.000000000 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -68,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.37/arch/alpha/kernel/traps.c
linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/kernel/traps.c
---- linux-2.6.37/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/alpha/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/alpha/kernel/traps.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/kernel/traps.c
+--- linux-2.6.37.4/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/alpha/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -81,20 +239,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.37/arch/arm/include/asm/tlb.h
linux-2.6.37-vs2.3.0.37-rc3/arch/arm/include/asm/tlb.h
---- linux-2.6.37/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/arm/include/asm/tlb.h 2010-11-23
02:09:40.000000000 +0100
-@@ -27,6 +27,7 @@
-
- #else /* !CONFIG_MMU */
-
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
-
- /*
-diff -NurpP --minimal linux-2.6.37/arch/arm/Kconfig
linux-2.6.37-vs2.3.0.37-rc3/arch/arm/Kconfig
---- linux-2.6.37/arch/arm/Kconfig 2011-01-05 21:48:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/arm/Kconfig 2011-01-05
22:30:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/arm/Kconfig
linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/Kconfig
+--- linux-2.6.37.4/arch/arm/Kconfig 2011-01-05 21:48:40.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/Kconfig 2011-01-05
22:30:25.000000000 +0100
@@ -1854,6 +1854,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -104,9 +251,20 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/calls.S
linux-2.6.37-vs2.3.0.37-rc3/arch/arm/kernel/calls.S
---- linux-2.6.37/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/arm/kernel/calls.S 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/arm/include/asm/tlb.h
linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/include/asm/tlb.h
+--- linux-2.6.37.4/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/include/asm/tlb.h 2010-11-23
02:09:40.000000000 +0100
+@@ -27,6 +27,7 @@
+
+ #else /* !CONFIG_MMU */
+
++#include <linux/vs_memory.h>
+ #include <asm/pgalloc.h>
+
+ /*
+diff -NurpP --minimal linux-2.6.37.4/arch/arm/kernel/calls.S
linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/kernel/calls.S
+--- linux-2.6.37.4/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/kernel/calls.S 2010-11-23
02:09:40.000000000 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -116,9 +274,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/process.c
linux-2.6.37-vs2.3.0.37-rc3/arch/arm/kernel/process.c
---- linux-2.6.37/arch/arm/kernel/process.c 2011-01-05 21:48:42.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/arm/kernel/process.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/arm/kernel/process.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/kernel/process.c
+--- linux-2.6.37.4/arch/arm/kernel/process.c 2011-01-05 21:48:42.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/kernel/process.c 2010-11-23
02:09:40.000000000 +0100
@@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -129,9 +287,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/traps.c
linux-2.6.37-vs2.3.0.37-rc3/arch/arm/kernel/traps.c
---- linux-2.6.37/arch/arm/kernel/traps.c 2011-01-05 21:48:42.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/arm/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/arm/kernel/traps.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/kernel/traps.c
+--- linux-2.6.37.4/arch/arm/kernel/traps.c 2011-01-05 21:48:42.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/arm/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
@@ -241,8 +241,8 @@ static int __die(const char *str, int er
print_modules();
@@ -143,9 +301,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.37/arch/cris/Kconfig
linux-2.6.37-vs2.3.0.37-rc3/arch/cris/Kconfig
---- linux-2.6.37/arch/cris/Kconfig 2011-01-05 21:48:58.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/cris/Kconfig 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/cris/Kconfig
linux-2.6.37.4-vs2.3.0.37-rc5/arch/cris/Kconfig
+--- linux-2.6.37.4/arch/cris/Kconfig 2011-01-05 21:48:58.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/cris/Kconfig 2010-11-23
02:09:40.000000000 +0100
@@ -687,6 +687,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -155,9 +313,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/frv/kernel/kernel_thread.S
linux-2.6.37-vs2.3.0.37-rc3/arch/frv/kernel/kernel_thread.S
---- linux-2.6.37/arch/frv/kernel/kernel_thread.S 2008-12-25
00:26:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/frv/kernel/kernel_thread.S
2010-11-23 02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/frv/kernel/kernel_thread.S
linux-2.6.37.4-vs2.3.0.37-rc5/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.37.4/arch/frv/kernel/kernel_thread.S 2008-12-25
00:26:37.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/frv/kernel/kernel_thread.S
2010-11-23 02:09:40.000000000 +0100
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -167,9 +325,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.37/arch/h8300/Kconfig
linux-2.6.37-vs2.3.0.37-rc3/arch/h8300/Kconfig
---- linux-2.6.37/arch/h8300/Kconfig 2011-01-05 21:48:59.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/h8300/Kconfig 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/h8300/Kconfig
linux-2.6.37.4-vs2.3.0.37-rc5/arch/h8300/Kconfig
+--- linux-2.6.37.4/arch/h8300/Kconfig 2011-01-05 21:48:59.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/h8300/Kconfig 2010-11-23
02:09:40.000000000 +0100
@@ -219,6 +219,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -179,20 +337,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/ia64/include/asm/tlb.h
linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/include/asm/tlb.h
---- linux-2.6.37/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/include/asm/tlb.h 2010-11-23
02:09:40.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.37/arch/ia64/Kconfig
linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/Kconfig
---- linux-2.6.37/arch/ia64/Kconfig 2011-01-05 21:48:59.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/Kconfig 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/ia64/Kconfig
linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/Kconfig
+--- linux-2.6.37.4/arch/ia64/Kconfig 2011-01-05 21:48:59.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/Kconfig 2010-11-23
02:09:40.000000000 +0100
@@ -670,6 +670,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -202,9 +349,20 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/entry.S
linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/entry.S
---- linux-2.6.37/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/entry.S 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/ia64/include/asm/tlb.h
linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/include/asm/tlb.h
+--- linux-2.6.37.4/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/include/asm/tlb.h 2010-11-23
02:09:40.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.37.4/arch/ia64/kernel/entry.S
linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/entry.S
+--- linux-2.6.37.4/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/entry.S 2010-11-23
02:09:40.000000000 +0100
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -214,9 +372,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/perfmon.c
linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/perfmon.c
---- linux-2.6.37/arch/ia64/kernel/perfmon.c 2011-01-05 21:48:59.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/perfmon.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/ia64/kernel/perfmon.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/perfmon.c
+--- linux-2.6.37.4/arch/ia64/kernel/perfmon.c 2011-01-05 21:48:59.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/perfmon.c 2010-11-23
02:09:40.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
@@ -225,9 +383,9 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/process.c
linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/process.c
---- linux-2.6.37/arch/ia64/kernel/process.c 2010-10-21 13:06:52.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/process.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/ia64/kernel/process.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/process.c
+--- linux-2.6.37.4/arch/ia64/kernel/process.c 2010-10-21 13:06:52.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/process.c 2010-11-23
02:09:40.000000000 +0100
@@ -113,8 +113,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -239,9 +397,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.37/arch/ia64/kernel/ptrace.c
linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/ptrace.c
---- linux-2.6.37/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/ptrace.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/ia64/kernel/ptrace.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/ptrace.c
+--- linux-2.6.37.4/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/ptrace.c 2010-11-23
02:09:40.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -250,9 +408,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/traps.c
linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/traps.c
---- linux-2.6.37/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/ia64/kernel/traps.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/traps.c
+--- linux-2.6.37.4/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -277,9 +435,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.37/arch/ia64/mm/fault.c
linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/mm/fault.c
---- linux-2.6.37/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/ia64/mm/fault.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/ia64/mm/fault.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/mm/fault.c
+--- linux-2.6.37.4/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/ia64/mm/fault.c 2010-11-23
02:09:40.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -288,9 +446,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.37/arch/m32r/kernel/traps.c
linux-2.6.37-vs2.3.0.37-rc3/arch/m32r/kernel/traps.c
---- linux-2.6.37/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/m32r/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/m32r/kernel/traps.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/m32r/kernel/traps.c
+--- linux-2.6.37.4/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/m32r/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -303,9 +461,9 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.37/arch/m68k/Kconfig
linux-2.6.37-vs2.3.0.37-rc3/arch/m68k/Kconfig
---- linux-2.6.37/arch/m68k/Kconfig 2011-01-05 21:49:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/m68k/Kconfig 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/m68k/Kconfig
linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68k/Kconfig
+--- linux-2.6.37.4/arch/m68k/Kconfig 2011-01-05 21:49:00.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68k/Kconfig 2010-11-23
02:09:40.000000000 +0100
@@ -610,6 +610,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -315,9 +473,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/m68k/kernel/ptrace.c
linux-2.6.37-vs2.3.0.37-rc3/arch/m68k/kernel/ptrace.c
---- linux-2.6.37/arch/m68k/kernel/ptrace.c 2011-01-05 21:49:01.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/m68k/kernel/ptrace.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/m68k/kernel/ptrace.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68k/kernel/ptrace.c
+--- linux-2.6.37.4/arch/m68k/kernel/ptrace.c 2011-01-05 21:49:01.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68k/kernel/ptrace.c 2010-11-23
02:09:40.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -335,9 +493,9 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.37/arch/m68k/kernel/traps.c
linux-2.6.37-vs2.3.0.37-rc3/arch/m68k/kernel/traps.c
---- linux-2.6.37/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000
+0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/m68k/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/m68k/kernel/traps.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68k/kernel/traps.c
+--- linux-2.6.37.4/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000
+0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68k/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
@@ -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 +507,9 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.37/arch/m68knommu/Kconfig
linux-2.6.37-vs2.3.0.37-rc3/arch/m68knommu/Kconfig
---- linux-2.6.37/arch/m68knommu/Kconfig 2011-01-05 21:49:01.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/m68knommu/Kconfig 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/m68knommu/Kconfig
linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68knommu/Kconfig
+--- linux-2.6.37.4/arch/m68knommu/Kconfig 2011-01-05 21:49:01.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68knommu/Kconfig 2010-11-23
02:09:40.000000000 +0100
@@ -732,6 +732,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -361,9 +519,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/m68knommu/kernel/traps.c
linux-2.6.37-vs2.3.0.37-rc3/arch/m68knommu/kernel/traps.c
---- linux-2.6.37/arch/m68knommu/kernel/traps.c 2011-01-05 21:49:01.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/m68knommu/kernel/traps.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/m68knommu/kernel/traps.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68knommu/kernel/traps.c
+--- linux-2.6.37.4/arch/m68knommu/kernel/traps.c 2011-01-05
21:49:01.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/m68knommu/kernel/traps.c
2010-11-23 02:09:40.000000000 +0100
@@ -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 +534,9 @@
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.37/arch/mips/Kconfig
linux-2.6.37-vs2.3.0.37-rc3/arch/mips/Kconfig
---- linux-2.6.37/arch/mips/Kconfig 2011-01-05 21:49:03.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/mips/Kconfig 2011-01-05
22:30:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/mips/Kconfig
linux-2.6.37.4-vs2.3.0.37-rc5/arch/mips/Kconfig
+--- linux-2.6.37.4/arch/mips/Kconfig 2011-01-05 21:49:03.000000000 +0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/mips/Kconfig 2011-01-05
22:30:26.000000000 +0100
@@ -2396,6 +2396,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -388,9 +546,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/ptrace.c
linux-2.6.37-vs2.3.0.37-rc3/arch/mips/kernel/ptrace.c
---- linux-2.6.37/arch/mips/kernel/ptrace.c 2011-01-05 21:49:06.000000000
+0100
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/mips/kernel/ptrace.c 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/mips/kernel/ptrace.c
linux-2.6.37.4-vs2.3.0.37-rc5/arch/mips/kernel/ptrace.c
+--- linux-2.6.37.4/arch/mips/kernel/ptrace.c 2011-01-05 21:49:06.000000000
+0100
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/mips/kernel/ptrace.c 2010-11-23
02:09:40.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -409,9 +567,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.37/arch/mips/kernel/scall32-o32.S
linux-2.6.37-vs2.3.0.37-rc3/arch/mips/kernel/scall32-o32.S
---- linux-2.6.37/arch/mips/kernel/scall32-o32.S 2010-10-21
13:06:54.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc3/arch/mips/kernel/scall32-o32.S 2010-11-23
02:09:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.37.4/arch/mips/kernel/scall32-o32.S
linux-2.6.37.4-vs2.3.0.37-rc5/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.37.4/arch/mips/kernel/scall32-o32.S 2010-10-21
13:06:54.000000000 +0200
++++ linux-2.6.37.4-vs2.3.0.37-rc5/arch/mips/kernel/scall32-o32.S
2010-11-23 02:09:40.000000000 +0100
@@ -524,7 +524,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -421,9 +579,9 @@
sys sys_waitid 5
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.61.2.3&r2=1.61.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.57&r2=1.57.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.888.2.5&r2=1.888.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
