From 3a2c60eae6f9e3d6de29e7e21fca9f367944c4b3 Mon Sep 17 00:00:00 2001
From: wangdi <wangdi>
Date: Sat, 31 May 2003 09:53:36 +0000
Subject: [PATCH] add check_get_page in i386 arch

---
 .../patches/kmem_cache_validate_2.4.20.patch       | 43 ++++++++++++++--------
 .../pc/kmem_cache_validate_2.4.20.pc               |  1 +
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/lustre/kernel_patches/patches/kmem_cache_validate_2.4.20.patch b/lustre/kernel_patches/patches/kmem_cache_validate_2.4.20.patch
index ee66c5a..e802312 100644
--- a/lustre/kernel_patches/patches/kmem_cache_validate_2.4.20.patch
+++ b/lustre/kernel_patches/patches/kmem_cache_validate_2.4.20.patch
@@ -1,14 +1,10 @@
- arch/ia64/mm/init.c  |    6 +++++
- include/linux/slab.h |    1 
- kernel/ksyms.c       |    1 
- mm/slab.c            |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 61 insertions(+)
+ 0 files changed
 
---- 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;
+--- linux-2.4.20-8/arch/ia64/mm/init.c~kmem_cache_validate_2.4.20	2002-11-29 07:53:09.000000000 +0800
++++ linux-2.4.20-8-root/arch/ia64/mm/init.c	2003-06-01 01:44:13.000000000 +0800
+@@ -45,6 +45,12 @@ static struct page *vmem_map;
  static unsigned long num_dma_physpages;
+ #endif
  
 +struct page *check_get_page(unsigned long kaddr)
 +{
@@ -19,8 +15,8 @@
  int
  do_check_pgt_cache (int low, int high)
  {
---- 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
+--- linux-2.4.20-8/include/linux/slab.h~kmem_cache_validate_2.4.20	2002-11-29 07:53:15.000000000 +0800
++++ linux-2.4.20-8-root/include/linux/slab.h	2003-06-01 01:44:13.000000000 +0800
 @@ -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 +25,9 @@
  extern void kmem_cache_free(kmem_cache_t *, void *);
  extern unsigned int kmem_cache_size(kmem_cache_t *);
  
---- 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);
+--- linux-2.4.20-8/kernel/ksyms.c~kmem_cache_validate_2.4.20	2003-06-01 01:44:11.000000000 +0800
++++ linux-2.4.20-8-root/kernel/ksyms.c	2003-06-01 01:44:13.000000000 +0800
+@@ -103,6 +103,7 @@ EXPORT_SYMBOL(kmem_find_general_cachep);
  EXPORT_SYMBOL(kmem_cache_create);
  EXPORT_SYMBOL(kmem_cache_destroy);
  EXPORT_SYMBOL(kmem_cache_shrink);
@@ -39,8 +35,8 @@
  EXPORT_SYMBOL(kmem_cache_alloc);
  EXPORT_SYMBOL(kmem_cache_free);
  EXPORT_SYMBOL(kmem_cache_size);
---- 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
+--- linux-2.4.20-8/mm/slab.c~kmem_cache_validate_2.4.20	2003-06-01 01:44:08.000000000 +0800
++++ linux-2.4.20-8-root/mm/slab.c	2003-06-01 01:44:13.000000000 +0800
 @@ -1205,6 +1205,59 @@ failed:
   * Called with the cache-lock held.
   */
@@ -101,5 +97,20 @@
  #if DEBUG
  static int kmem_extra_free_checks (kmem_cache_t * cachep,
  			slab_t *slabp, void * objp)
+--- linux-2.4.20-8/arch/i386/mm/init.c~kmem_cache_validate_2.4.20	2002-11-29 07:53:09.000000000 +0800
++++ linux-2.4.20-8-root/arch/i386/mm/init.c	2003-06-01 01:46:43.000000000 +0800
+@@ -43,6 +43,12 @@ unsigned long highstart_pfn, highend_pfn
+ static unsigned long totalram_pages;
+ static unsigned long totalhigh_pages;
+ 
++struct page *check_get_page(unsigned long kaddr)
++{
++#warning FIXME: Lustre team, is this solid?
++	        return virt_to_page(kaddr);
++}
++
+ int do_check_pgt_cache(int low, int high)
+ {
+ 	int freed = 0;
 
 _
diff --git a/lustre/kernel_patches/pc/kmem_cache_validate_2.4.20.pc b/lustre/kernel_patches/pc/kmem_cache_validate_2.4.20.pc
index 42028bc..bdba884 100644
--- a/lustre/kernel_patches/pc/kmem_cache_validate_2.4.20.pc
+++ b/lustre/kernel_patches/pc/kmem_cache_validate_2.4.20.pc
@@ -2,3 +2,4 @@ arch/ia64/mm/init.c
 include/linux/slab.h
 kernel/ksyms.c
 mm/slab.c
+arch/i386/mm/init.c
-- 
1.8.3.1