diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
| commit | 7894eaf291238a62a565e9e9777483beeb00eeae (patch) | |
| tree | 43c08830d2030d39d719f3f3d54a0e9b36554770 /arch/ia64/kernel/topology.c | |
| parent | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'arch/ia64/kernel/topology.c')
| -rw-r--r-- | arch/ia64/kernel/topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index b47476d655f1..7da4739f536e 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
| @@ -429,7 +429,7 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev) | |||
| 429 | * When a cpu is hot-plugged, do a check and initiate | 429 | * When a cpu is hot-plugged, do a check and initiate |
| 430 | * cache kobject if necessary | 430 | * cache kobject if necessary |
| 431 | */ | 431 | */ |
| 432 | static int __cpuinit cache_cpu_callback(struct notifier_block *nfb, | 432 | static int cache_cpu_callback(struct notifier_block *nfb, |
| 433 | unsigned long action, void *hcpu) | 433 | unsigned long action, void *hcpu) |
| 434 | { | 434 | { |
| 435 | unsigned int cpu = (unsigned long)hcpu; | 435 | unsigned int cpu = (unsigned long)hcpu; |