diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 14:03:52 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 14:03:52 -0500 |
| commit | 9ae9e2535d7dd1c21d6a7db1a7f2fc507a5e4080 (patch) | |
| tree | f059571830a159f05b8cdf4ec354b01ca7d6bc45 /kernel/trace/ftrace.c | |
| parent | 75431f9d7335daf7fb9e72b3a1539ce610142618 (diff) | |
| parent | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (diff) | |
Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 3ffe4c5ad3f3..41473b4ad7a4 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -3998,7 +3998,7 @@ static int ftrace_module_notify(struct notifier_block *self, | |||
| 3998 | 3998 | ||
| 3999 | struct notifier_block ftrace_module_nb = { | 3999 | struct notifier_block ftrace_module_nb = { |
| 4000 | .notifier_call = ftrace_module_notify, | 4000 | .notifier_call = ftrace_module_notify, |
| 4001 | .priority = 0, | 4001 | .priority = INT_MAX, /* Run before anything that can use kprobes */ |
| 4002 | }; | 4002 | }; |
| 4003 | 4003 | ||
| 4004 | extern unsigned long __start_mcount_loc[]; | 4004 | extern unsigned long __start_mcount_loc[]; |