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

Commit 3ccabd6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "Misc cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Remove unused IOMMU_STRESS Kconfig
  x86/extable: Mark exception handler functions visible
  x86/timer: Don't inline __const_udelay
  x86/headers: Remove duplicate #includes
parents 5289d300 782bf20c

arch/x86/Kconfig.debug

+0 −8
Original line number Diff line number Diff line
@@ -169,14 +169,6 @@ config IOMMU_DEBUG 
	  options. See Documentation/x86/x86_64/boot-options.txt for more

	  details.



config IOMMU_STRESS

	bool "Enable IOMMU stress-test mode"

	---help---

	  This option disables various optimizations in IOMMU related

	  code to do real stress testing of the IOMMU code. This option

	  will cause a performance drop and should only be enabled for

	  testing.



config IOMMU_LEAK

	bool "IOMMU leak tracing"

	depends on IOMMU_DEBUG && DMA_API_DEBUG

arch/x86/kernel/itmt.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/cpumask.h>

#include <linux/cpuset.h>

#include <linux/mutex.h>

#include <linux/sched.h>

#include <linux/sysctl.h>

#include <linux/nodemask.h>

arch/x86/kernel/process.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/dmi.h>

#include <linux/utsname.h>

#include <linux/stackprotector.h>

#include <linux/tick.h>

#include <linux/cpuidle.h>

#include <trace/events/power.h>

#include <linux/hw_breakpoint.h>

arch/x86/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ 
#include <asm/alternative.h>

#include <asm/prom.h>

#include <asm/microcode.h>

#include <asm/mmu_context.h>

#include <asm/kaslr.h>

#include <asm/unwind.h>

arch/x86/kernel/smpboot.c

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 
#include <asm/uv/uv.h>

#include <linux/mc146818rtc.h>

#include <asm/i8259.h>

#include <asm/realmode.h>

#include <asm/misc.h>

#include <asm/qspinlock.h>