git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'generic-ipi' into generic-ipi-for-linus
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
cpu
/
mtrr
/
main.c
diff --git
a/arch/x86/kernel/cpu/mtrr/main.c
b/arch/x86/kernel/cpu/mtrr/main.c
index 105afe12beb0730f1c5fbb02443adae516794a08..6f23969c8fafe4f1dd2b4304a910c11483833f2d 100644
(file)
--- a/
arch/x86/kernel/cpu/mtrr/main.c
+++ b/
arch/x86/kernel/cpu/mtrr/main.c
@@
-223,7
+223,7
@@
static void set_mtrr(unsigned int reg, unsigned long base,
atomic_set(&data.gate,0);
/* Start the ball rolling on other CPUs */
atomic_set(&data.gate,0);
/* Start the ball rolling on other CPUs */
- if (smp_call_function(ipi_handler, &data,
1,
0) != 0)
+ if (smp_call_function(ipi_handler, &data, 0) != 0)
panic("mtrr: timed out waiting for other CPUs\n");
local_irq_save(flags);
panic("mtrr: timed out waiting for other CPUs\n");
local_irq_save(flags);
@@
-1682,7
+1682,7
@@
void mtrr_ap_init(void)
*/
void mtrr_save_state(void)
{
*/
void mtrr_save_state(void)
{
- smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1
, 1
);
+ smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1);
}
static int __init mtrr_init_finialize(void)
}
static int __init mtrr_init_finialize(void)