From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97BBAC4321A for ; Sat, 27 Apr 2019 01:43:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5ABBC21743 for ; Sat, 27 Apr 2019 01:43:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329381; bh=BkhJK381G4W+Yt1VFrz0O42M2o2R8jbU/gf0FXsy8FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qPhDIrr9J3fSsHR7s4Ok7VvH5TapRzzzMhScdgjZa4COABbPxFYBldRaqbXfPZrOw wbr4+H/LhW+tHK4sIs3J1ZFe6NKc0J/vhn5WbmPGKdsdO/h9x1rWcA/VuDPfI6pr/U ggu0pr6FPYavksXeum8Zucz0jxPnndxWOwJnPgTU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728684AbfD0BnA (ORCPT ); Fri, 26 Apr 2019 21:43:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:47078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728666AbfD0Bm5 (ORCPT ); Fri, 26 Apr 2019 21:42:57 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3AE3A2168B; Sat, 27 Apr 2019 01:42:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329376; bh=BkhJK381G4W+Yt1VFrz0O42M2o2R8jbU/gf0FXsy8FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jKPA6ffECbZxzWS1O6bKdo6BzRVFE+gO3JF1NNSsKzFjYyhWc/7d03MncvPYcBgn2 0eHF9rSHaSk5NxEHLtGYeCeqw6YSUcCtnwe432INtvwAQ+bFt2xs7PheMfBGPAlX30 xnYuFdS6Pwd1+sbN+ajS849z9M0t8v55C1Ut5Nfs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Max Filippov , Sasha Levin , linux-xtensa@linux-xtensa.org Subject: [PATCH AUTOSEL 4.14 16/32] xtensa: fix initialization of pt_regs::syscall in start_thread Date: Fri, 26 Apr 2019 21:42:07 -0400 Message-Id: <20190427014224.8274-16-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190427014224.8274-1-sashal@kernel.org> References: <20190427014224.8274-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Max Filippov [ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ] New pt_regs should indicate that there's no syscall, not that there's syscall #0. While at it wrap macro body in do/while and parenthesize macro arguments. Signed-off-by: Max Filippov Signed-off-by: Sasha Levin --- arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h index a39cd81b741a..3a0a8a53f2e7 100644 --- a/arch/xtensa/include/asm/processor.h +++ b/arch/xtensa/include/asm/processor.h @@ -195,15 +195,18 @@ struct thread_struct { /* Clearing a0 terminates the backtrace. */ #define start_thread(regs, new_pc, new_sp) \ - memset(regs, 0, sizeof(*regs)); \ - regs->pc = new_pc; \ - regs->ps = USER_PS_VALUE; \ - regs->areg[1] = new_sp; \ - regs->areg[0] = 0; \ - regs->wmask = 1; \ - regs->depc = 0; \ - regs->windowbase = 0; \ - regs->windowstart = 1; + do { \ + memset((regs), 0, sizeof(*(regs))); \ + (regs)->pc = (new_pc); \ + (regs)->ps = USER_PS_VALUE; \ + (regs)->areg[1] = (new_sp); \ + (regs)->areg[0] = 0; \ + (regs)->wmask = 1; \ + (regs)->depc = 0; \ + (regs)->windowbase = 0; \ + (regs)->windowstart = 1; \ + (regs)->syscall = NO_SYSCALL; \ + } while (0) /* Forward declaration */ struct task_struct; -- 2.19.1