X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=arch%2Farm%2Finclude%2Fasm%2Fsystem.h;h=1344f5f7bc790a0bfdeb823cc3daea41cdf21486;hp=984014b92647a8a1a093f8b46ce05dfd729ca473;hb=a4cb4b1277a499ebced7f7534d5cfb11a30eb224;hpb=42a0ddcd484d0470d4c1b114ffb6be1d35f8ac6b

diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index 984014b92647..1344f5f7bc79 100644
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -80,6 +80,14 @@ struct siginfo;
 void arm_notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,
 		unsigned long err, unsigned long trap);
 
+#ifdef CONFIG_ARM_LPAE
+#define FAULT_CODE_ALIGNMENT	33
+#define FAULT_CODE_DEBUG	34
+#else
+#define FAULT_CODE_ALIGNMENT	1
+#define FAULT_CODE_DEBUG	2
+#endif
+
 void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
 				       struct pt_regs *),
 		     int sig, int code, const char *name);
@@ -101,6 +109,7 @@ extern int __pure cpu_architecture(void);
 extern void cpu_init(void);
 
 void arm_machine_restart(char mode, const char *cmd);
+void soft_restart(unsigned long);
 extern void (*arm_pm_restart)(char str, const char *cmd);
 
 #define UDBG_UNDEFINED	(1 << 0)
@@ -108,6 +117,7 @@ extern void (*arm_pm_restart)(char str, const char *cmd);
 #define UDBG_BADABORT	(1 << 2)
 #define UDBG_SEGV	(1 << 3)
 #define UDBG_BUS	(1 << 4)
+#define UDBG_SEGV_SHORT	(1 << 8)
 
 extern unsigned int user_debug;