diff options
| author |   Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-25 18:00:22 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-07-08 13:10:54 +0200 |
| commit | 29f784e369a914b5926e01a0b0caae0b47f6452a (patch) | |
| tree | 63ee691ad39ee6e2eea7809c11d9fbcf675c2fe4 | |
| parent | x86: make x86_find_smp_config depends on 64 bit too (diff) | |
| download | linux-dev-29f784e369a914b5926e01a0b0caae0b47f6452a.tar.xz linux-dev-29f784e369a914b5926e01a0b0caae0b47f6452a.zip | |
x86: change some functions in setup.c to static
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/setup.c | 8 | ||||
| -rw-r--r-- | include/asm-x86/bootparam.h | 1 | ||||
| -rw-r--r-- | include/asm-x86/setup.h | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 7690547ac285..35022dc10428 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -375,7 +375,7 @@ static void __init reserve_initrd(void) } #endif /* CONFIG_BLK_DEV_INITRD */ -void __init parse_setup_data(void) +static void __init parse_setup_data(void) { struct setup_data *data; u64 pa_data; @@ -417,7 +417,7 @@ static inline unsigned long long get_total_mem(void) return total << PAGE_SHIFT; } -void __init reserve_crashkernel(void) +static void __init reserve_crashkernel(void) { unsigned long long total_mem; unsigned long long crash_size, crash_base; @@ -453,7 +453,7 @@ void __init reserve_crashkernel(void) } } #else -void __init reserve_crashkernel(void) +static void __init reserve_crashkernel(void) { } #endif @@ -481,7 +481,7 @@ static struct resource standard_io_resources[] = { .flags = IORESOURCE_BUSY | IORESOURCE_IO } }; -void __init reserve_standard_io_resources(void) +static void __init reserve_standard_io_resources(void) { int i; diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h index 55ae9d0c4255..6eeba3b2812b 100644 --- a/include/asm-x86/bootparam.h +++ b/include/asm-x86/bootparam.h @@ -109,6 +109,5 @@ struct boot_params { } __attribute__((packed)); void reserve_setup_data(void); -void parse_setup_data(void); #endif /* _ASM_BOOTPARAM_H */ diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h index bb12a1619c12..269ba7fe21d1 100644 --- a/include/asm-x86/setup.h +++ b/include/asm-x86/setup.h @@ -8,9 +8,6 @@ /* Interrupt control for vSMPowered x86_64 systems */ void vsmp_init(void); -/* Crashkernel reservation */ -void reserve_crashkernel(void); - #ifndef CONFIG_PARAVIRT #define paravirt_post_allocator_init() do {} while (0) #endif @@ -38,8 +35,6 @@ void reserve_crashkernel(void); #ifndef __ASSEMBLY__ #include <asm/bootparam.h> -void reserve_standard_io_resources(void); - #ifndef _SETUP /* |