git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
kernel
/
time
/
tick-broadcast.c
diff --git
a/kernel/time/tick-broadcast.c
b/kernel/time/tick-broadcast.c
index
877dbed
..
c2ec250
100644
(file)
--- a/
kernel/time/tick-broadcast.c
+++ b/
kernel/time/tick-broadcast.c
@@
-205,11
+205,11
@@
static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
* Powerstate information: The system enters/leaves a state, where
* affected devices might stop
*/
* Powerstate information: The system enters/leaves a state, where
* affected devices might stop
*/
-static void tick_do_broadcast_on_off(
void *why
)
+static void tick_do_broadcast_on_off(
unsigned long *reason
)
{
struct clock_event_device *bc, *dev;
struct tick_device *td;
{
struct clock_event_device *bc, *dev;
struct tick_device *td;
- unsigned long flags
, *reason = why
;
+ unsigned long flags;
int cpu, bc_stopped;
spin_lock_irqsave(&tick_broadcast_lock, flags);
int cpu, bc_stopped;
spin_lock_irqsave(&tick_broadcast_lock, flags);
@@
-276,8
+276,7
@@
void tick_broadcast_on_off(unsigned long reason, int *oncpu)
printk(KERN_ERR "tick-broadcast: ignoring broadcast for "
"offline CPU #%d\n", *oncpu);
else
printk(KERN_ERR "tick-broadcast: ignoring broadcast for "
"offline CPU #%d\n", *oncpu);
else
- smp_call_function_single(*oncpu, tick_do_broadcast_on_off,
- &reason, 1);
+ tick_do_broadcast_on_off(&reason);
}
/*
}
/*