The following commit has been merged in the master branch: commit 21128799b3cbbc40598f3732e2fb7fe98f6a9e11 Author: Marco Nelles <marco.nel...@credativ.de> Date: Mon Jun 4 16:33:36 2012 +0200
Removed page-size-undef-fixes.patch diff --git a/debian/patches/page-size-undef-fixes.patch b/debian/patches/page-size-undef-fixes.patch deleted file mode 100644 index f77f48f..0000000 --- a/debian/patches/page-size-undef-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ -## page-size-undef-fixes.dpatch by <dmlb2...@gmail.com> -## DP: set PAGE_SHIFT if this macro is undefined - -Index: lustre/lnet/include/libcfs/user-prim.h -=================================================================== ---- lustre.orig/lnet/include/libcfs/user-prim.h 2010-12-07 16:57:17.801545003 +0100 -+++ lustre/lnet/include/libcfs/user-prim.h 2010-12-07 16:58:38.857545002 +0100 -@@ -140,6 +140,12 @@ - - #else - -+#ifndef PAGE_SHIFT -+#define PAGE_SHIFT 12 /* 4KB page size if not defined */ -+#endif -+#ifndef PAGE_SIZE -+#define PAGE_SIZE ((__u64)1 << PAGE_SHIFT) -+#endif - #define CFS_PAGE_SIZE PAGE_SIZE - #define CFS_PAGE_SHIFT PAGE_SHIFT - #define CFS_PAGE_MASK (~((__u64)CFS_PAGE_SIZE-1)) diff --git a/debian/patches/series b/debian/patches/series index 863131c..5b5de74 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -#page-size-undef-fixes.patch #posix_acl.patch #ldiskfs-detect-2.6.20-2.6.22.patch #no_default_debugging.patch -- Lustre Debian Packaging _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-lustre-svn-commit