mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-26 08:31:13 +00:00
lockup_detector: Touch_softlockup cleanups and softlockup_tick removal
Just some code cleanup to make touch_softlockup clearer and remove the softlockup_tick function as it is no longer needed. Also remove the /proc softlockup_thres call as it has been changed to watchdog_thres. Signed-off-by: Don Zickus <dzickus@redhat.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Eric Paris <eparis@redhat.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> LKML-Reference: <1273266711-18706-3-git-send-email-dzickus@redhat.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
This commit is contained in:
parent
58687acba5
commit
332fbdbca3
4 changed files with 6 additions and 55 deletions
|
@ -119,13 +119,12 @@ static void __touch_watchdog(void)
|
|||
__get_cpu_var(watchdog_touch_ts) = get_timestamp(this_cpu);
|
||||
}
|
||||
|
||||
void touch_watchdog(void)
|
||||
void touch_softlockup_watchdog(void)
|
||||
{
|
||||
__get_cpu_var(watchdog_touch_ts) = 0;
|
||||
}
|
||||
EXPORT_SYMBOL(touch_watchdog);
|
||||
|
||||
void touch_all_watchdog(void)
|
||||
void touch_all_softlockup_watchdogs(void)
|
||||
{
|
||||
int cpu;
|
||||
|
||||
|
@ -140,35 +139,16 @@ void touch_all_watchdog(void)
|
|||
|
||||
void touch_nmi_watchdog(void)
|
||||
{
|
||||
touch_watchdog();
|
||||
touch_softlockup_watchdog();
|
||||
}
|
||||
EXPORT_SYMBOL(touch_nmi_watchdog);
|
||||
|
||||
void touch_all_nmi_watchdog(void)
|
||||
{
|
||||
touch_all_watchdog();
|
||||
}
|
||||
|
||||
void touch_softlockup_watchdog(void)
|
||||
{
|
||||
touch_watchdog();
|
||||
}
|
||||
|
||||
void touch_all_softlockup_watchdogs(void)
|
||||
{
|
||||
touch_all_watchdog();
|
||||
}
|
||||
|
||||
void touch_softlockup_watchdog_sync(void)
|
||||
{
|
||||
__raw_get_cpu_var(softlockup_touch_sync) = true;
|
||||
__raw_get_cpu_var(watchdog_touch_ts) = 0;
|
||||
}
|
||||
|
||||
void softlockup_tick(void)
|
||||
{
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PERF_EVENTS_NMI
|
||||
/* watchdog detector functions */
|
||||
static int is_hardlockup(int cpu)
|
||||
|
@ -522,15 +502,6 @@ int proc_dowatchdog_thresh(struct ctl_table *table, int write,
|
|||
{
|
||||
return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
|
||||
}
|
||||
|
||||
/* stub functions */
|
||||
int proc_dosoftlockup_thresh(struct ctl_table *table, int write,
|
||||
void __user *buffer,
|
||||
size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
return proc_dowatchdog_thresh(table, write, buffer, lenp, ppos);
|
||||
}
|
||||
/* end of stub functions */
|
||||
#endif /* CONFIG_SYSCTL */
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue