← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/kernel/relocate_kernel.S

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/kernel/relocate_kernel.S
7
7
        .globl relocate_new_kernel
8
8
relocate_new_kernel:
9
9
 
10
 
        ldr     r0,.Lkexec_indirection_page
11
 
        ldr     r1,.Lkexec_start_address
 
10
        ldr     r0,kexec_indirection_page
 
11
        ldr     r1,kexec_start_address
12
12
 
13
13
        /*
14
14
         * If there is no indirection page (we are doing crashdumps)
55
55
        /* Jump to relocated kernel */
56
56
        mov lr,r1
57
57
        mov r0,#0
58
 
        ldr r1,.Lkexec_mach_type
59
 
        ldr r2,.Lkexec_boot_atags
 
58
        ldr r1,kexec_mach_type
 
59
        ldr r2,kexec_boot_atags
60
60
        mov pc,lr
61
61
 
62
62
        .align
63
63
 
64
64
        .globl kexec_start_address
65
65
kexec_start_address:
66
 
.Lkexec_start_address:
67
66
        .long   0x0
68
67
 
69
68
        .globl kexec_indirection_page
70
69
kexec_indirection_page:
71
 
.Lkexec_indirection_page:
72
70
        .long   0x0
73
71
 
74
72
        .globl kexec_mach_type
75
73
kexec_mach_type:
76
 
.Lkexec_mach_type:
77
74
        .long   0x0
78
75
 
79
76
        /* phy addr of the atags for the new kernel */
80
77
        .globl kexec_boot_atags
81
78
kexec_boot_atags:
82
 
.Lkexec_boot_atags:
83
79
        .long   0x0
84
80
 
85
81
relocate_new_kernel_end: