summaryrefslogtreecommitdiff
path: root/arch/sh/include/asm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-29 21:37:44 +0200
committerWolfgang Denk <wd@denx.de>2010-06-29 21:37:44 +0200
commit8515f081e4d5e1f22ee7d12ae72e3bf22eb88a76 (patch)
tree4f737fd4b4204b96acb35d969f343a56782ecefa /arch/sh/include/asm
parent953b7e629198fe2eb0adf272fb9140f2a4a51826 (diff)
parent754613f740368f847a2261c5c41b034ff5c51b1c (diff)
Merge branch 'master' of git://git.denx.de/u-boot-sh into next
Diffstat (limited to 'arch/sh/include/asm')
-rw-r--r--arch/sh/include/asm/system.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
index a62c42261d..56fd77acea 100644
--- a/arch/sh/include/asm/system.h
+++ b/arch/sh/include/asm/system.h
@@ -8,7 +8,7 @@
* from linux kernel code.
*/
-#include <linux/irqflags.h>
+#include <asm/irqflags.h>
#include <asm/types.h>
/*
@@ -272,4 +272,14 @@ void enable_hlt(void);
#define arch_align_stack(x) (x)
+static inline void trigger_address_error(void)
+{
+ __asm__ __volatile__ (
+ "ldc %0, sr\n\t"
+ "mov.l @%1, %0"
+ :
+ : "r" (0x10000000), "r" (0x80000001)
+ );
+}
+
#endif