Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29f784e3 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: change some functions in setup.c to static 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d1b20afe

arch/x86/kernel/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

include/asm-x86/bootparam.h

+0 −1
Original line number Diff line number Diff line
@@ -109,6 +109,5 @@ struct boot_params { 
} __attribute__((packed));



void reserve_setup_data(void);

void parse_setup_data(void);



#endif /* _ASM_BOOTPARAM_H */

include/asm-x86/setup.h

+0 −5
Original line number Diff line number Diff line
@@ -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



/*