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=-8.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=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 7934EC43613 for ; Mon, 24 Jun 2019 10:21:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 421D220645 for ; Mon, 24 Jun 2019 10:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371690; bh=ZpwHM1vNP255yEGVRWKk3m4JUF3NnJg8nmc/uD2SSZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yhB9ucy59NKPFLVN6Z5sxRaJjG5qXdzQ56j2J/GZR2by1h2hXFywelLhKlhXAjDnN KYRLX/J0z8E9bbXTnzaPchF+4VuL328aqc4hH9tivzZFT+s/fpAJo3Q/Qu7z281xx3 2u8HWbKOwzgnmHX5ov+LZSY3lSSuDlw3+ncqpMK4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728592AbfFXKV3 (ORCPT ); Mon, 24 Jun 2019 06:21:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:57112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727525AbfFXKV3 (ORCPT ); Mon, 24 Jun 2019 06:21:29 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (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 0F3F920645; Mon, 24 Jun 2019 10:21:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371688; bh=ZpwHM1vNP255yEGVRWKk3m4JUF3NnJg8nmc/uD2SSZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qT5zThXqTJl7FBNEdWg2ZnOvVPyQzl9jHMy9pYBkXdDnaFOtht8tNRaUQ4s4PZt9Y DtUv2n9Leo2eez63iecdNw8hPEvoMSCo8VVkNbvYv+EtK2cjQmCK1MSwY5qmcrosj6 D4SH89sDtt08P4K6cVcZbnmfuw4cUcbhTBipRYXQ= 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 5.1 075/121] scripts/checkstack.pl: Fix arm64 wrong or unknown architecture Date: Mon, 24 Jun 2019 17:56:47 +0800 Message-Id: <20190624092324.732027506@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092320.652599624@linuxfoundation.org> References: <20190624092320.652599624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 122aef5e4e14..371bd17a4983 100755 --- a/scripts/checkstack.pl +++ b/scripts/checkstack.pl @@ -46,7 +46,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]! #a110: d11643ff sub sp, sp, #0x590 $re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o; -- 2.20.1