From 2d65bfe5d7d45f23774848f1128a2f8a1476e788 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Fri, 30 Mar 2012 11:29:38 +0200
Subject: [PATCH] --- yaml --- r: 298502 b: refs/heads/master c:
 90c0d80daa82fa9cbaa85d1a787375b33877d2d4 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/microblaze/include/asm/cmpxchg.h | 2 ++
 trunk/arch/microblaze/kernel/unwind.c       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7dfc46c7b298..2099002d8e61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a4770e335bd4df0a4577146f76e116ab6e23f40
+refs/heads/master: 90c0d80daa82fa9cbaa85d1a787375b33877d2d4
diff --git a/trunk/arch/microblaze/include/asm/cmpxchg.h b/trunk/arch/microblaze/include/asm/cmpxchg.h
index 0094859abd9b..538afc0ab9f3 100644
--- a/trunk/arch/microblaze/include/asm/cmpxchg.h
+++ b/trunk/arch/microblaze/include/asm/cmpxchg.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_MICROBLAZE_CMPXCHG_H
 #define _ASM_MICROBLAZE_CMPXCHG_H
 
+#include <linux/irqflags.h>
+
 void __bad_xchg(volatile void *ptr, int size);
 
 static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
diff --git a/trunk/arch/microblaze/kernel/unwind.c b/trunk/arch/microblaze/kernel/unwind.c
index 9781a528cfc9..6be4ae3c3351 100644
--- a/trunk/arch/microblaze/kernel/unwind.c
+++ b/trunk/arch/microblaze/kernel/unwind.c
@@ -24,6 +24,7 @@
 #include <asm/sections.h>
 #include <asm/exceptions.h>
 #include <asm/unwind.h>
+#include <asm/switch_to.h>
 
 struct stack_trace;