Note this patch applies against rt:origin/master
I guess it relies on a specific topic but I can't find which one.
--
Latest -rt tree fails to build:
arch/x86/kernel/nmi.c: In function ‘nmi_watchdog_tick’:
arch/x86/kernel/nmi.c:463: erreur: implicit declaration of function ‘__profile_tick’
make[1]: *** [arch/x86/kernel/nmi.o] Erreur 1
make: *** [arch/x86/kernel] Erreur 2
nmi.c uses __profile_tick() but lacks its prototype, it needs to include
linux/profile.c
Also, __profile_tick() is missing an off case (!CONFIG_PROFILING) on linux/profile.h
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index c9afd16..4f26868 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -26,6 +26,7 @@
#include <linux/kernel_stat.h>
#include <linux/kdebug.h>
#include <linux/smp.h>
+#include <linux/profile.h>
#include <asm/i8259.h>
#include <asm/io_apic.h>
diff --git a/include/linux/profile.h b/include/linux/profile.h
index 2e1de8a..e440411 100644
--- a/include/linux/profile.h
+++ b/include/linux/profile.h
@@ -97,6 +97,11 @@ static inline int profile_init(void)
return 0;
}
+static inline void __profile_tick(int type, struct pt_regs *regs)
+{
+ return;
+}
+
static inline void profile_tick(int type)
{
return;
--
