diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-26 19:51:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-26 19:51:23 -0400 |
| commit | f436ab43614f105a4685c976a85a171bc112c802 (patch) | |
| tree | 21db536f54a642c627008c664e2679c0ff3ccbc3 /arch/arm/boot/compressed/head.S | |
| parent | 6cd236e0057704d1f5c77908374079e021c83928 (diff) | |
| parent | 0c07f6115b779ae4597749d47dec228c6d2d1c7c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4449/1: more entries in arch/arm/boot/.gitignore
[ARM] 4452/1: Force the literal pool dump before reloc_end
[ARM] Update show_regs/oops register format
[ARM] Add support for pause_on_oops and display preempt/smp options
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 23348e9561b9..680ea6ed77b8 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -836,6 +836,7 @@ memdump: mov r12, r0 | |||
| 836 | mov pc, r10 | 836 | mov pc, r10 |
| 837 | #endif | 837 | #endif |
| 838 | 838 | ||
| 839 | .ltorg | ||
| 839 | reloc_end: | 840 | reloc_end: |
| 840 | 841 | ||
| 841 | .align | 842 | .align |