Merge branch 'cpus4096' into irq/threaded

Conflicts:
	arch/parisc/kernel/irq.c
	kernel/irq/handle.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 13 insertions, 21 deletions

diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
index c61d8b2ab8b..317ff1703d0 100644
--- a/arch/x86/include/asm/kexec.h
+++ b/arch/x86/include/asm/kexec.h
@@ -10,27 +10,12 @@
 #else
 # define PA_CONTROL_PAGE        0
 # define VA_CONTROL_PAGE        1
-# define PA_PGD                 2
-# define VA_PGD                 3
-# define PA_PUD_0               4
-# define VA_PUD_0               5
-# define PA_PMD_0               6
-# define VA_PMD_0               7
-# define PA_PTE_0               8
-# define VA_PTE_0               9
-# define PA_PUD_1               10
-# define VA_PUD_1               11
-# define PA_PMD_1               12
-# define VA_PMD_1               13
-# define PA_PTE_1               14
-# define VA_PTE_1               15
-# define PA_TABLE_PAGE          16
-# define PAGES_NR               17
+# define PA_TABLE_PAGE          2
+# define PA_SWAP_PAGE           3
+# define PAGES_NR               4
 #endif
 
-#ifdef CONFIG_X86_32
 # define KEXEC_CONTROL_CODE_MAX_SIZE    2048
-#endif
 
 #ifndef __ASSEMBLY__
 
@@ -151,15 +136,16 @@ relocate_kernel(unsigned long indirection_page,
                 unsigned int has_pae,
                 unsigned int preserve_context);
 #else
-NORET_TYPE void
+unsigned long
 relocate_kernel(unsigned long indirection_page,
                 unsigned long page_list,
-                unsigned long start_address) ATTRIB_NORET;
+                unsigned long start_address,
+                unsigned int preserve_context);
 #endif
 
-#ifdef CONFIG_X86_32
 #define ARCH_HAS_KIMAGE_ARCH
 
+#ifdef CONFIG_X86_32
 struct kimage_arch {
         pgd_t *pgd;
 #ifdef CONFIG_X86_PAE
@@ -169,6 +155,12 @@ struct kimage_arch {
         pte_t *pte0;
         pte_t *pte1;
 };
+#else
+struct kimage_arch {
+        pud_t *pud;
+        pmd_t *pmd;
+        pte_t *pte;
+};
 #endif
 
 #endif /* __ASSEMBLY__ */