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 branch 'linus' into cpus4096
[pandora-kernel.git]
/
arch
/
sparc64
/
kernel
/
smp.c
diff --git
a/arch/sparc64/kernel/smp.c
b/arch/sparc64/kernel/smp.c
index
fa63c68
..
c099d96
100644
(file)
--- a/
arch/sparc64/kernel/smp.c
+++ b/
arch/sparc64/kernel/smp.c
@@
-807,7
+807,6
@@
extern unsigned long xcall_call_function;
* smp_call_function(): Run a function on all other CPUs.
* @func: The function to run. This must be fast and non-blocking.
* @info: An arbitrary pointer to pass to the function.
* smp_call_function(): Run a function on all other CPUs.
* @func: The function to run. This must be fast and non-blocking.
* @info: An arbitrary pointer to pass to the function.
- * @nonatomic: currently unused.
* @wait: If true, wait (atomically) until function has completed on other CPUs.
*
* Returns 0 on success, else a negative status code. Does not return until
* @wait: If true, wait (atomically) until function has completed on other CPUs.
*
* Returns 0 on success, else a negative status code. Does not return until
@@
-816,8
+815,8
@@
extern unsigned long xcall_call_function;
* You must not call this function with disabled interrupts or from a
* hardware interrupt handler or from a bottom half handler.
*/
* You must not call this function with disabled interrupts or from a
* hardware interrupt handler or from a bottom half handler.
*/
-static int smp_call_function_mask(void (*func)(void *info), void *info,
-
int nonatomic,
int wait, cpumask_t mask)
+static int s
parc64_s
mp_call_function_mask(void (*func)(void *info), void *info,
+
int wait, cpumask_t mask)
{
struct call_data_struct data;
int cpus;
{
struct call_data_struct data;
int cpus;
@@
-852,11
+851,9
@@
out_unlock:
return 0;
}
return 0;
}
-int smp_call_function(void (*func)(void *info), void *info,
- int nonatomic, int wait)
+int smp_call_function(void (*func)(void *info), void *info, int wait)
{
{
- return smp_call_function_mask(func, info, nonatomic, wait,
- cpu_online_map);
+ return sparc64_smp_call_function_mask(func, info, wait, cpu_online_map);
}
void smp_call_function_client(int irq, struct pt_regs *regs)
}
void smp_call_function_client(int irq, struct pt_regs *regs)
@@
-893,7
+890,7
@@
static void tsb_sync(void *info)
void smp_tsb_sync(struct mm_struct *mm)
{
void smp_tsb_sync(struct mm_struct *mm)
{
- s
mp_call_function_mask(tsb_sync, mm, 0
, 1, mm->cpu_vm_mask);
+ s
parc64_smp_call_function_mask(tsb_sync, mm
, 1, mm->cpu_vm_mask);
}
extern unsigned long xcall_flush_tlb_mm;
}
extern unsigned long xcall_flush_tlb_mm;