Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[mv-sheeva.git] / include / asm-arm / kexec.h

diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h
index b5b030ef633d67d0fc254fcefea1d110687ab775..c8986bb99ed5515f6d2191480cdd61576e76690c 100644 (file)
--- a/include/asm-arm/kexec.h
+++ b/include/asm-arm/kexec.h
@@ -8,12 +8,15 @@
 /* Maximum address we can reach in physical address mode */
 #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
 /* Maximum address we can use for the control code buffer */
-#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)
 
 #define KEXEC_CONTROL_CODE_SIZE        4096
 
 #define KEXEC_ARCH KEXEC_ARCH_ARM
 
+#define KEXEC_ARM_ATAGS_OFFSET  0x1000
+#define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
+
 #ifndef __ASSEMBLY__
 
 struct kimage;