diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-17 08:38:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-17 08:38:41 -0400 |
| commit | 8df341cf251f3b77eaaef66f806570e74ab44452 (patch) | |
| tree | 66dacceda331b1ef32772a1b4c63c7f1f4c96d1a /drivers/oprofile/timer_int.c | |
| parent | eb4316dd0a96a74104e5b921e640e73a99b56795 (diff) | |
| parent | ec6b426c4dbb9eef40375c389746cab7e931a584 (diff) | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Diffstat (limited to 'drivers/oprofile/timer_int.c')
| -rw-r--r-- | drivers/oprofile/timer_int.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c index 010725117dbb..3ef44624f510 100644 --- a/drivers/oprofile/timer_int.c +++ b/drivers/oprofile/timer_int.c | |||
| @@ -97,7 +97,7 @@ static struct notifier_block __refdata oprofile_cpu_notifier = { | |||
| 97 | .notifier_call = oprofile_cpu_notify, | 97 | .notifier_call = oprofile_cpu_notify, |
| 98 | }; | 98 | }; |
| 99 | 99 | ||
| 100 | int __init oprofile_timer_init(struct oprofile_operations *ops) | 100 | int oprofile_timer_init(struct oprofile_operations *ops) |
| 101 | { | 101 | { |
| 102 | int rc; | 102 | int rc; |
| 103 | 103 | ||
| @@ -113,7 +113,7 @@ int __init oprofile_timer_init(struct oprofile_operations *ops) | |||
| 113 | return 0; | 113 | return 0; |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | void __exit oprofile_timer_exit(void) | 116 | void oprofile_timer_exit(void) |
| 117 | { | 117 | { |
| 118 | unregister_hotcpu_notifier(&oprofile_cpu_notifier); | 118 | unregister_hotcpu_notifier(&oprofile_cpu_notifier); |
| 119 | } | 119 | } |