Patched in Tegra support.

1 files changed, 6 insertions, 26 deletions

diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h
index 694bcd6bd92..bb729b84a21 100644
--- a/arch/s390/include/asm/kexec.h
+++ b/arch/s390/include/asm/kexec.h
@@ -1,5 +1,7 @@
 /*
- * Copyright IBM Corp. 2005
+ * include/asm-s390/kexec.h
+ *
+ * (C) Copyright IBM Corp. 2005
  *
  * Author(s): Rolf Adelsberger <adelsberger@de.ibm.com>
  *
@@ -8,8 +10,10 @@
 #ifndef _S390_KEXEC_H
 #define _S390_KEXEC_H
 
-#include <asm/processor.h>
+#ifdef __KERNEL__
 #include <asm/page.h>
+#endif
+#include <asm/processor.h>
 /*
  * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
  * I.e. Maximum page that is mapped directly into kernel memory,
@@ -26,36 +30,12 @@
 /* Not more than 2GB */
 #define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31)
 
-/* Maximum address we can use for the crash control pages */
-#define KEXEC_CRASH_CONTROL_MEMORY_LIMIT (-1UL)
-
 /* Allocate one page for the pdp and the second for the code */
 #define KEXEC_CONTROL_PAGE_SIZE 4096
 
-/* Alignment of crashkernel memory */
-#define KEXEC_CRASH_MEM_ALIGN HPAGE_SIZE
-
 /* The native architecture */
 #define KEXEC_ARCH KEXEC_ARCH_S390
 
-/*
- * Size for s390x ELF notes per CPU
- *
- * Seven notes plus zero note at the end: prstatus, fpregset, timer,
- * tod_cmp, tod_reg, control regs, and prefix
- */
-#define KEXEC_NOTE_BYTES \
-        (ALIGN(sizeof(struct elf_note), 4) * 8 + \
-         ALIGN(sizeof("CORE"), 4) * 7 + \
-         ALIGN(sizeof(struct elf_prstatus), 4) + \
-         ALIGN(sizeof(elf_fpregset_t), 4) + \
-         ALIGN(sizeof(u64), 4) + \
-         ALIGN(sizeof(u64), 4) + \
-         ALIGN(sizeof(u32), 4) + \
-         ALIGN(sizeof(u64) * 16, 4) + \
-         ALIGN(sizeof(u32), 4) \
-        )
-
 /* Provide a dummy definition to avoid build failures. */
 static inline void crash_setup_regs(struct pt_regs *newregs,
                                         struct pt_regs *oldregs) { }