diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
commit | befddb21c845f8fb49e637997891ef97c6a869dc (patch) | |
tree | 0e7629123184f2dd50291ad6d477b894175f0f26 /arch/openrisc/include/asm/processor.h | |
parent | e716efde75267eab919cdb2bef5b2cb77f305326 (diff) | |
parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/openrisc/include/asm/processor.h')
-rw-r--r-- | arch/openrisc/include/asm/processor.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/openrisc/include/asm/processor.h b/arch/openrisc/include/asm/processor.h index 43decdbdb2ed..33691380608e 100644 --- a/arch/openrisc/include/asm/processor.h +++ b/arch/openrisc/include/asm/processor.h | |||
@@ -81,8 +81,6 @@ struct thread_struct { | |||
81 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->sp) | 81 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->sp) |
82 | 82 | ||
83 | 83 | ||
84 | extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); | ||
85 | |||
86 | void start_thread(struct pt_regs *regs, unsigned long nip, unsigned long sp); | 84 | void start_thread(struct pt_regs *regs, unsigned long nip, unsigned long sp); |
87 | void release_thread(struct task_struct *); | 85 | void release_thread(struct task_struct *); |
88 | unsigned long get_wchan(struct task_struct *p); | 86 | unsigned long get_wchan(struct task_struct *p); |