aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/setup_64.c4
-rw-r--r--include/asm-x86/proto.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 97a497652d20..0e2bffe2e203 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -141,6 +141,8 @@ struct resource bss_resource = {
141 .flags = IORESOURCE_RAM, 141 .flags = IORESOURCE_RAM,
142}; 142};
143 143
144static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c);
145
144#ifdef CONFIG_PROC_VMCORE 146#ifdef CONFIG_PROC_VMCORE
145/* elfcorehdr= specifies the location of elf core header 147/* elfcorehdr= specifies the location of elf core header
146 * stored by the crashed kernel. This option will be passed 148 * stored by the crashed kernel. This option will be passed
@@ -844,7 +846,7 @@ struct cpu_model_info {
844/* Do some early cpuid on the boot CPU to get some parameter that are 846/* Do some early cpuid on the boot CPU to get some parameter that are
845 needed before check_bugs. Everything advanced is in identify_cpu 847 needed before check_bugs. Everything advanced is in identify_cpu
846 below. */ 848 below. */
847void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) 849static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
848{ 850{
849 u32 tfms; 851 u32 tfms;
850 852
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 64fe816ea37a..9e3d51fd91a2 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -40,8 +40,6 @@ extern int nohpet;
40 40
41extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2))); 41extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2)));
42 42
43extern void early_identify_cpu(struct cpuinfo_x86 *c);
44
45extern int k8_scan_nodes(unsigned long start, unsigned long end); 43extern int k8_scan_nodes(unsigned long start, unsigned long end);
46 44
47extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn); 45extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);