Commit f037360f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] m68k: thread_info header cleanup 



a) in smp_lock.h #include of sched.h and spinlock.h moved under #ifdef
   CONFIG_LOCK_KERNEL.

b) interrupt.h now explicitly pulls sched.h (not via smp_lock.h from
   hardirq.h as it used to)

c) in three more places we need changes to compensate for (a) - one place
   in arch/sparc needs string.h now, hardirq.h needs forward declaration of
   task_struct and preempt.h needs direct include of thread_info.h.

d) thread_info-related helpers in sched.h and thread_info.h put under
   ifndef __HAVE_THREAD_FUNCTIONS.  Obviously safe.

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 10ebffde

arch/sparc/lib/bitext.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include <linux/smp_lock.h>

#include <linux/string.h>

#include <linux/bitops.h>



#include <asm/bitext.h>

include/linux/hardirq.h

+2 −0
Original line number Diff line number Diff line
@@ -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)

{

include/linux/interrupt.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/preempt.h>

#include <linux/cpumask.h>

#include <linux/hardirq.h>

#include <linux/sched.h>

#include <asm/atomic.h>

#include <asm/ptrace.h>

#include <asm/system.h>

include/linux/preempt.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/config.h>

#include <linux/thread_info.h>

#include <linux/linkage.h>



#ifdef CONFIG_DEBUG_PREEMPT

include/linux/sched.h

+4 −0
Original line number Diff line number Diff line
@@ -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

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE