summaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-03-30 11:29:38 +0200
committerMichal Simek <monstr@monstr.eu>2012-03-30 12:11:46 +0200
commit90c0d80daa82fa9cbaa85d1a787375b33877d2d4 (patch)
tree04b714fb23ec234e462556e468d32f2b304b7c51 /arch/microblaze
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next (diff)
downloadlinux-90c0d80daa82fa9cbaa85d1a787375b33877d2d4.tar.xz
linux-90c0d80daa82fa9cbaa85d1a787375b33877d2d4.zip
microblaze: Add missing headers caused by disintegration asm/system.h
It should be the part of patch "Disintegrate asm/system.h for Microblaze" (sha1: c40d04df152a1111c5bbcb632278394dabd2b73d) Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/include/asm/cmpxchg.h2
-rw-r--r--arch/microblaze/kernel/unwind.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/cmpxchg.h b/arch/microblaze/include/asm/cmpxchg.h
index 0094859abd9b..538afc0ab9f3 100644
--- a/arch/microblaze/include/asm/cmpxchg.h
+++ b/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/arch/microblaze/kernel/unwind.c b/arch/microblaze/kernel/unwind.c
index 9781a528cfc9..6be4ae3c3351 100644
--- a/arch/microblaze/kernel/unwind.c
+++ b/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;