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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 504C4C606BD for ; Mon, 8 Jul 2019 15:15:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2921C216C4 for ; Mon, 8 Jul 2019 15:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562598916; bh=pACI6D3myO5JNSRbPWXUf6hK64xGN3l01pdmArsudig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BL6gp7BvpGyZiMcEquz8fLl7uAjDhYgpBbW3/1R1lHiVc0J7JRVwof1TB8IlY+eTW oE3XqVICQILZAZ8BbzS7PI4Jw2yEmr2Vyl6/GLUMq60A1XgVEGWSBMnI/aIeRdeJKA qZcbvq3o5/4fjDXGu0BrEiTwtJCR5Of4w+mNpCiI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732294AbfGHPPP (ORCPT ); Mon, 8 Jul 2019 11:15:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:37590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732279AbfGHPPM (ORCPT ); Mon, 8 Jul 2019 11:15:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 916BC216F4; Mon, 8 Jul 2019 15:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562598912; bh=pACI6D3myO5JNSRbPWXUf6hK64xGN3l01pdmArsudig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AcXr3cpNqmdckFmtK2+3Dd9AakjArKTmCi1/GPNfAlOn7EuUaDmH2NwpXkAK4IM7x q5je9sLUnMkvjiA/HE6tpq+gsUkc/O0lL9KVSFQAPEP/Zzf4w8fWQ3Zp1boMun12jA bz6YAM2nR6g6dCGS4GO7NwUpofu42hNxIrVDnJ2g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , "George G. Davis" , Sasha Levin Subject: [PATCH 4.4 15/73] scripts/checkstack.pl: Fix arm64 wrong or unknown architecture Date: Mon, 8 Jul 2019 17:12:25 +0200 Message-Id: <20190708150520.057563862@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150513.136580595@linuxfoundation.org> References: <20190708150513.136580595@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 4f45d62a52297b10ded963412a158685647ecdec ] The following error occurs for the `make ARCH=arm64 checkstack` case: aarch64-linux-gnu-objdump -d vmlinux $(find . -name '*.ko') | \ perl ./scripts/checkstack.pl arm64 wrong or unknown architecture "arm64" As suggested by Masahiro Yamada, fix the above error using regular expressions in the same way it was fixed for the `ARCH=x86` case via commit fda9f9903be6 ("scripts/checkstack.pl: automatically handle 32-bit and 64-bit mode for ARCH=x86"). Suggested-by: Masahiro Yamada Signed-off-by: George G. Davis Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/checkstack.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl index 12a6940741fe..b8f616545277 100755 --- a/scripts/checkstack.pl +++ b/scripts/checkstack.pl @@ -45,7 +45,7 @@ my (@stack, $re, $dre, $x, $xs, $funcre); $x = "[0-9a-f]"; # hex character $xs = "[0-9a-f ]"; # hex character or space $funcre = qr/^$x* <(.*)>:$/; - if ($arch eq 'aarch64') { + if ($arch =~ '^(aarch|arm)64$') { #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp, #-80]! $re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o; } elsif ($arch eq 'arm') { -- 2.20.1