Merge bk://linux.bkbits.net/linux-2.5

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin

6 files changed, 16 insertions, 13 deletions

diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 90890f4e9e6d..e8fec2776624 100644
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -63,7 +63,7 @@ enum chipset_type {
 	VIA_APOLLO_KT400_3,
 	VIA_APOLLO_PRO_266,
 	VIA_VT8605,
-	VIA_P4X400,
+	VIA_P4X,
 	SIS_GENERIC,
 	AMD_GENERIC,
 	AMD_IRONGATE,
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index e6b95f3bb173..7eedbb751856 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -84,6 +84,7 @@ extern unsigned long long memparse(char *ptr, char **retptr);
 extern void dev_probe_lock(void);
 extern void dev_probe_unlock(void);
 
+extern int kernel_text_address(unsigned long addr);
 extern int session_of_pgrp(int pgrp);
 
 asmlinkage int printk(const char * fmt, ...)
diff --git a/include/linux/module.h b/include/linux/module.h
index 24fa571c4cc9..54214da9a651 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -234,6 +234,9 @@ static inline int module_is_live(struct module *mod)
 	return mod->state != MODULE_STATE_GOING;
 }
 
+/* Is this address in a module? */
+int module_text_address(unsigned long addr);
+
 #ifdef CONFIG_MODULE_UNLOAD
 
 void __symbol_put(const char *symbol);
@@ -324,6 +327,12 @@ search_module_extables(unsigned long addr)
 	return NULL;
 }
 
+/* Is this address in a module? */
+static int module_text_address(unsigned long addr)
+{
+	return 0;
+}
+
 /* Get/put a kernel symbol (calls should be symmetric) */
 #define symbol_get(x) (&(x))
 #define symbol_put(x) do { } while(0)
@@ -426,14 +435,6 @@ extern int module_dummy_usage;
 #define GET_USE_COUNT(module) (module_dummy_usage)
 #define MOD_IN_USE 0
 #define __MODULE_STRING(x) __stringify(x)
-#define __mod_between(a_start, a_len, b_start, b_len)		\
-(((a_start) >= (b_start) && (a_start) <= (b_start)+(b_len))	\
- || ((a_start)+(a_len) >= (b_start)				\
-     && (a_start)+(a_len) <= (b_start)+(b_len)))
-#define mod_bound(p, n, m)					\
-(((m)->module_init						\
-  && __mod_between((p),(n),(m)->module_init,(m)->init_size))	\
- || __mod_between((p),(n),(m)->module_core,(m)->core_size))
 
 /*
  * The exception and symbol tables, and the lock
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
index 5001ff39204d..991e9cdf3213 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -16,9 +16,9 @@ unsigned long find_symbol_internal(Elf_Shdr *sechdrs,
 /* These must be implemented by the specific architecture */
 
 /* Adjust arch-specific sections.  Return 0 on success.  */
-int module_frob_arch_sections(const Elf_Ehdr *hdr,
-			      const Elf_Shdr *sechdrs,
-			      const char *secstrings,
+int module_frob_arch_sections(Elf_Ehdr *hdr,
+			      Elf_Shdr *sechdrs,
+			      char *secstrings,
 			      struct module *mod);
 
 /* Allocator used for allocating struct module, core sections and init
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 89874d8eeee7..0cab668cbfc6 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1092,7 +1092,7 @@
 #define PCI_DEVICE_ID_VIA_8233C_0	0x3109
 #define PCI_DEVICE_ID_VIA_8361		0x3112 
 #define PCI_DEVICE_ID_VIA_8233A		0x3147
-#define PCI_DEVICE_ID_VIA_8235_0	0x3168
+#define PCI_DEVICE_ID_VIA_8754		0x3168
 #define PCI_DEVICE_ID_VIA_8235		0x3177
 #define PCI_DEVICE_ID_VIA_8377_0	0x3189
 #define PCI_DEVICE_ID_VIA_86C100A	0x6100
diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
index 7b8d7d4d9078..95a45edc2f99 100644
--- a/include/linux/sunrpc/svcauth.h
+++ b/include/linux/sunrpc/svcauth.h
@@ -11,6 +11,7 @@
 
 #ifdef __KERNEL__
 
+#include <linux/string.h>
 #include <linux/sunrpc/msg_prot.h>
 #include <linux/sunrpc/cache.h>
 #include <linux/string.h>