diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 07:54:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 07:54:00 -0800 |
| commit | 024bb9617e01716c5ac7d235f54483cc6018978f (patch) | |
| tree | 995fa77058bb980b891ca7cbe383399e1e81a8cb /arch/sparc/include/asm/irq_64.h | |
| parent | 25431e900dc47abb312c9ae8599e8c8ae038eb5a (diff) | |
| parent | 9b02605826903203d5301049c1f52e722584785c (diff) | |
| download | op-kernel-dev-024bb9617e01716c5ac7d235f54483cc6018978f.zip op-kernel-dev-024bb9617e01716c5ac7d235f54483cc6018978f.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Kill bogus TPC/address truncation during 32-bit faults.
sparc: fixup for sparseirq changes
sparc64: Validate kernel generated fault addresses on sparc64.
sparc64: On non-Niagara, need to touch NMI watchdog in NOHZ mode.
sparc64: Implement NMI watchdog on capable cpus.
sparc: Probe PMU type and record in sparc_pmu_type.
sparc64: Move generic PCR support code to seperate file.
Diffstat (limited to 'arch/sparc/include/asm/irq_64.h')
| -rw-r--r-- | arch/sparc/include/asm/irq_64.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h index d47d4a1..1934f2c 100644 --- a/arch/sparc/include/asm/irq_64.h +++ b/arch/sparc/include/asm/irq_64.h @@ -66,9 +66,6 @@ extern void virt_irq_free(unsigned int virt_irq); extern void __init init_IRQ(void); extern void fixup_irqs(void); -extern int register_perfctr_intr(void (*handler)(struct pt_regs *)); -extern void release_perfctr_intr(void (*handler)(struct pt_regs *)); - static inline void set_softint(unsigned long bits) { __asm__ __volatile__("wr %0, 0x0, %%set_softint" @@ -98,5 +95,6 @@ void __trigger_all_cpu_backtrace(void); extern void *hardirq_stack[NR_CPUS]; extern void *softirq_stack[NR_CPUS]; #define __ARCH_HAS_DO_SOFTIRQ +#define ARCH_HAS_NMI_WATCHDOG #endif |
