diff options
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/c_start.S | 6 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/cpu.h | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/arch/x86/c_start.S b/src/arch/x86/c_start.S index 84fbed2956..02a9b8933a 100644 --- a/src/arch/x86/c_start.S +++ b/src/arch/x86/c_start.S @@ -80,7 +80,6 @@ _start: push_cpu_info -#if CONFIG(CPU_INFO_V2) /* Allocate the per_cpu_segment_data on the stack */ push_per_cpu_segment_data @@ -93,7 +92,6 @@ _start: mov $per_cpu_segment_selector, %eax movl (%eax), %eax mov %eax, %gs -#endif /* * Now we are finished. Memory is up, data is copied and @@ -222,7 +220,6 @@ gdt: .word 0xffff, 0x0000 .byte 0x00, 0x9b, 0xaf, 0x00 #endif -#if CONFIG(CPU_INFO_V2) per_cpu_segment_descriptors: .rept CONFIG_MAX_CPUS /* flat data segment */ @@ -233,14 +230,11 @@ per_cpu_segment_descriptors: .byte 0x00, 0x93, 0xcf, 0x00 #endif .endr -#endif /* CPU_INFO_V2 */ gdt_end: -#if CONFIG(CPU_INFO_V2) /* Segment selector pointing to the first per_cpu_segment_descriptor. */ per_cpu_segment_selector: .long per_cpu_segment_descriptors - gdt -#endif /* CPU_INFO_V2 */ .section ".text._start", "ax", @progbits #if ENV_X86_64 diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 2d2879f6db..0087a795ec 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -149,8 +149,6 @@ struct per_cpu_segment_data { static inline struct cpu_info *cpu_info(void) { -/* We use a #if because we don't want to mess with the &s below. */ -#if CONFIG(CPU_INFO_V2) struct cpu_info *ci = NULL; __asm__("mov %%gs:%c[offset], %[ci]" @@ -159,11 +157,6 @@ static inline struct cpu_info *cpu_info(void) ); return ci; -#else - char s; - uintptr_t info = ALIGN_UP((uintptr_t)&s, CONFIG_STACK_SIZE) - sizeof(struct cpu_info); - return (struct cpu_info *)info; -#endif /* CPU_INFO_V2 */ } struct cpuinfo_x86 { |