diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-mips/current.h | |
parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'include/asm-mips/current.h')
-rw-r--r-- | include/asm-mips/current.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/asm-mips/current.h b/include/asm-mips/current.h deleted file mode 100644 index 559db66b9790..000000000000 --- a/include/asm-mips/current.h +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 1998, 2002 Ralf Baechle | ||
7 | * Copyright (C) 1999 Silicon Graphics, Inc. | ||
8 | */ | ||
9 | #ifndef _ASM_CURRENT_H | ||
10 | #define _ASM_CURRENT_H | ||
11 | |||
12 | #include <linux/thread_info.h> | ||
13 | |||
14 | struct task_struct; | ||
15 | |||
16 | static inline struct task_struct * get_current(void) | ||
17 | { | ||
18 | return current_thread_info()->task; | ||
19 | } | ||
20 | |||
21 | #define current get_current() | ||
22 | |||
23 | #endif /* _ASM_CURRENT_H */ | ||