diff --git a/[refs] b/[refs] index 2be7e69e544f..8815cd180a0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5300db887e251276eaab2801af297acf4b53b9eb +refs/heads/master: 2c1c468a382e64afccacdfe03fa4c0615cd4264f diff --git a/trunk/include/asm-x86/processor_64.h b/trunk/include/asm-x86/processor_64.h index 5045abe91e37..bfc4ce6e2f00 100644 --- a/trunk/include/asm-x86/processor_64.h +++ b/trunk/include/asm-x86/processor_64.h @@ -18,8 +18,6 @@ #include #include -extern char ignore_irq13; - extern void identify_cpu(struct cpuinfo_x86 *); /* @@ -68,9 +66,6 @@ DECLARE_PER_CPU(struct orig_ist, orig_ist); .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \ } -#define INIT_MMAP \ -{ &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL } - #define start_thread(regs,new_rip,new_rsp) do { \ asm volatile("movl %0,%%fs; movl %0,%%es; movl %0,%%ds": :"r" (0)); \ load_gs_index(0); \ @@ -144,13 +139,4 @@ static inline void prefetchw(void *x) "r" (x)); } - -#define stack_current() \ -({ \ - struct thread_info *ti; \ - asm("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \ - ti->task; \ -}) - - #endif /* __ASM_X86_64_PROCESSOR_H */