diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-04-21 15:26:56 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-04-21 15:26:56 -0700 |
| commit | e2bca7c76a79b68506bfc3699beb74c0d41fe230 (patch) | |
| tree | 1b0269083de5ccc61a96b615ef271098df8e1b6a /arch/s390/kernel/head64.S | |
| parent | b3c7740a120c8a7775cb63b4d094466da5c01692 (diff) | |
| parent | d54a45e2533ef33678dc340298b022a289d2b3e3 (diff) | |
Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'arch/s390/kernel/head64.S')
| -rw-r--r-- | arch/s390/kernel/head64.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S index 39580e76865..1f70970de0a 100644 --- a/arch/s390/kernel/head64.S +++ b/arch/s390/kernel/head64.S @@ -21,7 +21,6 @@ startup_continue: larl %r1,sched_clock_base_cc mvc 0(8,%r1),__LC_LAST_UPDATE_CLOCK larl %r13,.LPG1 # get base - lmh %r0,%r15,.Lzero64-.LPG1(%r13) # clear high-order half lctlg %c0,%c15,.Lctl-.LPG1(%r13) # load control registers lg %r12,.Lparmaddr-.LPG1(%r13) # pointer to parameter area # move IPL device to lowcore @@ -67,7 +66,6 @@ startup_continue: .L4malign:.quad 0xffffffffffc00000 .Lscan2g:.quad 0x80000000 + 0x20000 - 8 # 2GB + 128K - 8 .Lnop: .long 0x07000700 -.Lzero64:.fill 16,4,0x0 .Lparmaddr: .quad PARMAREA .align 64 |