diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /arch/sparc/include/asm/nmi.h | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/sparc/include/asm/nmi.h')
| -rw-r--r-- | arch/sparc/include/asm/nmi.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/nmi.h b/arch/sparc/include/asm/nmi.h new file mode 100644 index 000000000000..fbd546dd4feb --- /dev/null +++ b/arch/sparc/include/asm/nmi.h | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | #ifndef __NMI_H | ||
| 2 | #define __NMI_H | ||
| 3 | |||
| 4 | extern int __init nmi_init(void); | ||
| 5 | extern void perfctr_irq(int irq, struct pt_regs *regs); | ||
| 6 | extern void nmi_adjust_hz(unsigned int new_hz); | ||
| 7 | |||
| 8 | extern int nmi_usable; | ||
| 9 | |||
| 10 | #endif /* __NMI_H */ | ||