Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp23525pxb; Mon, 28 Mar 2022 23:02:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsdKzssLmG4RHBRIa4wmNju5l/PK5QtXGtWmYErbUIw1ssMmO/AlUkTKRVj5occlBHFk3d X-Received: by 2002:a37:a817:0:b0:67b:6ea0:5e9a with SMTP id r23-20020a37a817000000b0067b6ea05e9amr19132063qke.386.1648533760672; Mon, 28 Mar 2022 23:02:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648533760; cv=none; d=google.com; s=arc-20160816; b=Jc2uOp2LQBG8qGlGkutSsjVxpC2STlCmU3bTDn+pEp/c4m/GUgssf2IWLOv+wxglDz q3VSo0Zspcw4YmuaWwR+n62AyNFKUeKAn1Emra/QJUBrThQVtSJyC8RDL46MmMyZoF4U NxJC5eDFn+YHsOy7v+RFTLv2nlbYNY9I5oInjtwItj5DJ7pL7KXBlq9OrFQiKB0rKQdq pcf4j3XxsM6nUJxlQTMwekHlmAIKYLwhfvppPnUv+XM2FaPBNnJJ9T385VQeHw7IaZkP OS9BtuqZBvMnrjEfbnz9gIlDGpLsyeVGqVmYvvnMgIcDWmvvK5n4sudwed2H3wE4WOBb xTlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=2doMNH7ifB03QblJV2sV07sq+r0A6Mdk0Jlzv/ArvaY=; b=LiIudjrldOLpiIWIW2YS514N4ZCA5RbQnCSqqMy6OTqvVWNnwpnjVhCZRxqhZn+0dk QBBZEPJSTlQgE8Z3jH7q1/dyhW1idPfsADGn6stuWCT98xpfVMmvGEe1tQlSOTBcY5W/ My7GXc7YgziKpwpUTdxxequy3ouIRFODp0dyiy7/MjL4YoGkVQdiFz3uXMR0HR2OcxQx mFQOtiaN/ckC5auDDmttiUjwLqNocjgXLoiFrF9Y5+Fze59FGH70QSNp9xCjDoCd9C9V RM4BUjrP78ESBtrSiksIEmFKc9hktonSNQrN7aZRE5Jf8OqL4iC1ahoLNMy8mAC1NOkl sX8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AUeM4C6N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t14-20020a05622a180e00b002e1fbf3be52si9773937qtc.67.2022.03.28.23.02.03; Mon, 28 Mar 2022 23:02:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AUeM4C6N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231325AbiC2DAB (ORCPT + 99 others); Mon, 28 Mar 2022 23:00:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229598AbiC2C77 (ORCPT ); Mon, 28 Mar 2022 22:59:59 -0400 Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 720FD26CD; Mon, 28 Mar 2022 19:58:14 -0700 (PDT) Received: by mail-qt1-x831.google.com with SMTP id 10so14193691qtz.11; Mon, 28 Mar 2022 19:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2doMNH7ifB03QblJV2sV07sq+r0A6Mdk0Jlzv/ArvaY=; b=AUeM4C6NBE4EMZ2lTC/kkzSz9gJLIrJRpFA4SgUEtFR6sht/NzF1n4U3bovPj4bOQD dIC7H2cgVqJj17X6kuoInrEyZvmkCrKYw7F7H79NWkwh1dfYG3/ZjGexG2viAFTCXaST z3pdNxSnlPBdVtNod0v+QYyAYzJZK4VAJKp0Iweyi1RP2AbkQgOO40/C1kJW+D63lIJE 0kTvsA8iW7gKdpP/lj9l12Gy9jQ8wiCbtEsr55TEluNv6xP6mLJ0q+TRm8/JAf1PeSQX Vg0Fg626qCPmg8jE/SgETQiJ/VDwoJkgijLpIyzEVucRBPu0tqlELTDX76M3NZsoMhfl j/bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2doMNH7ifB03QblJV2sV07sq+r0A6Mdk0Jlzv/ArvaY=; b=fLms70K7DXI5vNDticyXa6JHxXfeQ+ocalMqSNy8tb5aE83Z33xhVMq1MzN1CoBGHR KIpYOQREzL2K1HXrMx1QK09PwseXztBSdtuJPgjwFrCV2+sMxl/r9weihfkGb4IJXrYJ KekioPKd6uUnS/qoohimlMCBA+JT4dfaYzIFaojrMwAlx1xjWNU4tl+JlkYmGeueIM3Y 3Jscb95w+vnjgrEg2x4y4kmOwHySJUyBjsytA0I1ITKq/Rh2J9u4IhqhBTe+SWYndHqd 7NZc3WQaMP/7q1xnGum0XDwjRScvpQizaDvz3cLIXGfWGy36/G/qtnnx64Wn4EIfj02j ekmw== X-Gm-Message-State: AOAM5336m4JSbJRwHDxgYx+xeOcJgV+mpg3jWeir3xt4eMi81ZzN6en3 +JEc8T6B0f+sAuU/RBn+Oc0= X-Received: by 2002:ac8:7f81:0:b0:2e1:fd50:24f2 with SMTP id z1-20020ac87f81000000b002e1fd5024f2mr25162533qtj.353.1648522693637; Mon, 28 Mar 2022 19:58:13 -0700 (PDT) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id p13-20020a05622a048d00b002e1ce0c627csm14763118qtx.58.2022.03.28.19.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 19:58:13 -0700 (PDT) From: cgel.zte@gmail.com X-Google-Original-From: yang.yang29@zte.com.cn To: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, firoz.khan@linaro.org, ematsumiya@suse.de Cc: rostedt@goodmis.org, mingo@redhat.com, yang.yang29@zte.com.cn, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] alpha: replace NR_SYSCALLS by NR_syscalls Date: Tue, 29 Mar 2022 02:57:38 +0000 Message-Id: <20220329025737.2375176-1-yang.yang29@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yang Reference to other arch likes x86_64 or arm64 to do this replacement. To solve compile error when using NR_syscalls in kernel[1]. [1] https://lore.kernel.org/all/202203270449.WBYQF9X3-lkp@intel.com/ Signed-off-by: Yang Yang --- arch/alpha/include/asm/unistd.h | 2 +- arch/alpha/kernel/entry.S | 4 ++-- kernel/trace/trace.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index 986f5da9b7d8..caabd92ea709 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h @@ -4,7 +4,7 @@ #include -#define NR_SYSCALLS __NR_syscalls +#define NR_syscalls __NR_syscalls #define __ARCH_WANT_NEW_STAT #define __ARCH_WANT_OLD_READDIR diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index e227f3a29a43..966400b925a5 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S @@ -454,7 +454,7 @@ entSys: SAVE_ALL lda $8, 0x3fff bic $sp, $8, $8 - lda $4, NR_SYSCALLS($31) + lda $4, NR_syscalls($31) stq $16, SP_OFF+24($sp) lda $5, sys_call_table lda $27, sys_ni_syscall @@ -585,7 +585,7 @@ strace: ldq $21, 88($sp) /* get the system call pointer.. */ - lda $1, NR_SYSCALLS($31) + lda $1, NR_syscalls($31) lda $2, sys_call_table lda $27, sys_ni_syscall cmpult $0, $1, $1 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 07d990270e2a..7ad8324db192 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -25,7 +25,7 @@ #include "pid_list.h" #ifdef CONFIG_FTRACE_SYSCALLS -#include /* For NR_SYSCALLS */ +#include /* For NR_syscalls */ #include /* some archs define it here */ #endif -- 2.25.1