Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1674037

[tip:x86/urgent] x86/mshyperv: Remove excess #includes from mshyperv.h

Show all headers | View raw

Commit-ID:  26fcd952d5c977a94ac64bb44ed409e37607b2c9
Gitweb:     http://git.kernel.org/tip/26fcd952d5c977a94ac64bb44ed409e37607b2c9
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Fri, 23 Jun 2017 10:50:38 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 24 Jun 2017 08:48:51 +0200

x86/mshyperv: Remove excess #includes from mshyperv.h

A recent commit included linux/slab.h in linux/irq.h. This breaks the build
of vdso32 on a 64-bit kernel.

The reason is that linux/irq.h gets included into the vdso code via
linux/interrupt.h which is included from asm/mshyperv.h. That makes the
32-bit vdso compile fail, because slab.h includes the pgtable headers for
64-bit on a 64-bit build.

Neither linux/clocksource.h nor linux/interrupt.h are needed in the
mshyperv.h header file itself - it has a dependency on <linux/atomic.h>.

Remove the includes and unbreak the build.

Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: devel@linuxdriverproject.org
Fixes: dee863b571b0 ("hv: export current Hyper-V clocksource")
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1706231038460.2647@nanos
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/mshyperv.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index fba1007..d5acc27 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -2,8 +2,7 @@
 #define _ASM_X86_MSHYPER_H
 
 #include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/clocksource.h>
+#include <linux/atomic.h>
 #include <asm/hyperv.h>
 
 /*

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

x86/mshyperv: Remove unneeded includes from mshyperv.h Thomas Gleixner <tglx@linutronix.de> - 2017-06-23 11:00 +0200
  Re: x86/mshyperv: Remove unneeded includes from mshyperv.h Thomas Gleixner <tglx@linutronix.de> - 2017-06-23 12:10 +0200
  [tip:x86/urgent] x86/mshyperv: Remove excess #includes from  mshyperv.h tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-06-24 09:00 +0200

csiph-web