]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
x86/platform/uv: Include clocksource.h for clocksource_touch_watchdog()
authorIngo Molnar <mingo@kernel.org>
Fri, 11 Dec 2015 08:01:30 +0000 (09:01 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 27 Feb 2017 01:23:50 +0000 (17:23 -0800)
Orabug: 25477822

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>
(cherry picked from commit d51953b0873358d13b189996e6976dfa12a9b59d)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
arch/x86/platform/uv/uv_nmi.c

index 6c2eb0167873f830ac4c978db8c641f22a89418c..5b187dc144055656e2abae35ef35703c267c302e 100644 (file)
@@ -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>