[kernel] r6201 - in dists/trunk/linux-2.6/debian/patches: . series
Bastian Blank
waldi at costa.debian.org
Fri Mar 17 22:13:48 UTC 2006
Author: waldi
Date: Fri Mar 17 22:13:45 2006
New Revision: 6201
Added:
dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc13.patch
- copied, changed from r6180, dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc12.patch
Removed:
dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc12.patch
Modified:
dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra
Log:
* debian/patches/series/0experimental.1-extra: Update to new vserver patch.
* debian/patches/vserver-vs2.0.2-rc13.patch: Add.
* debian/patches/vserver-vs2.0.2-rc12.patch: Remove.
Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra (original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra Fri Mar 17 22:13:45 2006
@@ -1,7 +1,7 @@
+ maclist.patch arm armeb
+ arm-nslu2-maclist.patch arm armeb
+ vserver-version.patch *_vserver
-+ vserver-vs2.0.2-rc12.patch *_vserver *_xen-vserver
++ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
+ vserver-xen-clash.patch *_xen-vserver
+ xen-tree-merge-21966.patch *_xen *_xen-vserver
+ mips-tulip.patch mipsel
Copied: dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc13.patch (from r6180, dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc12.patch)
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc12.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/vserver-vs2.0.2-rc13.patch Fri Mar 17 22:13:45 2006
@@ -1024,7 +1024,7 @@
show_registers(regs);
/* Show stack backtrace if pt_regs is from kernel mode */
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
-index 37dfe33..335754b 100644
+index 37dfe33..a10dc7a 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -33,6 +33,7 @@
@@ -1045,7 +1045,7 @@
+ }
+
ret = do_ptrace(child, request, addr, data);
-+out_task:
++out_tsk:
put_task_struct(child);
out:
unlock_kernel();
@@ -17099,7 +17099,7 @@
+
diff --git a/kernel/vserver/limit.c b/kernel/vserver/limit.c
new file mode 100644
-index 0000000..435ef51
+index 0000000..5a0ad11
--- /dev/null
+++ b/kernel/vserver/limit.c
@@ -0,0 +1,177 @@
@@ -17184,7 +17184,7 @@
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+ if (!is_valid_rlimit(vc_data.id))
-+ return -ENOTSUPP;
++ return -EINVAL;
+
+ vxi = lookup_vx_info(id);
+ if (!vxi)
@@ -17210,7 +17210,7 @@
+ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
+ return -EFAULT;
+ if (!is_valid_rlimit(vc_data.id))
-+ return -ENOTSUPP;
++ return -EINVAL;
+
+ vxi = lookup_vx_info(id);
+ if (!vxi)
More information about the Kernel-svn-changes
mailing list