Commit 9caee613 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

ftrace: fix __trace_special()

parent ada6b835
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ static void timer_notify(struct pt_regs *regs, int cpu)


	}
	}


	trace_special(tr, data, 0, current->pid, regs->ip);
	__trace_special(tr, data, 0, current->pid, regs->ip);


	fp = (void __user *)regs->bp;
	fp = (void __user *)regs->bp;


@@ -93,18 +93,18 @@ static void timer_notify(struct pt_regs *regs, int cpu)
		if ((unsigned long)fp < regs->sp)
		if ((unsigned long)fp < regs->sp)
			break;
			break;


		trace_special(tr, data, 1, frame.return_address,
		__trace_special(tr, data, 1, frame.return_address,
			      (unsigned long)fp);
			      (unsigned long)fp);
		fp = frame.next_fp;
		fp = frame.next_fp;
	}
	}


	trace_special(tr, data, 2, current->pid, i);
	__trace_special(tr, data, 2, current->pid, i);


	/*
	/*
	 * Special trace entry if we overflow the max depth:
	 * Special trace entry if we overflow the max depth:
	 */
	 */
	if (i == sample_max_depth)
	if (i == sample_max_depth)
		trace_special(tr, data, -1, -1, -1);
		__trace_special(tr, data, -1, -1, -1);
}
}


static enum hrtimer_restart stack_trace_timer_fn(struct hrtimer *hrtimer)
static enum hrtimer_restart stack_trace_timer_fn(struct hrtimer *hrtimer)