Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-25 12:01:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-25 12:01:56 -0700
commita4fd8b3accf43d407472e34403d4b0a4df5c0e71 (patch)
tree6562da0e4b50f623faf0551617063441a7a70d9a
parent5f4b37d8784da4217ede8f8bcd301686853dcf8c (diff)
parent26fcd952d5c977a94ac64bb44ed409e37607b2c9 (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner: "A single fix to unbreak the vdso32 build for 64bit kernels caused by excess #includes in the mshyperv header" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mshyperv: Remove excess #includes from mshyperv.h
-rw-r--r--arch/x86/include/asm/mshyperv.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index fba100713924..d5acc27ed1cc 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>
/*