diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 02:13:12 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 02:13:12 +0200 |
commit | 328aa7a45af61bc0060c80847daa67fef7b9c0d0 (patch) | |
tree | 881a740801a9615e806ef7bf3830253a47f487a3 /arch/arm/boot/compressed/head.S | |
parent | 5864eaf2f7f0ec3366be0efe9e7a5fd0476e25cc (diff) | |
download | kernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.zip kernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.tar.gz kernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.tar.bz2 |
merged more from 3.0.101 that is not related to the platform
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
-rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 63cfa2e..e28de2a 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -186,7 +186,7 @@ restart: adr r0, LC0 * We might be running at a different address. We need * to fix up various pointers. */ - sub r0, r0, r1 @ calculate the delta offset + sub r0, r0, r1 @ calculate the delta offset add r6, r6, r0 @ _edata add r10, r10, r0 @ inflated kernel size location |