r3198 - branches/src/target/kernel/2.6.23.x/patches

[shoragan at sita.openmoko.org]

Author: shoragan
Date: 2007-10-16 20:03:00 +0200 (Tue, 16 Oct 2007)
New Revision: 3198

Modified:
   branches/src/target/kernel/2.6.23.x/patches/arm-atag-kexec.patch
Log:
Port arm-atag-kexec.patch to 2.6.23

Modified: branches/src/target/kernel/2.6.23.x/patches/arm-atag-kexec.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/arm-atag-kexec.patch	2007-10-16 17:54:28 UTC (rev 3197)
+++ branches/src/target/kernel/2.6.23.x/patches/arm-atag-kexec.patch	2007-10-16 18:03:00 UTC (rev 3198)
@@ -29,9 +29,10 @@
 Signed-off-by: Mike Westerhof <mwester at dls.net>
 ---
 
-diff -uprN linux-2.6.22.5.orig/arch/arm/kernel/relocate_kernel.S linux-2.6.22.5/arch/arm/kernel/relocate_kernel.S
---- linux-2.6.22.5.orig/arch/arm/kernel/relocate_kernel.S	2007-08-22 18:23:54.000000000 -0500
-+++ linux-2.6.22.5/arch/arm/kernel/relocate_kernel.S	2007-08-27 20:31:32.000000000 -0500
+Index: linux-2.6.23/arch/arm/kernel/relocate_kernel.S
+===================================================================
+--- linux-2.6.23.orig/arch/arm/kernel/relocate_kernel.S
++++ linux-2.6.23/arch/arm/kernel/relocate_kernel.S
 @@ -7,6 +7,23 @@
  	.globl relocate_new_kernel
  relocate_new_kernel:
@@ -56,7 +57,7 @@
  	ldr	r0,kexec_indirection_page
  	ldr	r1,kexec_start_address
  
-@@ -50,7 +67,7 @@ relocate_new_kernel:
+@@ -50,7 +67,7 @@
  	mov lr,r1
  	mov r0,#0
  	ldr r1,kexec_mach_type
@@ -65,7 +66,7 @@
  	mov pc,lr
  
  	.globl kexec_start_address
-@@ -65,6 +82,16 @@ kexec_indirection_page:
+@@ -65,6 +82,16 @@
  kexec_mach_type:
  	.long	0x0
  
@@ -82,18 +83,19 @@
  relocate_new_kernel_end:
  
  	.globl relocate_new_kernel_size
-diff -uprN linux-2.6.22.5.orig/arch/arm/kernel/setup.c linux-2.6.22.5/arch/arm/kernel/setup.c
---- linux-2.6.22.5.orig/arch/arm/kernel/setup.c	2007-08-22 18:23:54.000000000 -0500
-+++ linux-2.6.22.5/arch/arm/kernel/setup.c	2007-08-27 20:31:32.000000000 -0500
-@@ -23,6 +23,7 @@
- #include <linux/cpu.h>
+Index: linux-2.6.23/arch/arm/kernel/setup.c
+===================================================================
+--- linux-2.6.23.orig/arch/arm/kernel/setup.c
++++ linux-2.6.23/arch/arm/kernel/setup.c
+@@ -24,6 +24,7 @@
  #include <linux/interrupt.h>
  #include <linux/smp.h>
+ #include <linux/fs.h>
 +#include <linux/kexec.h>
  
  #include <asm/cpu.h>
  #include <asm/elf.h>
-@@ -767,6 +768,23 @@ static int __init customize_machine(void
+@@ -770,6 +771,23 @@
  }
  arch_initcall(customize_machine);
  
@@ -117,8 +119,8 @@
  void __init setup_arch(char **cmdline_p)
  {
  	struct tag *tags = (struct tag *)&init_tags;
-@@ -783,6 +801,13 @@ void __init setup_arch(char **cmdline_p)
- 	if (mdesc->boot_params)
+@@ -788,6 +806,13 @@
+ 	else if (mdesc->boot_params)
  		tags = phys_to_virt(mdesc->boot_params);
  
 +#ifdef CONFIG_KEXEC
@@ -131,9 +133,10 @@
  	/*
  	 * If we have the old style parameters, convert them to
  	 * a tag list.
-diff -uprN linux-2.6.22.5.orig/include/asm-arm/kexec.h linux-2.6.22.5/include/asm-arm/kexec.h
---- linux-2.6.22.5.orig/include/asm-arm/kexec.h	2007-08-22 18:23:54.000000000 -0500
-+++ linux-2.6.22.5/include/asm-arm/kexec.h	2007-08-27 20:31:32.000000000 -0500
+Index: linux-2.6.23/include/asm-arm/kexec.h
+===================================================================
+--- linux-2.6.23.orig/include/asm-arm/kexec.h
++++ linux-2.6.23/include/asm-arm/kexec.h
 @@ -14,6 +14,8 @@
  
  #define KEXEC_ARCH KEXEC_ARCH_ARM