From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbcF0NA2 (ORCPT ); Mon, 27 Jun 2016 09:00:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41846 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750870AbcF0NA1 (ORCPT ); Mon, 27 Jun 2016 09:00:27 -0400 Date: Mon, 27 Jun 2016 05:59:31 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: brgerst@gmail.com, luto@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, bp@suse.de, dvlasenk@redhat.com, bp@alien8.de, peterz@infradead.org, jpoimboe@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com Reply-To: tglx@linutronix.de, jpoimboe@redhat.com, peterz@infradead.org, bp@alien8.de, dvlasenk@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, mingo@kernel.org, luto@kernel.org, brgerst@gmail.com, linux-kernel@vger.kernel.org, bp@suse.de In-Reply-To: <20160625112457.16930-1-bp@alien8.de> References: <20160625112457.16930-1-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/boot/64: Add forgotten end of function marker Git-Commit-ID: dbf984d825935f61965bcfacfd8e8dfdaf3e8051 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dbf984d825935f61965bcfacfd8e8dfdaf3e8051 Gitweb: http://git.kernel.org/tip/dbf984d825935f61965bcfacfd8e8dfdaf3e8051 Author: Borislav Petkov AuthorDate: Sat, 25 Jun 2016 13:24:57 +0200 Committer: Ingo Molnar 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 Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/20160625112457.16930-1-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/head_64.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 5df831e..c7920ba 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -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"