Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d151b27d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

sched/headers: Move softlockup detector watchdog methods to <linux/nmi.h> 



These methods don't belong into <linux/sched.h>, they are neither directly
related to task_struct or are scheduler functionality.

Put them next to the other watchdog methods in <linux/nmi.h>.

( Arguably that header's name is a misnomer, and this patch makes it
  more so - but it should be renamed in another patch. )

Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bcbb6a5b

include/linux/nmi.h

+37 −0
Original line number Diff line number Diff line
@@ -7,6 +7,43 @@ 
#include <linux/sched.h>

#include <asm/irq.h>



#ifdef CONFIG_LOCKUP_DETECTOR

extern void touch_softlockup_watchdog_sched(void);

extern void touch_softlockup_watchdog(void);

extern void touch_softlockup_watchdog_sync(void);

extern void touch_all_softlockup_watchdogs(void);

extern int proc_dowatchdog_thresh(struct ctl_table *table, int write,

				  void __user *buffer,

				  size_t *lenp, loff_t *ppos);

extern unsigned int  softlockup_panic;

extern unsigned int  hardlockup_panic;

void lockup_detector_init(void);

#else

static inline void touch_softlockup_watchdog_sched(void)

{

}

static inline void touch_softlockup_watchdog(void)

{

}

static inline void touch_softlockup_watchdog_sync(void)

{

}

static inline void touch_all_softlockup_watchdogs(void)

{

}

static inline void lockup_detector_init(void)

{

}

#endif



#ifdef CONFIG_DETECT_HUNG_TASK

void reset_hung_task_detector(void);

#else

static inline void reset_hung_task_detector(void)

{

}

#endif



/*

 * The run state of the lockup detectors is controlled by the content of the

 * 'watchdog_enabled' variable. Each lockup detector has its dedicated bit -

include/linux/sched.h

+0 −37
Original line number Diff line number Diff line
@@ -286,43 +286,6 @@ extern int sched_cpu_dying(unsigned int cpu); 


extern void sched_show_task(struct task_struct *p);



#ifdef CONFIG_LOCKUP_DETECTOR

extern void touch_softlockup_watchdog_sched(void);

extern void touch_softlockup_watchdog(void);

extern void touch_softlockup_watchdog_sync(void);

extern void touch_all_softlockup_watchdogs(void);

extern int proc_dowatchdog_thresh(struct ctl_table *table, int write,

				  void __user *buffer,

				  size_t *lenp, loff_t *ppos);

extern unsigned int  softlockup_panic;

extern unsigned int  hardlockup_panic;

void lockup_detector_init(void);

#else

static inline void touch_softlockup_watchdog_sched(void)

{

}

static inline void touch_softlockup_watchdog(void)

{

}

static inline void touch_softlockup_watchdog_sync(void)

{

}

static inline void touch_all_softlockup_watchdogs(void)

{

}

static inline void lockup_detector_init(void)

{

}

#endif



#ifdef CONFIG_DETECT_HUNG_TASK

void reset_hung_task_detector(void);

#else

static inline void reset_hung_task_detector(void)

{

}

#endif



/* Attach to any functions which should be ignored in wchan output. */

#define __sched		__attribute__((__section__(".sched.text")))