[kernel] r14832 - in dists/trunk/linux-2.6/debian/patches: features/all/vserver series

[Dann Frazier]

Author: dannf
Date: Wed Dec 30 16:34:02 2009
New Revision: 14832

Log:
suggested changes from upstream

Added:
   dists/trunk/linux-2.6/debian/patches/features/all/vserver/ia64-buildfix.patch
   dists/trunk/linux-2.6/debian/patches/features/all/vserver/s390-buildfix.patch
Deleted:
   dists/trunk/linux-2.6/debian/patches/features/all/vserver/ia64-s390-buildfixes.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/4-extra

Added: dists/trunk/linux-2.6/debian/patches/features/all/vserver/ia64-buildfix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/vserver/ia64-buildfix.patch	Wed Dec 30 16:34:02 2009	(r14832)
@@ -0,0 +1,11 @@
+diff -urpN a/arch/ia64/include/asm/tlb.h b/arch/ia64/include/asm/tlb.h
+--- a/arch/ia64/include/asm/tlb.h	2009-12-02 20:51:21.000000000 -0700
++++ b/arch/ia64/include/asm/tlb.h	2009-12-30 01:46:05.000000000 -0700
+@@ -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>

Added: dists/trunk/linux-2.6/debian/patches/features/all/vserver/s390-buildfix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/vserver/s390-buildfix.patch	Wed Dec 30 16:34:02 2009	(r14832)
@@ -0,0 +1,23 @@
+diff -urpN a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h
+--- a/arch/s390/include/asm/tlb.h	2009-12-02 20:51:21.000000000 -0700
++++ b/arch/s390/include/asm/tlb.h	2009-12-30 01:46:05.000000000 -0700
+@@ -23,6 +23,7 @@
+ 
+ #include <linux/mm.h>
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+ #include <asm/processor.h>
+ #include <asm/pgalloc.h>
+ #include <asm/smp.h>
+diff -urpN a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
+--- a/arch/s390/include/asm/unistd.h	2009-12-02 20:51:21.000000000 -0700
++++ b/arch/s390/include/asm/unistd.h	2009-12-30 01:42:52.000000000 -0700
+@@ -202,7 +202,7 @@
+ #define __NR_clock_gettime	(__NR_timer_create+6)
+ #define __NR_clock_getres	(__NR_timer_create+7)
+ #define __NR_clock_nanosleep	(__NR_timer_create+8)
+-/* Number 263 is reserved for vserver */
++#define __NR_vserver		263
+ #define __NR_statfs64		265
+ #define __NR_fstatfs64		266
+ #define __NR_remap_file_pages	267

Modified: dists/trunk/linux-2.6/debian/patches/series/4-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/4-extra	Tue Dec 29 20:10:32 2009	(r14831)
+++ dists/trunk/linux-2.6/debian/patches/series/4-extra	Wed Dec 30 16:34:02 2009	(r14832)
@@ -1 +1,2 @@
-+ features/all/vserver/ia64-s390-buildfixes.patch featureset=vserver
++ features/all/vserver/s390-buildfix.patch featureset=vserver
++ features/all/vserver/ia64-buildfix.patch featureset=vserver