git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
head31.S
diff --git
a/arch/s390/kernel/head31.S
b/arch/s390/kernel/head31.S
index
1bbcc49
..
b8f8dc1
100644
(file)
--- a/
arch/s390/kernel/head31.S
+++ b/
arch/s390/kernel/head31.S
@@
-82,7
+82,7
@@
startup_continue:
_ehead:
#ifdef CONFIG_SHARED_KERNEL
- .org 0x100000
+ .org 0x100000
- 0x11000 # head.o ends at 0x11000
#endif
#