- landing of b_hd_cleanup_merge to HEAD.

[fs/lustre-release.git] / lustre / kernel_patches / patches / gfp_memalloc-2.4.22.patch

diff --git a/lustre/kernel_patches/patches/gfp_memalloc-2.4.22.patch b/lustre/kernel_patches/patches/gfp_memalloc-2.4.22.patch
deleted file mode 100644 (file)
index 92e79c8..0000000
--- a/lustre/kernel_patches/patches/gfp_memalloc-2.4.22.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: linux-2.4.20/include/linux/mm.h
-===================================================================
---- linux-2.4.20.orig/include/linux/mm.h       2003-12-01 17:07:14.000000000 +0300
-+++ linux-2.4.20/include/linux/mm.h    2003-12-02 23:17:06.000000000 +0300
-@@ -614,6 +614,7 @@
- #define __GFP_IO      0x40    /* Can start low memory physical IO? */
- #define __GFP_HIGHIO  0x80    /* Can start high mem physical IO? */
- #define __GFP_FS      0x100   /* Can call down to low-level FS? */
-+#define __GFP_MEMALLOC        0x200   /* like PF_MEMALLOC: see __alloc_pages */
- 
- #define GFP_NOHIGHIO  (__GFP_HIGH | __GFP_WAIT | __GFP_IO)
- #define GFP_NOIO      (__GFP_HIGH | __GFP_WAIT)
-@@ -624,6 +625,7 @@
- #define GFP_KERNEL    (__GFP_HIGH | __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS)
- #define GFP_NFS               (__GFP_HIGH | __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS)
- #define GFP_KSWAPD    (             __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS)
-+#define GFP_MEMALLOC  __GFP_MEMALLOC
- 
- /* Flag - indicates that the buffer will be suitable for DMA.  Ignored on some
-    platforms, used as appropriate on others */
-Index: linux-2.4.20/mm/page_alloc.c
-===================================================================
---- linux-2.4.20.orig/mm/page_alloc.c  2003-12-01 17:02:43.000000000 +0300
-+++ linux-2.4.20/mm/page_alloc.c       2003-12-02 23:21:56.000000000 +0300
-@@ -377,7 +377,8 @@
-       /* here we're in the low on memory slow path */
- 
- rebalance:
--      if (current->flags & (PF_MEMALLOC | PF_MEMDIE)) {
-+      if (current->flags & (PF_MEMALLOC | PF_MEMDIE) || 
-+                      (gfp_mask & __GFP_MEMALLOC)) {
-               zone = zonelist->zones;
-               for (;;) {
-                       zone_t *z = *(zone++);
-Index: linux-2.4.20/include/linux/slab.h
-===================================================================
---- linux-2.4.20.orig/include/linux/slab.h     2003-12-01 17:07:14.000000000 +0300
-+++ linux-2.4.20/include/linux/slab.h  2003-12-02 23:17:06.000000000 +0300
-@@ -23,6 +23,7 @@
- #define       SLAB_KERNEL             GFP_KERNEL
- #define       SLAB_NFS                GFP_NFS
- #define       SLAB_DMA                GFP_DMA
-+#define       SLAB_MEMALLOC           GFP_MEMALLOC
- 
- #define SLAB_LEVEL_MASK               (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_HIGHIO|__GFP_FS)
- #define       SLAB_NO_GROW            0x00001000UL    /* don't grow a cache */
-Index: linux-2.4.20/mm/slab.c
-===================================================================
---- linux-2.4.20.orig/mm/slab.c        2003-12-01 17:02:34.000000000 +0300
-+++ linux-2.4.20/mm/slab.c     2003-12-02 23:17:06.000000000 +0300
-@@ -1113,7 +1113,7 @@
-       /* Be lazy and only check for valid flags here,
-        * keeping it out of the critical path in kmem_cache_alloc().
-        */
--      if (flags & ~(SLAB_DMA|SLAB_LEVEL_MASK|SLAB_NO_GROW))
-+      if (flags & ~(SLAB_DMA|SLAB_LEVEL_MASK|SLAB_NO_GROW|SLAB_MEMALLOC))
-               BUG();
-       if (flags & SLAB_NO_GROW)
-               return 0;