From: alex <alex>
Date: Mon, 24 Nov 2003 22:13:36 +0000 (+0000)
Subject: - port onto virgin 2.4.22
X-Git-Tag: v1_7_0_51~2^7~192
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=22aa05ad5c70e0bd4813875e7ff5e0ef3f863c98;p=fs%2Flustre-release.git

- port onto virgin 2.4.22
---

diff --git a/lustre/kernel_patches/patches/kernel_text_address-2.4.22-vanilla.patch b/lustre/kernel_patches/patches/kernel_text_address-2.4.22-vanilla.patch
new file mode 100644
index 0000000..6e9cd93
--- /dev/null
+++ b/lustre/kernel_patches/patches/kernel_text_address-2.4.22-vanilla.patch
@@ -0,0 +1,59 @@
+Index: linux-2.4.22-vanilla/arch/i386/kernel/traps.c
+===================================================================
+--- linux-2.4.22-vanilla.orig/arch/i386/kernel/traps.c	2003-05-16 05:28:59.000000000 +0400
++++ linux-2.4.22-vanilla/arch/i386/kernel/traps.c	2003-11-14 00:35:36.000000000 +0300
+@@ -1004,3 +1004,40 @@
+ 	cobalt_init();
+ #endif
+ }
++#ifdef CONFIG_MODULES
++extern struct module *module_list;
++extern struct module kernel_module;
++#endif
++
++int is_kernel_text_address(unsigned long addr)
++{
++       int retval = 0;
++#ifdef CONFIG_MODULES
++       struct module *mod;
++#endif
++       if (addr >= (unsigned long) &_stext &&
++           addr <= (unsigned long) &_etext);
++               return 1;
++
++#ifdef CONFIG_MODULES
++       for (mod = module_list; mod != &kernel_module; mod = mod->next) {
++               /* mod_bound tests for addr being inside the vmalloc'ed
++                * module area. Of course it'd be better to test only
++                * for the .text subset... */
++               if (mod_bound(addr, 0, mod)) {
++                       retval = 1;
++                       break;
++               }
++       }
++#endif
++
++       return retval;
++}
++
++int lookup_symbol(unsigned long address, char *buf, int buflen)
++{
++       return -ENOSYS;
++}
++
++EXPORT_SYMBOL_GPL(is_kernel_text_address);
++EXPORT_SYMBOL_GPL(lookup_symbol);
+Index: linux-2.4.22-vanilla/arch/i386/kernel/Makefile
+===================================================================
+--- linux-2.4.22-vanilla.orig/arch/i386/kernel/Makefile	2003-11-03 23:22:06.000000000 +0300
++++ linux-2.4.22-vanilla/arch/i386/kernel/Makefile	2003-11-14 00:30:28.000000000 +0300
+@@ -14,7 +14,8 @@
+ 
+ O_TARGET := kernel.o
+ 
+-export-objs     := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o setup.o
++export-objs     := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o \
++			setup.o traps.o
+ 
+ obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
+ 		ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \