[PATCH 15/16] x86: change some functions in setup.c to static

From: Yinghai Lu
Date: Wed Jun 25 2008 - 21:06:51 EST




Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>

---
arch/x86/kernel/setup.c | 8 ++++----
include/asm-x86/bootparam.h | 1 -
include/asm-x86/setup.h | 5 -----
3 files changed, 4 insertions(+), 10 deletions(-)

Index: linux-2.6/arch/x86/kernel/setup.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup.c
+++ linux-2.6/arch/x86/kernel/setup.c
@@ -371,7 +371,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;
@@ -413,7 +413,7 @@ static inline unsigned long long get_tot
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;
@@ -449,7 +449,7 @@ void __init reserve_crashkernel(void)
}
}
#else
-void __init reserve_crashkernel(void)
+static void __init reserve_crashkernel(void)
{
}
#endif
@@ -477,7 +477,7 @@ static struct resource standard_io_resou
.flags = IORESOURCE_BUSY | IORESOURCE_IO }
};

-void __init reserve_standard_io_resources(void)
+static void __init reserve_standard_io_resources(void)
{
int i;

Index: linux-2.6/include/asm-x86/bootparam.h
===================================================================
--- linux-2.6.orig/include/asm-x86/bootparam.h
+++ linux-2.6/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 */
Index: linux-2.6/include/asm-x86/setup.h
===================================================================
--- linux-2.6.orig/include/asm-x86/setup.h
+++ linux-2.6/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

/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/