Commit a940199f authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Some cleanup in setup64.c 



Minor cleanup.

Move things into their include files, remove obsolete includes, fix
indentation, remove obsolete special cases etc.

I also added the per cpu section to asm-generic/sections.h and fixed
init/main.c to use it.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent de04f322

arch/x86_64/kernel/setup64.c

+4 −14
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/string.h>

#include <linux/bootmem.h>

#include <linux/bitops.h>

#include <linux/module.h>

#include <asm/bootsetup.h>

#include <asm/pda.h>

#include <asm/pgtable.h>
@@ -22,10 +23,8 @@ 
#include <asm/smp.h>

#include <asm/i387.h>

#include <asm/percpu.h>

#include <asm/mtrr.h>

#include <asm/proto.h>

#include <asm/mman.h>

#include <asm/numa.h>

#include <asm/sections.h>



char x86_boot_params[BOOT_PARAM_SIZE] __initdata = {0,};
@@ -33,11 +32,6 @@ cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE; 


struct x8664_pda cpu_pda[NR_CPUS] __cacheline_aligned; 



extern struct task_struct init_task;



extern unsigned char __per_cpu_start[], __per_cpu_end[]; 



extern struct desc_ptr cpu_gdt_descr[];

struct desc_ptr idt_descr = { 256 * 16, (unsigned long) idt_table }; 



char boot_cpu_stack[IRQSTACKSIZE] __attribute__((section(".bss.page_aligned")));
@@ -101,7 +95,7 @@ void __init setup_per_cpu_areas(void) 
#endif



	for (i = 0; i < NR_CPUS; i++) { 

		unsigned char *ptr;

		char *ptr;



		if (!NODE_DATA(cpu_to_node(i))) {

			printk("cpu with no node %d, num_online_nodes %d\n",
@@ -190,11 +184,7 @@ void __cpuinit check_efer(void) 
 */

void __cpuinit cpu_init (void)

{

#ifdef CONFIG_SMP

	int cpu = stack_smp_processor_id();

#else

	int cpu = smp_processor_id();

#endif

	struct tss_struct *t = &per_cpu(init_tss, cpu);

	unsigned long v; 

	char *estacks = NULL;

include/asm-generic/sections.h

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ extern char _sinittext[], _einittext[]; 
extern char _sextratext[] __attribute__((weak));

extern char _eextratext[] __attribute__((weak));

extern char _end[];

extern char __per_cpu_start[], __per_cpu_end[];



#endif /* _ASM_GENERIC_SECTIONS_H_ */

include/asm-x86_64/desc.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct desc_ptr { 
 */

extern struct desc_struct default_ldt[];

extern struct gate_struct idt_table[]; 

extern struct desc_ptr cpu_gdt_descr[];



static inline void _set_gate(void *adr, unsigned type, unsigned long func, unsigned dpl, unsigned ist)  

{

init/main.c

+1 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <asm/io.h>

#include <asm/bugs.h>

#include <asm/setup.h>

#include <asm/sections.h>



/*

 * This is one of the first .c files built. Error out early
@@ -323,8 +324,6 @@ static void __init setup_per_cpu_areas(void) 
{

	unsigned long size, i;

	char *ptr;

	/* Created by linker magic */

	extern char __per_cpu_start[], __per_cpu_end[];



	/* Copy section for each CPU (we discard the original) */

	size = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);

CRA Git | Maintained and supported by SUSTech CRA and CCSE