Message ID | c7200cac67169527cd2fff3b8b553c74edb1e1ee.1406280732.git.ian.campbell@citrix.com |
---|---|
State | Accepted |
Commit | 47087e8d067b0f7f72128d02e37bbf1dcfc8b843 |
Headers | show |
Hi Ian, On 07/25/2014 10:32 AM, Ian Campbell wrote: > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Julien Grall <julien.grall@linaro.org> Regards, > --- > xen/arch/arm/arm32/head.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S > index ec57974..16d76f4 100644 > --- a/xen/arch/arm/arm32/head.S > +++ b/xen/arch/arm/arm32/head.S > @@ -378,7 +378,7 @@ paging: > 1: > > /* Map fixmap into boot_second */ > - ldr r1, =boot_second /* r1 := vaddr (xen_fixmap) */ > + ldr r1, =boot_second /* r1 := vaddr (boot_second) */ > ldr r2, =xen_fixmap > add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ > orr r2, r2, #PT_UPPER(PT) >
diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index ec57974..16d76f4 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -378,7 +378,7 @@ paging: 1: /* Map fixmap into boot_second */ - ldr r1, =boot_second /* r1 := vaddr (xen_fixmap) */ + ldr r1, =boot_second /* r1 := vaddr (boot_second) */ ldr r2, =xen_fixmap add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ orr r2, r2, #PT_UPPER(PT)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- xen/arch/arm/arm32/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)