| Message ID | 20151211080623.GA14386@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 11, 2015 at 12:06 AM, Ingo Molnar <mingo@kernel.org> wrote: > > * Andy Lutomirski <luto@kernel.org> wrote: > >> diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h >> index f80d70009ff8..6d7d0e52ed5a 100644 >> --- a/arch/x86/include/asm/fixmap.h >> +++ b/arch/x86/include/asm/fixmap.h >> @@ -19,7 +19,6 @@ >> #include <asm/acpi.h> >> #include <asm/apicdef.h> >> #include <asm/page.h> >> -#include <asm/pvclock.h> >> #ifdef CONFIG_X86_32 >> #include <linux/threads.h> >> #include <asm/kmap_types.h> > > So this change triggered a build failure on 64-bit allmodconfig - fixed via the > patch below. Your change unearthed a latent bug, a missing header inclusion. > > Thanks, > > Ingo > > ============> > From d51953b0873358d13b189996e6976dfa12a9b59d Mon Sep 17 00:00:00 2001 > From: Ingo Molnar <mingo@kernel.org> > Date: Fri, 11 Dec 2015 09:01:30 +0100 > Subject: [PATCH] x86/platform/uv: Include clocksource.h for clocksource_touch_watchdog() > > This build failure triggers on 64-bit allmodconfig: > > arch/x86/platform/uv/uv_nmi.c:493:2: error: implicit declaration of function ‘clocksource_touch_watchdog’ [-Werror=implicit-function-declaration] > > which is caused by recent changes exposing a missing clocksource.h include > in uv_nmi.c: > > cc1e24fdb064 x86/vdso: Remove pvclock fixmap machinery > > this file got clocksource.h indirectly via fixmap.h - that stealth route > of header inclusion is now gone. > > Cc: Borislav Petkov <bp@alien8.de> > Cc: H. Peter Anvin <hpa@zytor.com> > Cc: Linus Torvalds <torvalds@linux-foundation.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Signed-off-by: Ingo Molnar <mingo@kernel.org> LGTM. --Andy -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
============> From d51953b0873358d13b189996e6976dfa12a9b59d Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@kernel.org> Date: Fri, 11 Dec 2015 09:01:30 +0100 Subject: [PATCH] x86/platform/uv: Include clocksource.h for clocksource_touch_watchdog() This build failure triggers on 64-bit allmodconfig: arch/x86/platform/uv/uv_nmi.c:493:2: error: implicit declaration of function ‘clocksource_touch_watchdog’ [-Werror=implicit-function-declaration] which is caused by recent changes exposing a missing clocksource.h include in uv_nmi.c: cc1e24fdb064 x86/vdso: Remove pvclock fixmap machinery this file got clocksource.h indirectly via fixmap.h - that stealth route of header inclusion is now gone. Cc: Borislav Petkov <bp@alien8.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/platform/uv/uv_nmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index 327f21c3bde1..8dd80050d705 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -28,6 +28,7 @@ #include <linux/nmi.h> #include <linux/sched.h> #include <linux/slab.h> +#include <linux/clocksource.h> #include <asm/apic.h> #include <asm/current.h>