Commit 61be7fde authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/nmi' into perf/core 



Conflicts:
	kernel/Makefile

Merge reason: Add the now complete topic, fix the conflict.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 12a81c8d eb703f98

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -1812,6 +1812,8 @@ and is between 256 and 4096 characters. It is defined in the file 


	nousb		[USB] Disable the USB subsystem



	nowatchdog	[KNL] Disable the lockup detector.



	nowb		[ARM]



	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.

arch/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -151,4 +151,11 @@ config HAVE_MIXED_BREAKPOINTS_REGS 
config HAVE_USER_RETURN_NOTIFIER

	bool



config HAVE_PERF_EVENTS_NMI

	bool

	help

	  System hardware can generate an NMI using the perf event

	  subsystem.  Also has support for calculating CPU cycle events

	  to determine how many clock cycles in a given period.



source "kernel/gcov/Kconfig"

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ config X86 
	select HAVE_HW_BREAKPOINT

	select HAVE_MIXED_BREAKPOINTS_REGS

	select PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI

	select ANON_INODES

	select HAVE_ARCH_KMEMCHECK

	select HAVE_USER_RETURN_NOTIFIER

arch/x86/include/asm/nmi.h

+2 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ int do_nmi_callback(struct pt_regs *regs, int cpu); 


extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);

extern int check_nmi_watchdog(void);

#if !defined(CONFIG_LOCKUP_DETECTOR)

extern int nmi_watchdog_enabled;

#endif

extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);

extern int reserve_perfctr_nmi(unsigned int);

extern void release_perfctr_nmi(unsigned int);

arch/x86/kernel/apic/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -2,7 +2,12 @@ 
# Makefile for local APIC drivers and for the IO-APIC code

#



obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o apic_noop.o probe_$(BITS).o ipi.o nmi.o

obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o apic_noop.o probe_$(BITS).o ipi.o

ifneq ($(CONFIG_HARDLOCKUP_DETECTOR),y)

obj-$(CONFIG_X86_LOCAL_APIC)	+= nmi.o

endif

obj-$(CONFIG_HARDLOCKUP_DETECTOR)	+= hw_nmi.o



obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o

obj-$(CONFIG_SMP)		+= ipi.o