projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[linux-block.git]
/
arch
/
x86
/
kernel
/
head_32.S
diff --git
a/arch/x86/kernel/head_32.S
b/arch/x86/kernel/head_32.S
index e65ddc62e1137a8a6f6f4cab04bfe28b9482e905..5dd87a89f011d89d5098fc582e794c5250fce3dd 100644
(file)
--- a/
arch/x86/kernel/head_32.S
+++ b/
arch/x86/kernel/head_32.S
@@
-292,7
+292,6
@@
ENDPROC(start_cpu0)
* If cpu hotplug is not supported then this code can go in init section
* which will be freed later
*/
-__CPUINIT
ENTRY(startup_32_smp)
cld
movl $(__BOOT_DS),%eax