[Pkg-uml-commit] r211 - trunk/src/linux-patch-skas/debian/patches

[Mattia Dongili]

Author: malattia
Date: 2006-09-23 19:12:44 +0000 (Sat, 23 Sep 2006)
New Revision: 211

Added:
   trunk/src/linux-patch-skas/debian/patches/skas-2.6.18-rc4-v9-pre9-fremap.patch-fix-failing-hunk.diff
Modified:
   trunk/src/linux-patch-skas/debian/patches/series
Log:
skas-2.6.18 fails to apply, this _should_ fix it

Modified: trunk/src/linux-patch-skas/debian/patches/series
===================================================================
--- trunk/src/linux-patch-skas/debian/patches/series	2006-09-23 18:35:39 UTC (rev 210)
+++ trunk/src/linux-patch-skas/debian/patches/series	2006-09-23 19:12:44 UTC (rev 211)
@@ -7,3 +7,4 @@
 skas-2.6.16-v9-pre9.patch.diff
 skas-2.6.17-rc5-v9-pre9.patch.diff
 skas-2.6.18-rc4-v9-pre9-fremap.patch.diff
+skas-2.6.18-rc4-v9-pre9-fremap.patch-fix-failing-hunk.diff

Added: trunk/src/linux-patch-skas/debian/patches/skas-2.6.18-rc4-v9-pre9-fremap.patch-fix-failing-hunk.diff
===================================================================
--- trunk/src/linux-patch-skas/debian/patches/skas-2.6.18-rc4-v9-pre9-fremap.patch-fix-failing-hunk.diff	                        (rev 0)
+++ trunk/src/linux-patch-skas/debian/patches/skas-2.6.18-rc4-v9-pre9-fremap.patch-fix-failing-hunk.diff	2006-09-23 19:12:44 UTC (rev 211)
@@ -0,0 +1,18 @@
+--- ./skas-2.6.18-rc4-v9-pre9-fremap.patch.orig	2006-09-23 21:04:38.000000000 +0200
++++ ./skas-2.6.18-rc4-v9-pre9-fremap.patch	2006-09-23 21:06:10.000000000 +0200
+@@ -1448,13 +1448,13 @@
+   */
+ -asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
+ +long __remap_file_pages(struct mm_struct *mm, unsigned long start, unsigned long size,
+- 	unsigned long prot, unsigned long pgoff, unsigned long flags)
++ 	unsigned long __prot, unsigned long pgoff, unsigned long flags)
+  {
+ -	struct mm_struct *mm = current->mm;
+  	struct address_space *mapping;
+  	unsigned long end = start + size;
+  	struct vm_area_struct *vma;
+-@@ -268,3 +267,8 @@ out:
++@@ -228,3 +227,8 @@ asmlinkage long sys_remap_file_pages(uns
+  	return err;
+  }
+