git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
boot
/
header.S
diff --git
a/arch/x86/boot/header.S
b/arch/x86/boot/header.S
index 1040f6e8010cd8b6ead2a20d0ec2171b16a5d13c..b31cc54b46410f89b4120702b1d1b018a79e204d 100644
(file)
--- a/
arch/x86/boot/header.S
+++ b/
arch/x86/boot/header.S
@@
-237,7
+237,7
@@
init_size: .long INIT_SIZE # kernel initialization size
# End of setup header #####################################################
- .section ".
init
text", "ax"
+ .section ".
entry
text", "ax"
start_of_setup:
#ifdef SAFE_RESET_DISK_CONTROLLER
# Reset the disk controller.