projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/battery-2.6
[linux-block.git]
/
include
/
asm-arm
/
smp.h
diff --git
a/include/asm-arm/smp.h
b/include/asm-arm/smp.h
index fe45f7f612230be865e49497809f5ecf1aa68021..af99636db400e7e8cfbe81956faa1d84f11ebdf2 100644
(file)
--- a/
include/asm-arm/smp.h
+++ b/
include/asm-arm/smp.h
@@
-10,7
+10,6
@@
#ifndef __ASM_ARM_SMP_H
#define __ASM_ARM_SMP_H
#ifndef __ASM_ARM_SMP_H
#define __ASM_ARM_SMP_H
-#include <linux/config.h>
#include <linux/threads.h>
#include <linux/cpumask.h>
#include <linux/thread_info.h>
#include <linux/threads.h>
#include <linux/cpumask.h>
#include <linux/thread_info.h>
@@
-61,6
+60,11
@@
extern void smp_cross_call(cpumask_t callmap);
*/
extern void smp_send_timer(void);
*/
extern void smp_send_timer(void);
+/*
+ * Broadcast a clock event to other CPUs.
+ */
+extern void smp_timer_broadcast(cpumask_t mask);
+
/*
* Boot a secondary CPU, and assign it the specified idle task.
* This also gives us the initial stack to use for this CPU.
/*
* Boot a secondary CPU, and assign it the specified idle task.
* This also gives us the initial stack to use for this CPU.
@@
-97,11
+101,12
@@
extern void platform_cpu_die(unsigned int cpu);
extern int platform_cpu_kill(unsigned int cpu);
extern void platform_cpu_enable(unsigned int cpu);
extern int platform_cpu_kill(unsigned int cpu);
extern void platform_cpu_enable(unsigned int cpu);
-#ifdef CONFIG_LOCAL_TIMERS
/*
/*
- *
Setup a local timer interrupt for a CPU
.
+ *
Local timer interrupt handling function (can be IPI'ed)
.
*/
*/
-extern void local_timer_setup(unsigned int cpu);
+extern void local_timer_interrupt(void);
+
+#ifdef CONFIG_LOCAL_TIMERS
/*
* Stop a local timer interrupt.
/*
* Stop a local timer interrupt.
@@
-115,16
+120,17
@@
extern int local_timer_ack(void);
#else
#else
-static inline void local_timer_setup(unsigned int cpu)
-{
-}
-
static inline void local_timer_stop(unsigned int cpu)
{
}
#endif
static inline void local_timer_stop(unsigned int cpu)
{
}
#endif
+/*
+ * Setup a local timer interrupt for a CPU.
+ */
+extern void local_timer_setup(unsigned int cpu);
+
/*
* show local interrupt info
*/
/*
* show local interrupt info
*/