diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /include/asm-x86_64/current.h | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'include/asm-x86_64/current.h')
| -rw-r--r-- | include/asm-x86_64/current.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/current.h b/include/asm-x86_64/current.h index 7db560ee6f70..bc8adecee66d 100644 --- a/include/asm-x86_64/current.h +++ b/include/asm-x86_64/current.h | |||
| @@ -17,7 +17,7 @@ static inline struct task_struct *get_current(void) | |||
| 17 | #else | 17 | #else |
| 18 | 18 | ||
| 19 | #ifndef ASM_OFFSET_H | 19 | #ifndef ASM_OFFSET_H |
| 20 | #include <asm/offset.h> | 20 | #include <asm/asm-offsets.h> |
| 21 | #endif | 21 | #endif |
| 22 | 22 | ||
| 23 | #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg | 23 | #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg |