Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05cb007d authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86-64: Use the 32bit wd_ops for 64bit too. 



This mainly removes a lot of code, replacing it with calls into the new 32bit
perfctr-watchdog.c

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 09198e68

arch/x86_64/kernel/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ obj-y := process.o signal.o entry.o traps.o irq.o \ 
		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \

		x8664_ksyms.o i387.o syscall.o vsyscall.o \

		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \

		pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o

		pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \

		perfctr-watchdog.o



obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_X86_MCE)		+= mce.o therm_throt.o
@@ -57,3 +58,4 @@ i8237-y += ../../i386/kernel/i8237.o 
msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o

alternative-y			+= ../../i386/kernel/alternative.o

pcspeaker-y			+= ../../i386/kernel/pcspeaker.o

perfctr-watchdog-y		+= ../../i386/kernel/cpu/perfctr-watchdog.o

arch/x86_64/kernel/nmi.c

+33 −645

File changed.

Preview size limit exceeded, changes collapsed.

include/asm-x86_64/nmi.h

+9 −0
Original line number Diff line number Diff line
@@ -80,4 +80,13 @@ extern int unknown_nmi_panic; 
void __trigger_all_cpu_backtrace(void);

#define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()





void lapic_watchdog_stop(void);

int lapic_watchdog_init(unsigned nmi_hz);

int lapic_wd_event(unsigned nmi_hz);

unsigned lapic_adjust_nmi_hz(unsigned hz);

int lapic_watchdog_ok(void);

void disable_lapic_nmi_watchdog(void);

void enable_lapic_nmi_watchdog(void);



#endif /* ASM_NMI_H */