diff --git a/[refs] b/[refs] index 0498986cf5bb..eda71be7f1f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83ecfdd0a0a065e55172889dc660c5db3c14633a +refs/heads/master: 2cade899df7d9cc9e977a24898b0bd5a6f4a8dfd diff --git a/trunk/include/asm-x86/current_64.h b/trunk/include/asm-x86/current_64.h index bc8adecee66d..2d368ede2fc1 100644 --- a/trunk/include/asm-x86/current_64.h +++ b/trunk/include/asm-x86/current_64.h @@ -1,23 +1,23 @@ #ifndef _X86_64_CURRENT_H #define _X86_64_CURRENT_H -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLY__) struct task_struct; #include -static inline struct task_struct *get_current(void) -{ - struct task_struct *t = read_pda(pcurrent); +static inline struct task_struct *get_current(void) +{ + struct task_struct *t = read_pda(pcurrent); return t; -} +} #define current get_current() #else #ifndef ASM_OFFSET_H -#include +#include #endif #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg