[PATCH] silence smp_read_mpc_oem() declared static but never defined warning

From: William Lee Irwin III <wli@holomorphy.com>

The forward static declaration in a header is a) weird and b) generates a
warning if the inline function which needs it is not expanded.

Move these things from .h into .c

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index f33d06c3b89f5149a9804aeb82abbe7158dda292..ac55df3baae0d93b79281206c9dea6142b2d2a3d 100644 (file)
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -337,6 +337,16 @@ static void __init smp_read_mpc_oem(struct mp_config_oemtable *oemtable, \
                }
        }
 }
+
+static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
+               char *productid)
+{
+       if (strncmp(oem, "IBM NUMA", 8))
+               printk("Warning!  May not be a NUMA-Q system!\n");
+       if (mpc->mpc_oemptr)
+               smp_read_mpc_oem((struct mp_config_oemtable *) mpc->mpc_oemptr,
+                               mpc->mpc_oemsize);
+}
 #endif /* CONFIG_X86_NUMAQ */
 
 /*

diff --git a/include/asm-i386/mach-numaq/mach_mpparse.h b/include/asm-i386/mach-numaq/mach_mpparse.h
index 41c7d08d973ddee65af89788c7d1dab34558b21e..51bbac8fc0c2ea83194e8b5cd8551070047ea63a 100644 (file)
--- a/include/asm-i386/mach-numaq/mach_mpparse.h
+++ b/include/asm-i386/mach-numaq/mach_mpparse.h
@@ -1,9 +1,6 @@
 #ifndef __ASM_MACH_MPPARSE_H
 #define __ASM_MACH_MPPARSE_H
 
-static void __init smp_read_mpc_oem(struct mp_config_oemtable *oemtable,
-                       unsigned short oemsize);
-
 static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, 
                                struct mpc_config_translation *translation)
 {
@@ -24,16 +21,6 @@ static inline void mpc_oem_pci_bus(struct mpc_config_bus *m,
        quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
 }
 
-static inline void mps_oem_check(struct mp_config_table *mpc, char *oem, 
-               char *productid)
-{
-       if (strncmp(oem, "IBM NUMA", 8))
-               printk("Warning!  May not be a NUMA-Q system!\n");
-       if (mpc->mpc_oemptr)
-               smp_read_mpc_oem((struct mp_config_oemtable *) mpc->mpc_oemptr, 
-                               mpc->mpc_oemsize);
-}
-
 /* Hook from generic ACPI tables.c */
 static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {