From b242fa6f59a0b36f961cf2d977cb6bfdf7cba08d Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Jan 2008 13:30:16 +0100 Subject: [PATCH] --- yaml --- r: 79745 b: refs/heads/master c: 8c61b900ebb8ec5918ffd776ba1a61a5f022566d h: refs/heads/master i: 79743: 5262ed0d5efe45e71f1ab0b00e1476fe62345e1f v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup_64.c | 4 +++- trunk/include/asm-x86/proto.h | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4dab1664741a..47bb58d5581c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 376ff0352c24a5fa47f1250dd60937b5a9077672 +refs/heads/master: 8c61b900ebb8ec5918ffd776ba1a61a5f022566d diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c index 97a497652d20..0e2bffe2e203 100644 --- a/trunk/arch/x86/kernel/setup_64.c +++ b/trunk/arch/x86/kernel/setup_64.c @@ -141,6 +141,8 @@ struct resource bss_resource = { .flags = IORESOURCE_RAM, }; +static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c); + #ifdef CONFIG_PROC_VMCORE /* elfcorehdr= specifies the location of elf core header * stored by the crashed kernel. This option will be passed @@ -844,7 +846,7 @@ struct cpu_model_info { /* Do some early cpuid on the boot CPU to get some parameter that are needed before check_bugs. Everything advanced is in identify_cpu below. */ -void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) +static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) { u32 tfms; diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h index 64fe816ea37a..9e3d51fd91a2 100644 --- a/trunk/include/asm-x86/proto.h +++ b/trunk/include/asm-x86/proto.h @@ -40,8 +40,6 @@ extern int nohpet; extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2))); -extern void early_identify_cpu(struct cpuinfo_x86 *c); - extern int k8_scan_nodes(unsigned long start, unsigned long end); extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);