These update the patch files so that they apply cleanly in the

PNNL world.

diff --git a/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch b/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
index ae5906d..ee66c5a 100644 (file)
--- a/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
+++ b/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
@@ -4,11 +4,11 @@
  mm/slab.c            |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 61 insertions(+)
 
---- linux-2.4.20/arch/ia64/mm/init.c~kmem_cache_validate_hp    2003-04-08 23:34:12.000000000 -0600
-+++ linux-2.4.20-braam/arch/ia64/mm/init.c     2003-04-08 23:34:12.000000000 -0600
-@@ -45,6 +45,12 @@ static struct page *vmem_map;
+--- linux/arch/ia64/mm/init.c~kmem_cache_validate_hp   Wed Apr  9 11:09:46 2003
++++ linux-mmonroe/arch/ia64/mm/init.c  Wed Apr  9 11:12:23 2003
+@@ -45,6 +45,12 @@ unsigned long vmalloc_end = VMALLOC_END_
+ static struct page *vmem_map;
  static unsigned long num_dma_physpages;
- #endif
  
 +struct page *check_get_page(unsigned long kaddr)
 +{
@@ -19,8 +19,8 @@
  int
  do_check_pgt_cache (int low, int high)
  {
---- linux-2.4.20/include/linux/slab.h~kmem_cache_validate_hp   2003-04-08 23:34:12.000000000 -0600
-+++ linux-2.4.20-braam/include/linux/slab.h    2003-04-08 23:34:12.000000000 -0600
+--- linux/include/linux/slab.h~kmem_cache_validate_hp  Wed Apr  9 11:08:48 2003
++++ linux-mmonroe/include/linux/slab.h Wed Apr  9 11:12:23 2003
 @@ -56,6 +56,7 @@ extern kmem_cache_t *kmem_cache_create(c
  extern int kmem_cache_destroy(kmem_cache_t *);
  extern int kmem_cache_shrink(kmem_cache_t *);
@@ -29,9 +29,9 @@
  extern void kmem_cache_free(kmem_cache_t *, void *);
  extern unsigned int kmem_cache_size(kmem_cache_t *);
  
---- linux-2.4.20/kernel/ksyms.c~kmem_cache_validate_hp 2003-04-08 23:34:12.000000000 -0600
-+++ linux-2.4.20-braam/kernel/ksyms.c  2003-04-08 23:34:12.000000000 -0600
-@@ -103,6 +103,7 @@ EXPORT_SYMBOL(kmem_find_general_cachep);
+--- linux/kernel/ksyms.c~kmem_cache_validate_hp        Wed Apr  9 11:12:20 2003
++++ linux-mmonroe/kernel/ksyms.c       Wed Apr  9 11:12:23 2003
+@@ -119,6 +119,7 @@ EXPORT_SYMBOL(kmem_find_general_cachep);
  EXPORT_SYMBOL(kmem_cache_create);
  EXPORT_SYMBOL(kmem_cache_destroy);
  EXPORT_SYMBOL(kmem_cache_shrink);
@@ -39,8 +39,8 @@
  EXPORT_SYMBOL(kmem_cache_alloc);
  EXPORT_SYMBOL(kmem_cache_free);
  EXPORT_SYMBOL(kmem_cache_size);
---- linux-2.4.20/mm/slab.c~kmem_cache_validate_hp      2003-04-08 23:34:12.000000000 -0600
-+++ linux-2.4.20-braam/mm/slab.c       2003-04-08 23:34:12.000000000 -0600
+--- linux/mm/slab.c~kmem_cache_validate_hp     Wed Apr  9 11:08:47 2003
++++ linux-mmonroe/mm/slab.c    Wed Apr  9 11:12:23 2003
 @@ -1205,6 +1205,59 @@ failed:
   * Called with the cache-lock held.
   */