Skip to contentSkip to conversation

x86/head_6.S: Add forgotten end marker

PATCH New Borislav Petkov 2 participants 2 messages Jun 25, 2016 – Jun 27, 2016 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/head_6.S: Add forgotten end marker

From: Borislav Petkov <[email protected]>

Add secondary_startup_64's end marker.

No functionality change.

Signed-off-by Borislav Petkov <[email protected]>
---
 arch/x86/kernel/head_64.S | 1 +
 1 file changed, 1 insertion(+)
arch/x86/kernel/head_64.S +1 -0
index 5df831ef1442..c7920ba69563 100644
@@ -299,6 +299,7 @@ ENTRY(secondary_startup_64)
 	pushq	$__KERNEL_CS	# set correct cs
 	pushq	%rax		# target address in negative space
 	lretq
+ENDPROC(secondary_startup_64)
 
 #include "verify_cpu.S"
Signature · 1 line
2.8.4
merge bot
#1 lore raw

[tip:x86/boot] x86/boot/64: Add forgotten end of function marker

x86/boot/64: Add forgotten end of function marker
Commit-ID:  dbf984d825935f61965bcfacfd8e8dfdaf3e8051
Gitweb:     http://git.kernel.org/tip/dbf984d825935f61965bcfacfd8e8dfdaf3e8051
Author:     Borislav Petkov <[email protected]>
AuthorDate: Sat, 25 Jun 2016 13:24:57 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 27 Jun 2016 12:20:31 +0200

x86/boot/64: Add forgotten end of function marker

Add secondary_startup_64()'s ENDPROC() marker.

No functionality change.

Signed-off-by Borislav Petkov <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Brian Gerst <[email protected]>
Cc Denys Vlasenko <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc [email protected]
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/kernel/head_64.S | 1 +
 1 file changed, 1 insertion(+)
arch/x86/kernel/head_64.S +1 -0
index 5df831e..c7920ba 100644
@@ -299,6 +299,7 @@ ENTRY(secondary_startup_64)
 	pushq	$__KERNEL_CS	# set correct cs
 	pushq	%rax		# target address in negative space
 	lretq
+ENDPROC(secondary_startup_64)
 
 #include "verify_cpu.S"