r3307 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches
Dann Frazier
dannf@costa.debian.org
Sat, 11 Jun 2005 21:58:43 +0000
Author: dannf
Date: 2005-06-11 21:58:43 +0000 (Sat, 11 Jun 2005)
New Revision: 3307
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/patch-2.6.11.11.patch
Log:
fix a conflict between arch-ppc64-hugepage-aio-panic.patch and patch-2.6.11.11.patch
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/patch-2.6.11.11.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/patch-2.6.11.11.patch 2005-06-11 20:01:36 UTC (rev 3306)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/patch-2.6.11.11.patch 2005-06-11 21:58:43 UTC (rev 3307)
@@ -555,7 +555,7 @@
+ * reserved hugepage range. For some archs like IA-64,
+ * there is a separate region for hugepages.
+ */
-+ ret = is_hugepage_only_range(addr, len);
++ ret = is_hugepage_only_range(current->mm, addr, len);
+ }
+ if (ret)
+ return -EINVAL;