diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:52:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:52:44 -0400 |
| commit | 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e (patch) | |
| tree | e0e70aa880b8c8f2c1a979438a523241f6193742 /kernel/profile.c | |
| parent | 9f1da23b631f92393f58f664348ffc5faeaddeb3 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'kernel/profile.c')
| -rw-r--r-- | kernel/profile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index 5a730fdb1a2c..68afe121e507 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -299,7 +299,7 @@ out: | |||
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | #ifdef CONFIG_HOTPLUG_CPU | 301 | #ifdef CONFIG_HOTPLUG_CPU |
| 302 | static int __devinit profile_cpu_callback(struct notifier_block *info, | 302 | static int profile_cpu_callback(struct notifier_block *info, |
| 303 | unsigned long action, void *__cpu) | 303 | unsigned long action, void *__cpu) |
| 304 | { | 304 | { |
| 305 | int node, cpu = (unsigned long)__cpu; | 305 | int node, cpu = (unsigned long)__cpu; |