Commit a4fd8b3a authored by Linus Torvalds's avatar Linus Torvalds

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
parents 5f4b37d8 26fcd952
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
#define _ASM_X86_MSHYPER_H #define _ASM_X86_MSHYPER_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/interrupt.h> #include <linux/atomic.h>
#include <linux/clocksource.h>
#include <asm/hyperv.h> #include <asm/hyperv.h>
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment