Patch "x86/mshyperv: Remove excess #includes from mshyperv.h" has been added to the 4.11-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/mshyperv: Remove excess #includes from mshyperv.h
to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-mshyperv-remove-excess-includes-from-mshyperv.h.patch
and it can be found in the queue-4.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
26fcd952d5c977a94ac64bb44ed409e37607b2c9Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <[email protected]>
Date: Fri, 23 Jun 2017 10:50:38 +0200
Subject: x86/mshyperv: Remove excess #includes from mshyperv.h
From: Thomas Gleixner <[email protected]>
commit 26fcd952d5c977a94ac64bb44ed409e37607b2c9 upstream.
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.
--- arch/x86/include/asm/mshyperv.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/include/asm/mshyperv.h +1 -2
@@ -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> /*
Patches currently in stable-queue which might be from [email protected] are
queue-4.11/revert-x86-entry-fix-the-end-of-the-stack-for-newly-forked-tasks.patch queue-4.11/perf-x86-intel-uncore-fix-wrong-box-pointer-check.patch queue-4.11/x86-boot-kaslr-fix-kexec-crash-due-to-virt_addr-calculation-bug.patch queue-4.11/x86-mshyperv-remove-excess-includes-from-mshyperv.h.patch queue-4.11/x86-intel_rdt-fix-memory-leak-on-mount-failure.patch queue-4.11/x86-mm-fix-boot-crash-caused-by-incorrect-loop-count-calculation-in-sync_global_pgds.patch queue-4.11/perf-x86-fix-spurious-nmi-with-pebs-load-latency-event.patch queue-4.11/x86-mpx-correctly-report-do_mpx_bt_fault-failures-to-user-space.patch queue-4.11/x86-mm-fix-flush_tlb_page-on-xen.patch queue-4.11/pinctrl-amd-use-regular-interrupt-instead-of-chained.patch