Skip to content

Commit

Permalink
x86: change some functions in setup.c to static
Browse files Browse the repository at this point in the history
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Jul 8, 2008
1 parent d1b20af commit 29f784e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
8 changes: 4 additions & 4 deletions arch/x86/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -453,7 +453,7 @@ void __init reserve_crashkernel(void)
}
}
#else
void __init reserve_crashkernel(void)
static void __init reserve_crashkernel(void)
{
}
#endif
Expand Down Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion include/asm-x86/bootparam.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,5 @@ struct boot_params {
} __attribute__((packed));

void reserve_setup_data(void);
void parse_setup_data(void);

#endif /* _ASM_BOOTPARAM_H */
5 changes: 0 additions & 5 deletions include/asm-x86/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -38,8 +35,6 @@ void reserve_crashkernel(void);
#ifndef __ASSEMBLY__
#include <asm/bootparam.h>

void reserve_standard_io_resources(void);

#ifndef _SETUP

/*
Expand Down

0 comments on commit 29f784e

Please sign in to comment.