diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 17:02:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 17:12:03 -0400 |
commit | 59190f4213462f191fc0d22d39b1cf18ea39ca39 (patch) | |
tree | 8f30fa62ae7d8948e7974dfecede3d6a41ae3ec3 /drivers | |
parent | 64fd52a52077d3cd5a778ca031c0aaecf885eaa6 (diff) | |
parent | f6f88e9bfb6ced9871ed65ebe85c371de3c9e4be (diff) |
Merge branch 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits)
generic-ipi: more merge fallout
generic-ipi: merge fix
x86, visws: use mach-default/entry_arch.h
x86, visws: fix generic-ipi build
generic-ipi: fixlet
generic-ipi: fix s390 build bug
generic-ipi: fix linux-next tree build failure
fix: "smp_call_function: get rid of the unused nonatomic/retry argument"
fix: "smp_call_function: get rid of the unused nonatomic/retry argument"
fix "smp_call_function: get rid of the unused nonatomic/retry argument"
on_each_cpu(): kill unused 'retry' parameter
smp_call_function: get rid of the unused nonatomic/retry argument
sh: convert to generic helpers for IPI function calls
parisc: convert to generic helpers for IPI function calls
mips: convert to generic helpers for IPI function calls
m32r: convert to generic helpers for IPI function calls
arm: convert to generic helpers for IPI function calls
alpha: convert to generic helpers for IPI function calls
ia64: convert to generic helpers for IPI function calls
powerpc: convert to generic helpers for IPI function calls
...
Fix trivial conflicts due to rcu updates in kernel/rcupdate.c manually
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/processor_idle.c | 2 | ||||
-rw-r--r-- | drivers/char/agp/generic.c | 2 | ||||
-rw-r--r-- | drivers/char/sysrq.c | 2 | ||||
-rw-r--r-- | drivers/cpuidle/cpuidle.c | 2 | ||||
-rw-r--r-- | drivers/lguest/x86/core.c | 4 | ||||
-rw-r--r-- | drivers/watchdog/booke_wdt.c | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 556ee1585192..4976e5db2b3f 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -1339,7 +1339,7 @@ static void smp_callback(void *v) | |||
1339 | static int acpi_processor_latency_notify(struct notifier_block *b, | 1339 | static int acpi_processor_latency_notify(struct notifier_block *b, |
1340 | unsigned long l, void *v) | 1340 | unsigned long l, void *v) |
1341 | { | 1341 | { |
1342 | smp_call_function(smp_callback, NULL, 0, 1); | 1342 | smp_call_function(smp_callback, NULL, 1); |
1343 | return NOTIFY_OK; | 1343 | return NOTIFY_OK; |
1344 | } | 1344 | } |
1345 | 1345 | ||
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 564daaa6c7d0..eaa1a355bb32 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
@@ -1249,7 +1249,7 @@ static void ipi_handler(void *null) | |||
1249 | 1249 | ||
1250 | void global_cache_flush(void) | 1250 | void global_cache_flush(void) |
1251 | { | 1251 | { |
1252 | if (on_each_cpu(ipi_handler, NULL, 1, 1) != 0) | 1252 | if (on_each_cpu(ipi_handler, NULL, 1) != 0) |
1253 | panic(PFX "timed out waiting for the other CPUs!\n"); | 1253 | panic(PFX "timed out waiting for the other CPUs!\n"); |
1254 | } | 1254 | } |
1255 | EXPORT_SYMBOL(global_cache_flush); | 1255 | EXPORT_SYMBOL(global_cache_flush); |
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index dbce1263bdff..8fdfe9c871e3 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
@@ -215,7 +215,7 @@ static void showacpu(void *dummy) | |||
215 | 215 | ||
216 | static void sysrq_showregs_othercpus(struct work_struct *dummy) | 216 | static void sysrq_showregs_othercpus(struct work_struct *dummy) |
217 | { | 217 | { |
218 | smp_call_function(showacpu, NULL, 0, 0); | 218 | smp_call_function(showacpu, NULL, 0); |
219 | } | 219 | } |
220 | 220 | ||
221 | static DECLARE_WORK(sysrq_showallcpus, sysrq_showregs_othercpus); | 221 | static DECLARE_WORK(sysrq_showallcpus, sysrq_showregs_othercpus); |
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 23554b676d6e..5405769020a1 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c | |||
@@ -340,7 +340,7 @@ static void smp_callback(void *v) | |||
340 | static int cpuidle_latency_notify(struct notifier_block *b, | 340 | static int cpuidle_latency_notify(struct notifier_block *b, |
341 | unsigned long l, void *v) | 341 | unsigned long l, void *v) |
342 | { | 342 | { |
343 | smp_call_function(smp_callback, NULL, 0, 1); | 343 | smp_call_function(smp_callback, NULL, 1); |
344 | return NOTIFY_OK; | 344 | return NOTIFY_OK; |
345 | } | 345 | } |
346 | 346 | ||
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index 2e554a4ab337..95dfda52b4f9 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c | |||
@@ -478,7 +478,7 @@ void __init lguest_arch_host_init(void) | |||
478 | cpu_had_pge = 1; | 478 | cpu_had_pge = 1; |
479 | /* adjust_pge is a helper function which sets or unsets the PGE | 479 | /* adjust_pge is a helper function which sets or unsets the PGE |
480 | * bit on its CPU, depending on the argument (0 == unset). */ | 480 | * bit on its CPU, depending on the argument (0 == unset). */ |
481 | on_each_cpu(adjust_pge, (void *)0, 0, 1); | 481 | on_each_cpu(adjust_pge, (void *)0, 1); |
482 | /* Turn off the feature in the global feature set. */ | 482 | /* Turn off the feature in the global feature set. */ |
483 | clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); | 483 | clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); |
484 | } | 484 | } |
@@ -493,7 +493,7 @@ void __exit lguest_arch_host_fini(void) | |||
493 | if (cpu_had_pge) { | 493 | if (cpu_had_pge) { |
494 | set_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); | 494 | set_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); |
495 | /* adjust_pge's argument "1" means set PGE. */ | 495 | /* adjust_pge's argument "1" means set PGE. */ |
496 | on_each_cpu(adjust_pge, (void *)1, 0, 1); | 496 | on_each_cpu(adjust_pge, (void *)1, 1); |
497 | } | 497 | } |
498 | put_online_cpus(); | 498 | put_online_cpus(); |
499 | } | 499 | } |
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index c1ba0db48501..770824458d45 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
@@ -55,7 +55,7 @@ static void __booke_wdt_ping(void *data) | |||
55 | 55 | ||
56 | static void booke_wdt_ping(void) | 56 | static void booke_wdt_ping(void) |
57 | { | 57 | { |
58 | on_each_cpu(__booke_wdt_ping, NULL, 0, 0); | 58 | on_each_cpu(__booke_wdt_ping, NULL, 0); |
59 | } | 59 | } |
60 | 60 | ||
61 | static void __booke_wdt_enable(void *data) | 61 | static void __booke_wdt_enable(void *data) |
@@ -131,7 +131,7 @@ static int booke_wdt_open(struct inode *inode, struct file *file) | |||
131 | spin_lock(&booke_wdt_lock); | 131 | spin_lock(&booke_wdt_lock); |
132 | if (booke_wdt_enabled == 0) { | 132 | if (booke_wdt_enabled == 0) { |
133 | booke_wdt_enabled = 1; | 133 | booke_wdt_enabled = 1; |
134 | on_each_cpu(__booke_wdt_enable, NULL, 0, 0); | 134 | on_each_cpu(__booke_wdt_enable, NULL, 0); |
135 | printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " | 135 | printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " |
136 | "(wdt_period=%d)\n", booke_wdt_period); | 136 | "(wdt_period=%d)\n", booke_wdt_period); |
137 | } | 137 | } |
@@ -177,7 +177,7 @@ static int __init booke_wdt_init(void) | |||
177 | if (booke_wdt_enabled == 1) { | 177 | if (booke_wdt_enabled == 1) { |
178 | printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " | 178 | printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " |
179 | "(wdt_period=%d)\n", booke_wdt_period); | 179 | "(wdt_period=%d)\n", booke_wdt_period); |
180 | on_each_cpu(__booke_wdt_enable, NULL, 0, 0); | 180 | on_each_cpu(__booke_wdt_enable, NULL, 0); |
181 | } | 181 | } |
182 | spin_unlock(&booke_wdt_lock); | 182 | spin_unlock(&booke_wdt_lock); |
183 | 183 | ||