root/trunk/patches/2.6.22/80-kexec-atags.patch

linux-2.6.22-rc5-armeb//arch/arm/kernel/setup.c

@@ -23 +23 @@
-#include <linux/cpu.h>
-#include <linux/interrupt.h>
-#include <linux/smp.h>
+#include <linux/kexec.h>
-
-#include <asm/cpu.h>
-#include <asm/elf.h>
@@ -769 +770 @@
-}
-arch_initcall(customize_machine);
-
+#ifdef CONFIG_KEXEC
+
+/* Physical addr of where the boot params should be for this machine */
+extern unsigned long kexec_boot_params_address;
+
+/* Physical addr of the buffer into which the boot params are copied */
+extern unsigned long kexec_boot_params_copy;
+
+/* Pointer to the boot params buffer, for manipulation and display */
+unsigned long kexec_boot_params;
+EXPORT_SYMBOL(kexec_boot_params);
+
+/* The buffer itself - make sure it is sized correctly */
+static unsigned long kexec_boot_params_buf[(KEXEC_BOOT_PARAMS_SIZE + 3) / 4];
+
+#endif
+
-void __init setup_arch(char **cmdline_p)
-{
-        struct tag *tags = (struct tag *)&init_tags;
@@ -785 +803 @@
-        if (mdesc->boot_params)
-                tags = phys_to_virt(mdesc->boot_params);
-
+#ifdef CONFIG_KEXEC
+        kexec_boot_params_address = mdesc->boot_params;
+        kexec_boot_params_copy = virt_to_phys(kexec_boot_params_buf);
+        kexec_boot_params = (unsigned long)kexec_boot_params_buf;
+        if (mdesc->boot_params)
+                memcpy((void *)kexec_boot_params, tags, KEXEC_BOOT_PARAMS_SIZE);
+#endif
-        /*
-         * If we have the old style parameters, convert them to
-         * a tag list.

linux-2.6.22-rc5-armeb//include/asm-arm/kexec.h

@@ -14 +14 @@
-
-#define KEXEC_ARCH KEXEC_ARCH_ARM
-
+#define KEXEC_BOOT_PARAMS_SIZE 1536
+
-#ifndef __ASSEMBLY__
-
-struct kimage;