public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Frederic Weisbecker <fweisbec@gmail.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-rt-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH -rt] nmi: fix a build error
Date: Thu, 12 Feb 2009 04:43:11 +0100	[thread overview]
Message-ID: <20090212034310.GA4809@nowhere> (raw)

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;


                 reply	other threads:[~2009-02-12  3:43 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090212034310.GA4809@nowhere \
    --to=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox