From b10e8de984e6c40a6debb73fa8dd4b8e8904c894 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 4 Jun 2012 16:27:54 +0000
Subject: [PATCH] --- yaml --- r: 311498 b: refs/heads/master c:
 2d773aa4810d4a612d1c879faacc38594cc3f841 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kernel/irq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4d8dc0a4a7f6..f7c7780a4aaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cb387ae758d97ee7396a82528c824b8dc510b8a
+refs/heads/master: 2d773aa4810d4a612d1c879faacc38594cc3f841
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index 7835a5e1ea5f..1b415027ec0e 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -277,7 +277,7 @@ EXPORT_SYMBOL(arch_local_irq_restore);
  * NOTE: This is called with interrupts hard disabled but not marked
  * as such in paca->irq_happened, so we need to resync this.
  */
-void restore_interrupts(void)
+void notrace restore_interrupts(void)
 {
 	if (irqs_disabled()) {
 		local_paca->irq_happened |= PACA_IRQ_HARD_DIS;