diff options
| author | Colin Cross <ccross@android.com> | 2011-10-20 14:33:29 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-20 14:33:29 -0700 |
| commit | 0746558a93c99fbe3ad927812ccf4809922b4fd6 (patch) | |
| tree | 30092639b2d9df46bc69a18214fed76a5aba4ee1 /arch/arm/include/asm | |
| parent | da469b78ee1c38e0a0777024a2b262b27cfa723c (diff) | |
| parent | 108376f4f45f772db0addd3ee6f601161c1d3a59 (diff) | |
| download | kernel_samsung_tuna-0746558a93c99fbe3ad927812ccf4809922b4fd6.zip kernel_samsung_tuna-0746558a93c99fbe3ad927812ccf4809922b4fd6.tar.gz kernel_samsung_tuna-0746558a93c99fbe3ad927812ccf4809922b4fd6.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/hardirq.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/irq.h | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/smp.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/include/asm/hardirq.h b/arch/arm/include/asm/hardirq.h index 89ad180..2635c8b 100644 --- a/arch/arm/include/asm/hardirq.h +++ b/arch/arm/include/asm/hardirq.h @@ -5,7 +5,7 @@ #include <linux/threads.h> #include <asm/irq.h> -#define NR_IPI 5 +#define NR_IPI 6 typedef struct { unsigned int __softirq_pending; diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 904d0d2..2faf2e0 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -27,6 +27,9 @@ extern void migrate_irqs(void); extern void asm_do_IRQ(unsigned int, struct pt_regs *); void init_IRQ(void); +void arch_trigger_all_cpu_backtrace(void); +#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace + #endif #endif diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h index e42d96a..74f288f 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h @@ -93,4 +93,6 @@ extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); */ extern void show_local_irqs(struct seq_file *, int); +extern void smp_send_all_cpu_backtrace(void); + #endif /* ifndef __ASM_ARM_SMP_H */ |