diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:47:44 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:47:44 -0400 |
| commit | 1fc74af81b556d0582fd8aed1cef4a039b7b5051 (patch) | |
| tree | 2bc9183a1f49bc7e7102723664a195ed60efe8ea /arch/arm/boot/compressed/vmlinux.lds.in | |
| parent | 22648cbcf5efd94c2632b3fe8c5c90ae54df928d (diff) | |
| parent | fd454c1ab28387cc03618ef84cb172fa9f8fdeb4 (diff) | |
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into linaro-3.0linux-linaro-3.0-2011.07-0
Diffstat (limited to 'arch/arm/boot/compressed/vmlinux.lds.in')
| -rw-r--r-- | arch/arm/boot/compressed/vmlinux.lds.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.in index ea80abe7884..6c02db134f2 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.in +++ b/arch/arm/boot/compressed/vmlinux.lds.in @@ -47,6 +47,9 @@ SECTIONS .got : { *(.got) } _got_end = .; .got.plt : { *(.got.plt) } + + /* ensure the zImage file size is always a multiple of 64 bits */ + .pad : { BYTE(0); . = ALIGN(8); } _edata = .; . = BSS_START; |