summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJames Bottomley <jbottomley@parallels.com>2012-05-25 12:59:26 +0200
committerJames Bottomley <JBottomley@Parallels.com>2012-05-25 13:35:45 +0200
commit8275b91aad22144c4e2ea0c68b8d51090a81ba31 (patch)
tree6c748e9273a87bc25bb4507d7d9af1a1012ea593 /arch
parent[PARISC] fix TLB fault path on PA2.0 narrow systems (diff)
downloadlinux-8275b91aad22144c4e2ea0c68b8d51090a81ba31.tar.xz
linux-8275b91aad22144c4e2ea0c68b8d51090a81ba31.zip
[PARISC] Fix parisc compile failure after smp: Add task_struct argument to __cpu_up()
commit 8239c25f47d2b318156993b15f33900a86ea5e17 added an argument to our __cpu_up() function, but didn't notice we have an extra definition for this in asm/smp.h resulting in a compile failure. Fix by removing the extraneous parisc definition of __cpu_up(). While we're at it, remove the duplicated definition of smp_send_reschedule(). Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/include/asm/smp.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h
index e8f8037d872b..a5dc9066c6d8 100644
--- a/arch/parisc/include/asm/smp.h
+++ b/arch/parisc/include/asm/smp.h
@@ -25,7 +25,6 @@ typedef unsigned long address_t;
#define cpu_number_map(cpu) (cpu)
#define cpu_logical_map(cpu) (cpu)
-extern void smp_send_reschedule(int cpu);
extern void smp_send_all_nop(void);
extern void arch_send_call_function_single_ipi(int cpu);
@@ -50,6 +49,5 @@ static inline void __cpu_die (unsigned int cpu) {
while(1)
;
}
-extern int __cpu_up (unsigned int cpu);
#endif /* __ASM_SMP_H */