SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - rc3.1

[baggins]

Author: baggins                      Date: Mon Feb 13 19:04:05 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- rc3.1

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.9 -> 1.1.2.10) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.9 SOURCES/linux-2.6-vs2.1.patch:1.1.2.10
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.9	Mon Feb 13 19:16:49 2006
+++ SOURCES/linux-2.6-vs2.1.patch	Mon Feb 13 20:03:59 2006
@@ -1954,6 +1954,17 @@
  	} 
  
  	for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
+diff -NurpP --minimal -x '*.orig' linux-2.6.15.4-vs2.1.1-rc3/arch/x86_64/ia32/ptrace32.c linux-2.6.15.4-vs2.1.1-rc3.1/arch/x86_64/ia32/ptrace32.c
+--- linux-2.6.15.4-vs2.1.1-rc3/arch/x86_64/ia32/ptrace32.c	2006-01-02 22:21:10.000000000 -0500
++++ linux-2.6.15.4-vs2.1.1-rc3.1/arch/x86_64/ia32/ptrace32.c	2006-02-13 08:52:12.000000000 -0500
+@@ -18,6 +18,7 @@
+ #include <linux/unistd.h>
+ #include <linux/mm.h>
+ #include <linux/ptrace.h>
++#include <linux/vs_pid.h>
+ #include <asm/ptrace.h>
+ #include <asm/compat.h>
+ #include <asm/uaccess.h>
 diff -NurpP --minimal linux-2.6.15.4/arch/x86_64/ia32/ia32entry.S linux-2.6.15.4-vs2.1.1-rc3/arch/x86_64/ia32/ia32entry.S
 --- linux-2.6.15.4/arch/x86_64/ia32/ia32entry.S	2005-10-28 20:49:18 +0200
 +++ linux-2.6.15.4-vs2.1.1-rc3/arch/x86_64/ia32/ia32entry.S	2006-01-04 21:59:59 +0100
@@ -1969,6 +1980,14 @@
 diff -NurpP --minimal linux-2.6.15.4/arch/x86_64/ia32/sys_ia32.c linux-2.6.15.4-vs2.1.1-rc3/arch/x86_64/ia32/sys_ia32.c
 --- linux-2.6.15.4/arch/x86_64/ia32/sys_ia32.c	2005-10-28 20:49:18 +0200
 +++ linux-2.6.15.4-vs2.1.1-rc3/arch/x86_64/ia32/sys_ia32.c	2006-01-04 21:59:59 +0100
+@@ -62,6 +62,7 @@
+ #include <linux/highuid.h>
+ #include <linux/vmalloc.h>
+ #include <linux/fsnotify.h>
++#include <linux/vs_cvirt.h>
+ #include <asm/mman.h>
+ #include <asm/types.h>
+ #include <asm/uaccess.h>
 @@ -860,6 +860,7 @@ asmlinkage long sys32_mmap2(unsigned lon
  asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
  {
@@ -2008,6 +2027,14 @@
 diff -NurpP --minimal linux-2.6.15.4/arch/x86_64/ia32/syscall32.c linux-2.6.15.4-vs2.1.1-rc3/arch/x86_64/ia32/syscall32.c
 --- linux-2.6.15.4/arch/x86_64/ia32/syscall32.c	2005-10-28 20:49:18 +0200
 +++ linux-2.6.15.4-vs2.1.1-rc3/arch/x86_64/ia32/syscall32.c	2006-02-13 05:01:24 +0100
+@@ -10,6 +10,7 @@
+ #include <linux/init.h>
+ #include <linux/stringify.h>
+ #include <linux/security.h>
++#include <linux/vs_memory.h>
+ #include <asm/proto.h>
+ #include <asm/tlbflush.h>
+ #include <asm/ia32_unistd.h>
 @@ -70,7 +70,7 @@ int syscall32_setup_pages(struct linux_b
  		kmem_cache_free(vm_area_cachep, vma);
  		return ret;
@@ -16021,12 +16048,12 @@
 +typedef atomic64_t rlim_atomic_t;
 +typedef unsigned long rlim_t;
 +
-+#define __rlim_get(l,r)		atomic64_read(&__rlim_val(l,r))
-+#define __rlim_set(l,r,v)	atomic64_set(&__rlim_val(l,r), v)
-+#define __rlim_inc(l,r)		atomic64_inc(&__rlim_val(l,r))
-+#define __rlim_dec(l,r)		atomic64_dec(&__rlim_val(l,r))
-+#define __rlim_add(l,r,v)	atomic64_add(v, &__rlim_val(l,r))
-+#define __rlim_sub(l,r,v)	atomic64_sub(v, &__rlim_val(l,r))
++#define __rlim_get(l,r)		atomic64_read(&__rlim_rcur(l,r))
++#define __rlim_set(l,r,v)	atomic64_set(&__rlim_rcur(l,r), v)
++#define __rlim_inc(l,r)		atomic64_inc(&__rlim_rcur(l,r))
++#define __rlim_dec(l,r)		atomic64_dec(&__rlim_rcur(l,r))
++#define __rlim_add(l,r,v)	atomic64_add(v, &__rlim_rcur(l,r))
++#define __rlim_sub(l,r,v)	atomic64_sub(v, &__rlim_rcur(l,r))
 +
 +#else /* !ATOMIC64_INIT */
 +typedef atomic_t rlim_atomic_t;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.1.patch?r1=1.1.2.9&r2=1.1.2.10&f=u