Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 32717
b: refs/heads/master
c: dc8f5d2
h: refs/heads/master
i:
  32715: 948baa5
v: v3
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Jul 18, 2006
1 parent 4c9866b commit bc15358
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53ba5e09fe37518683ff8b3f28410ce0b9ed2f74
refs/heads/master: dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839
4 changes: 2 additions & 2 deletions trunk/arch/s390/kernel/head31.S
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ startup_continue:
.Lbss_end: .long _end
.Lparmaddr: .long PARMAREA
.Lsccbaddr: .long .Lsccb
.align 4096
.org 0x12000
.Lsccb:
.hword 0x1000 # length, one page
.byte 0x00,0x00,0x00
Expand All @@ -290,7 +290,7 @@ startup_continue:
.Lscpincr2:
.quad 0x00
.fill 3984,1,0
.align 4096
.org 0x13000

#ifdef CONFIG_SHARED_KERNEL
.org 0x100000
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/s390/kernel/head64.S
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ startup_continue:
.Lparmaddr:
.quad PARMAREA

.align 4096
.org 0x12000
.Lsccb:
.hword 0x1000 # length, one page
.byte 0x00,0x00,0x00
Expand All @@ -285,7 +285,7 @@ startup_continue:
.Lscpincr2:
.quad 0x00
.fill 3984,1,0
.align 4096
.org 0x13000

#ifdef CONFIG_SHARED_KERNEL
.org 0x100000
Expand Down

0 comments on commit bc15358

Please sign in to comment.