git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
thread_info_mm.h
diff --git
a/arch/m68k/include/asm/thread_info_mm.h
b/arch/m68k/include/asm/thread_info_mm.h
index
af0fda4
..
b6da388
100644
(file)
--- a/
arch/m68k/include/asm/thread_info_mm.h
+++ b/
arch/m68k/include/asm/thread_info_mm.h
@@
-1,6
+1,10
@@
#ifndef _ASM_M68K_THREAD_INFO_H
#define _ASM_M68K_THREAD_INFO_H
#ifndef _ASM_M68K_THREAD_INFO_H
#define _ASM_M68K_THREAD_INFO_H
+#ifndef ASM_OFFSETS_C
+#include <asm/asm-offsets.h>
+#endif
+#include <asm/current.h>
#include <asm/types.h>
#include <asm/page.h>
#include <asm/types.h>
#include <asm/page.h>
@@
-19,6
+23,7
@@
struct thread_info {
{ \
.task = &tsk, \
.exec_domain = &default_exec_domain, \
{ \
.task = &tsk, \
.exec_domain = &default_exec_domain, \
+ .preempt_count = INIT_PREEMPT_COUNT, \
.restart_block = { \
.fn = do_no_restart_syscall, \
}, \
.restart_block = { \
.fn = do_no_restart_syscall, \
}, \
@@
-30,7
+35,12
@@
struct thread_info {
#define init_thread_info (init_task.thread.info)
#define init_stack (init_thread_union.stack)
#define init_thread_info (init_task.thread.info)
#define init_stack (init_thread_union.stack)
-#define task_thread_info(tsk) (&(tsk)->thread.info)
+#ifdef ASM_OFFSETS_C
+#define task_thread_info(tsk) ((struct thread_info *) NULL)
+#else
+#define task_thread_info(tsk) ((struct thread_info *)((char *)tsk+TASK_TINFO))
+#endif
+
#define task_stack_page(tsk) ((tsk)->stack)
#define current_thread_info() task_thread_info(current)
#define task_stack_page(tsk) ((tsk)->stack)
#define current_thread_info() task_thread_info(current)