From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760038AbcBYFyk (ORCPT ); Thu, 25 Feb 2016 00:54:40 -0500 Received: from torg.zytor.com ([198.137.202.12]:54408 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759340AbcBYFyi (ORCPT ); Thu, 25 Feb 2016 00:54:38 -0500 Date: Wed, 24 Feb 2016 21:52:29 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: jpoimboe@redhat.com, palves@redhat.com, wim@iguana.be, acme@kernel.org, hpa@zytor.com, tglx@linutronix.de, bp@alien8.de, mmarek@suse.cz, luto@kernel.org, jslaby@suse.cz, namhyung@gmail.com, torvalds@linux-foundation.org, brgerst@gmail.com, luto@amacapital.net, akpm@linux-foundation.org, peterz@infradead.org, chris.j.arges@canonical.com, linux@roeck-us.net, linux-kernel@vger.kernel.org, bernd@petrovitsch.priv.at, dvlasenk@redhat.com, mingo@kernel.org Reply-To: luto@amacapital.net, akpm@linux-foundation.org, peterz@infradead.org, chris.j.arges@canonical.com, brgerst@gmail.com, dvlasenk@redhat.com, mingo@kernel.org, linux@roeck-us.net, linux-kernel@vger.kernel.org, bernd@petrovitsch.priv.at, palves@redhat.com, wim@iguana.be, acme@kernel.org, hpa@zytor.com, tglx@linutronix.de, jpoimboe@redhat.com, jslaby@suse.cz, namhyung@gmail.com, torvalds@linux-foundation.org, mmarek@suse.cz, bp@alien8.de, luto@kernel.org In-Reply-To: <60de3cfb6f16d413bfb923036cc87fec132df735.1453405861.git.jpoimboe@redhat.com> References: <60de3cfb6f16d413bfb923036cc87fec132df735.1453405861.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] watchdog/hpwdt: Create stack frame in asminline_call() Git-Commit-ID: 5c1d5f283a855a5fe6b4f122054d85072b97ae4a 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: 5c1d5f283a855a5fe6b4f122054d85072b97ae4a Gitweb: http://git.kernel.org/tip/5c1d5f283a855a5fe6b4f122054d85072b97ae4a Author: Josh Poimboeuf AuthorDate: Thu, 21 Jan 2016 16:49:31 -0600 Committer: Ingo Molnar CommitDate: Wed, 24 Feb 2016 08:35:44 +0100 watchdog/hpwdt: Create stack frame in asminline_call() asminline_call() is a callable non-leaf function which doesn't honor CONFIG_FRAME_POINTER, which can result in bad stack traces. Create a stack frame when CONFIG_FRAME_POINTER is enabled. Signed-off-by: Josh Poimboeuf Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Arnaldo Carvalho de Melo Cc: Bernd Petrovitsch Cc: Borislav Petkov Cc: Brian Gerst Cc: Chris J Arges Cc: Denys Vlasenko Cc: Guenter Roeck Cc: H. Peter Anvin Cc: Jiri Slaby Cc: Linus Torvalds Cc: Michal Marek Cc: Namhyung Kim Cc: Pedro Alves Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Wim Van Sebroeck Cc: linux-watchdog@vger.kernel.org Cc: live-patching@vger.kernel.org Link: http://lkml.kernel.org/r/60de3cfb6f16d413bfb923036cc87fec132df735.1453405861.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- drivers/watchdog/hpwdt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 92443c3..90016db 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -353,10 +353,10 @@ static int detect_cru_service(void) asm(".text \n\t" ".align 4 \n\t" - ".globl asminline_call \n" + ".globl asminline_call \n\t" + ".type asminline_call, @function \n\t" "asminline_call: \n\t" - "pushq %rbp \n\t" - "movq %rsp, %rbp \n\t" + FRAME_BEGIN "pushq %rax \n\t" "pushq %rbx \n\t" "pushq %rdx \n\t" @@ -386,7 +386,7 @@ asm(".text \n\t" "popq %rdx \n\t" "popq %rbx \n\t" "popq %rax \n\t" - "leave \n\t" + FRAME_END "ret \n\t" ".previous");