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

Commit 502adf57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  watchdog: Don't throttle the watchdog
  tracing: Fix timer tracing
parents 3b6c5507 c6db67cd

include/trace/events/timer.h

+6 −2
Original line number Diff line number Diff line
@@ -81,14 +81,16 @@ TRACE_EVENT(timer_expire_entry, 
	TP_STRUCT__entry(

		__field( void *,	timer	)

		__field( unsigned long,	now	)

		__field( void *,	function)

	),



	TP_fast_assign(

		__entry->timer		= timer;

		__entry->now		= jiffies;

		__entry->function	= timer->function;

	),



	TP_printk("timer=%p now=%lu", __entry->timer, __entry->now)

	TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now)

);



/**
@@ -200,14 +202,16 @@ TRACE_EVENT(hrtimer_expire_entry, 
	TP_STRUCT__entry(

		__field( void *,	hrtimer	)

		__field( s64,		now	)

		__field( void *,	function)

	),



	TP_fast_assign(

		__entry->hrtimer	= hrtimer;

		__entry->now		= now->tv64;

		__entry->function	= hrtimer->function;

	),



	TP_printk("hrtimer=%p now=%llu", __entry->hrtimer,

	TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function,

		  (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now }))

 );

kernel/watchdog.c

+3 −0
Original line number Diff line number Diff line
@@ -206,6 +206,9 @@ void watchdog_overflow_callback(struct perf_event *event, int nmi, 
		 struct perf_sample_data *data,

		 struct pt_regs *regs)

{

	/* Ensure the watchdog never gets throttled */

	event->hw.interrupts = 0;



	if (__get_cpu_var(watchdog_nmi_touch) == true) {

		__get_cpu_var(watchdog_nmi_touch) = false;

		return;