diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-25 21:00:22 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 07:10:54 -0400 |
commit | 29f784e369a914b5926e01a0b0caae0b47f6452a (patch) | |
tree | 63ee691ad39ee6e2eea7809c11d9fbcf675c2fe4 | |
parent | d1b20afec356085a202d7832d47bfb89303ea901 (diff) |
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) | |||
375 | } | 375 | } |
376 | #endif /* CONFIG_BLK_DEV_INITRD */ | 376 | #endif /* CONFIG_BLK_DEV_INITRD */ |
377 | 377 | ||
378 | void __init parse_setup_data(void) | 378 | static void __init parse_setup_data(void) |
379 | { | 379 | { |
380 | struct setup_data *data; | 380 | struct setup_data *data; |
381 | u64 pa_data; | 381 | u64 pa_data; |
@@ -417,7 +417,7 @@ static inline unsigned long long get_total_mem(void) | |||
417 | return total << PAGE_SHIFT; | 417 | return total << PAGE_SHIFT; |
418 | } | 418 | } |
419 | 419 | ||
420 | void __init reserve_crashkernel(void) | 420 | static void __init reserve_crashkernel(void) |
421 | { | 421 | { |
422 | unsigned long long total_mem; | 422 | unsigned long long total_mem; |
423 | unsigned long long crash_size, crash_base; | 423 | unsigned long long crash_size, crash_base; |
@@ -453,7 +453,7 @@ void __init reserve_crashkernel(void) | |||
453 | } | 453 | } |
454 | } | 454 | } |
455 | #else | 455 | #else |
456 | void __init reserve_crashkernel(void) | 456 | static void __init reserve_crashkernel(void) |
457 | { | 457 | { |
458 | } | 458 | } |
459 | #endif | 459 | #endif |
@@ -481,7 +481,7 @@ static struct resource standard_io_resources[] = { | |||
481 | .flags = IORESOURCE_BUSY | IORESOURCE_IO } | 481 | .flags = IORESOURCE_BUSY | IORESOURCE_IO } |
482 | }; | 482 | }; |
483 | 483 | ||
484 | void __init reserve_standard_io_resources(void) | 484 | static void __init reserve_standard_io_resources(void) |
485 | { | 485 | { |
486 | int i; | 486 | int i; |
487 | 487 | ||
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 { | |||
109 | } __attribute__((packed)); | 109 | } __attribute__((packed)); |
110 | 110 | ||
111 | void reserve_setup_data(void); | 111 | void reserve_setup_data(void); |
112 | void parse_setup_data(void); | ||
113 | 112 | ||
114 | #endif /* _ASM_BOOTPARAM_H */ | 113 | #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 @@ | |||
8 | /* Interrupt control for vSMPowered x86_64 systems */ | 8 | /* Interrupt control for vSMPowered x86_64 systems */ |
9 | void vsmp_init(void); | 9 | void vsmp_init(void); |
10 | 10 | ||
11 | /* Crashkernel reservation */ | ||
12 | void reserve_crashkernel(void); | ||
13 | |||
14 | #ifndef CONFIG_PARAVIRT | 11 | #ifndef CONFIG_PARAVIRT |
15 | #define paravirt_post_allocator_init() do {} while (0) | 12 | #define paravirt_post_allocator_init() do {} while (0) |
16 | #endif | 13 | #endif |
@@ -38,8 +35,6 @@ void reserve_crashkernel(void); | |||
38 | #ifndef __ASSEMBLY__ | 35 | #ifndef __ASSEMBLY__ |
39 | #include <asm/bootparam.h> | 36 | #include <asm/bootparam.h> |
40 | 37 | ||
41 | void reserve_standard_io_resources(void); | ||
42 | |||
43 | #ifndef _SETUP | 38 | #ifndef _SETUP |
44 | 39 | ||
45 | /* | 40 | /* |