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

Commit c0853867 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/debug' into core/objtool, to pick up frame pointer fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6dc390ad 1923f3d0

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	clearcpuid=BITNUM [X86]

			Disable CPUID feature X for the kernel. See

			arch/x86/include/asm/cpufeature.h for the valid bit

			arch/x86/include/asm/cpufeatures.h for the valid bit

			numbers. Note the Linux specific bits are not necessarily

			stable over kernel options, but the vendor specific

			ones should be.

Documentation/x86/x86_64/boot-options.txt

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ Machine check 
		threshold to 1. Enabling this may make memory predictive failure

		analysis less effective if the bios sets thresholds for memory

		errors since we will not see details for all errors.

   mce=recovery

		Force-enable recoverable machine check code paths



   nomce (for compatibility with i386): same as mce=off

arch/x86/Kconfig.debug

+0 −10
Original line number Diff line number Diff line
@@ -350,16 +350,6 @@ config DEBUG_IMR_SELFTEST 


	  If unsure say N here.



config X86_DEBUG_STATIC_CPU_HAS

	bool "Debug alternatives"

	depends on DEBUG_KERNEL

	---help---

	  This option causes additional code to be generated which

	  fails if static_cpu_has() is used before alternatives have

	  run.



	  If unsure, say N.



config X86_DEBUG_FPU

	bool "Debug the x86 FPU code"

	depends on DEBUG_KERNEL

arch/x86/boot/cpuflags.h

+1 −1
Original line number Diff line number Diff line 
#ifndef BOOT_CPUFLAGS_H

#define BOOT_CPUFLAGS_H



#include <asm/cpufeature.h>

#include <asm/cpufeatures.h>

#include <asm/processor-flags.h>



struct cpu_features {

arch/x86/boot/mkcpustr.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#include "../include/asm/required-features.h"

#include "../include/asm/disabled-features.h"

#include "../include/asm/cpufeature.h"

#include "../include/asm/cpufeatures.h"

#include "../kernel/cpu/capflags.c"



int main(void)