From 6deb8b1c936eec097c209f75dd4282601bd587ca Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 13 Nov 2005 16:06:57 -0800 Subject: [PATCH] --- yaml --- r: 14055 b: refs/heads/master c: f037360f2ed111fe89a8f5cb6ba351f4e9934e53 h: refs/heads/master i: 14053: 22ee3c43e63c55140dd94de24dc99519877ea589 14051: cf3c6318e8641503860f282d0e626938c5853476 14047: 96f38e3551bd2818f8132811587d11dca5b00107 v: v3 --- [refs] | 2 +- trunk/arch/sparc/lib/bitext.c | 1 + trunk/include/linux/hardirq.h | 2 ++ trunk/include/linux/interrupt.h | 1 + trunk/include/linux/preempt.h | 1 + trunk/include/linux/sched.h | 4 ++++ trunk/include/linux/smp_lock.h | 3 +-- 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 335408bcad2b..c075d4095ac3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10ebffde3d3916026974352b7900e44afe2b243f +refs/heads/master: f037360f2ed111fe89a8f5cb6ba351f4e9934e53 diff --git a/trunk/arch/sparc/lib/bitext.c b/trunk/arch/sparc/lib/bitext.c index 94b05e8c906c..2e168d16547f 100644 --- a/trunk/arch/sparc/lib/bitext.c +++ b/trunk/arch/sparc/lib/bitext.c @@ -10,6 +10,7 @@ */ #include +#include #include #include diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h index 5912874ca83c..71d2b8a723b9 100644 --- a/trunk/include/linux/hardirq.h +++ b/trunk/include/linux/hardirq.h @@ -90,6 +90,8 @@ extern void synchronize_irq(unsigned int irq); #define nmi_enter() irq_enter() #define nmi_exit() sub_preempt_count(HARDIRQ_OFFSET) +struct task_struct; + #ifndef CONFIG_VIRT_CPU_ACCOUNTING static inline void account_user_vtime(struct task_struct *tsk) { diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h index 0a90205184b0..41f150a3d2dd 100644 --- a/trunk/include/linux/interrupt.h +++ b/trunk/include/linux/interrupt.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/trunk/include/linux/preempt.h b/trunk/include/linux/preempt.h index dd98c54a23b4..d9a2f5254a51 100644 --- a/trunk/include/linux/preempt.h +++ b/trunk/include/linux/preempt.h @@ -7,6 +7,7 @@ */ #include +#include #include #ifdef CONFIG_DEBUG_PREEMPT diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index e4681256e43e..41df81395719 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1233,6 +1233,8 @@ static inline void task_unlock(struct task_struct *p) spin_unlock(&p->alloc_lock); } +#ifndef __HAVE_THREAD_FUNCTIONS + #define task_thread_info(task) (task)->thread_info static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) @@ -1246,6 +1248,8 @@ static inline unsigned long *end_of_stack(struct task_struct *p) return (unsigned long *)(p->thread_info + 1); } +#endif + /* set thread flags in other task's structures * - see asm/thread_info.h for TIF_xxxx flags available */ diff --git a/trunk/include/linux/smp_lock.h b/trunk/include/linux/smp_lock.h index b63ce7014093..fa1ff3b165fe 100644 --- a/trunk/include/linux/smp_lock.h +++ b/trunk/include/linux/smp_lock.h @@ -2,11 +2,10 @@ #define __LINUX_SMPLOCK_H #include +#ifdef CONFIG_LOCK_KERNEL #include #include -#ifdef CONFIG_LOCK_KERNEL - #define kernel_locked() (current->lock_depth >= 0) extern int __lockfunc __reacquire_kernel_lock(void);