UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Yinghai Lu 2008-06-25 18:00:22 -07:00 committed by Ingo Molnar
parent d1b20afec3
commit 29f784e369
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/setup.c
View File

@ -375,7 +375,7 @@ static void __init reserve_initrd(void)
} }
#endif /* CONFIG_BLK_DEV_INITRD */ #endif /* CONFIG_BLK_DEV_INITRD */
void __init parse_setup_data(void) static void __init parse_setup_data(void)
{ {
struct setup_data *data; struct setup_data *data;
u64 pa_data; u64 pa_data;
@ -417,7 +417,7 @@ static inline unsigned long long get_total_mem(void)
return total << PAGE_SHIFT; return total << PAGE_SHIFT;
} }
void __init reserve_crashkernel(void) static void __init reserve_crashkernel(void)
{ {
unsigned long long total_mem; unsigned long long total_mem;
unsigned long long crash_size, crash_base; unsigned long long crash_size, crash_base;
@ -453,7 +453,7 @@ void __init reserve_crashkernel(void)
} }
} }
#else #else
void __init reserve_crashkernel(void) static void __init reserve_crashkernel(void)
{ {
} }
#endif #endif
@ -481,7 +481,7 @@ static struct resource standard_io_resources[] = {
.flags = IORESOURCE_BUSY | IORESOURCE_IO } .flags = IORESOURCE_BUSY | IORESOURCE_IO }
}; };
void __init reserve_standard_io_resources(void) static void __init reserve_standard_io_resources(void)
{ {
int i; int i;

1
include/asm-x86/bootparam.h
View File

@ -109,6 +109,5 @@ struct boot_params {
} __attribute__((packed)); } __attribute__((packed));
void reserve_setup_data(void); void reserve_setup_data(void);
void parse_setup_data(void);
#endif /* _ASM_BOOTPARAM_H */ #endif /* _ASM_BOOTPARAM_H */

5
include/asm-x86/setup.h
View File

@ -8,9 +8,6 @@
/* Interrupt control for vSMPowered x86_64 systems */ /* Interrupt control for vSMPowered x86_64 systems */
void vsmp_init(void); void vsmp_init(void);
/* Crashkernel reservation */
void reserve_crashkernel(void);
#ifndef CONFIG_PARAVIRT #ifndef CONFIG_PARAVIRT
#define paravirt_post_allocator_init() do {} while (0) #define paravirt_post_allocator_init() do {} while (0)
#endif #endif
@ -38,8 +35,6 @@ void reserve_crashkernel(void);
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/bootparam.h> #include <asm/bootparam.h>
void reserve_standard_io_resources(void);
#ifndef _SETUP #ifndef _SETUP
/* /*