diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 13:33:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 13:33:01 -0500 |
commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch) | |
tree | d498e947176f4b77938034ff6c6427f9875da721 /arch/m68k/include/asm/current_no.h | |
parent | 9f4863b7dc7f545bb3a01746feafdc1208e86c89 (diff) | |
parent | 49148020bcb6910ce71417bd990a5ce7017f9bd3 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,m68knommu: merge header files
Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
Diffstat (limited to 'arch/m68k/include/asm/current_no.h')
-rw-r--r-- | arch/m68k/include/asm/current_no.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/current_no.h b/arch/m68k/include/asm/current_no.h new file mode 100644 index 000000000000..53ee0f9f7cef --- /dev/null +++ b/arch/m68k/include/asm/current_no.h | |||
@@ -0,0 +1,24 @@ | |||
1 | #ifndef _M68KNOMMU_CURRENT_H | ||
2 | #define _M68KNOMMU_CURRENT_H | ||
3 | /* | ||
4 | * current.h | ||
5 | * (C) Copyright 2000, Lineo, David McCullough <davidm@uclinux.org> | ||
6 | * (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com) | ||
7 | * | ||
8 | * rather than dedicate a register (as the m68k source does), we | ||
9 | * just keep a global, we should probably just change it all to be | ||
10 | * current and lose _current_task. | ||
11 | */ | ||
12 | |||
13 | #include <linux/thread_info.h> | ||
14 | |||
15 | struct task_struct; | ||
16 | |||
17 | static inline struct task_struct *get_current(void) | ||
18 | { | ||
19 | return(current_thread_info()->task); | ||
20 | } | ||
21 | |||
22 | #define current get_current() | ||
23 | |||
24 | #endif /* _M68KNOMMU_CURRENT_H */ | ||