diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /include/asm-arm/smp.h | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'include/asm-arm/smp.h')
| -rw-r--r-- | include/asm-arm/smp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/smp.h b/include/asm-arm/smp.h index af99636db400..7fffa2404b8e 100644 --- a/include/asm-arm/smp.h +++ b/include/asm-arm/smp.h | |||
| @@ -101,6 +101,9 @@ extern void platform_cpu_die(unsigned int cpu); | |||
| 101 | extern int platform_cpu_kill(unsigned int cpu); | 101 | extern int platform_cpu_kill(unsigned int cpu); |
| 102 | extern void platform_cpu_enable(unsigned int cpu); | 102 | extern void platform_cpu_enable(unsigned int cpu); |
| 103 | 103 | ||
| 104 | extern void arch_send_call_function_single_ipi(int cpu); | ||
| 105 | extern void arch_send_call_function_ipi(cpumask_t mask); | ||
| 106 | |||
| 104 | /* | 107 | /* |
| 105 | * Local timer interrupt handling function (can be IPI'ed). | 108 | * Local timer interrupt handling function (can be IPI'ed). |
| 106 | */ | 109 | */ |