diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /arch/m68k/platform/68328/head-ram.S | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'arch/m68k/platform/68328/head-ram.S')
| -rw-r--r-- | arch/m68k/platform/68328/head-ram.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/platform/68328/head-ram.S b/arch/m68k/platform/68328/head-ram.S index 7f1aeeacb219..5189ef926098 100644 --- a/arch/m68k/platform/68328/head-ram.S +++ b/arch/m68k/platform/68328/head-ram.S | |||
| @@ -76,8 +76,8 @@ pclp3: | |||
| 76 | beq pclp3 | 76 | beq pclp3 |
| 77 | #endif /* DEBUG */ | 77 | #endif /* DEBUG */ |
| 78 | moveal #0x007ffff0, %ssp | 78 | moveal #0x007ffff0, %ssp |
| 79 | moveal #_sbss, %a0 | 79 | moveal #__bss_start, %a0 |
| 80 | moveal #_ebss, %a1 | 80 | moveal #__bss_stop, %a1 |
| 81 | 81 | ||
| 82 | /* Copy 0 to %a0 until %a0 >= %a1 */ | 82 | /* Copy 0 to %a0 until %a0 >= %a1 */ |
| 83 | L1: | 83 | L1: |