From patchwork Thu Dec 13 09:07:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Firoz Khan X-Patchwork-Id: 10728227 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7E8C91E for ; Thu, 13 Dec 2018 09:08:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B587E29EC6 for ; Thu, 13 Dec 2018 09:08:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A995829EF7; Thu, 13 Dec 2018 09:08:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 315DE29EB6 for ; Thu, 13 Dec 2018 09:08:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727777AbeLMJIj (ORCPT ); Thu, 13 Dec 2018 04:08:39 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:44608 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727600AbeLMJId (ORCPT ); Thu, 13 Dec 2018 04:08:33 -0500 Received: by mail-pg1-f196.google.com with SMTP id t13so744766pgr.11 for ; Thu, 13 Dec 2018 01:08:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ovqA7q/BYVAxnWyyXEnsQMPs7oV4aZ6Ml07RbG8nye0=; b=GyP/PNdn9JmSRK2kIDauz1cZazZwcVHfOiD7jt6TLEHTBmdqy9bOktd0WesPfD46a8 MMcyfTYkG2gDZqwsTjZOgPlJ48u3HdD5hxxDH1QAtddPBhLTBr5/VMjDsKZYaIetvrts bLQHgYDkttAoAh3tfjyHyH/B2iGhsKIGmSIJI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ovqA7q/BYVAxnWyyXEnsQMPs7oV4aZ6Ml07RbG8nye0=; b=oqWyh9aogx4soM24Lam9Hsif0ynB9HOgn2EY2++nLLVCYILPSZ1ErXFHCZfwX5vNju m6mLysof/nqx9bcsIolhdBTN8QNXS5DAPLHm5wf2GotkLw8K+fFIVOHGsg2HYYvhHSMd Grp9O0RPrgiaUHk64svBYeMPOAtKvQkstmfnHd7vH+XN2qU6u5Y3tGlyMYEcvdRWLWQp 0OJeonvSY1LcAO8P2zKXyf6hI0MGqx/P3THcbc1nE64T7UNq2dZjkXet3MpDCugBxVGk /Nb3ap7p9/ZN9Ve1SDimqTIzpFAyNbSQQtn30nNtjSB95fjoT+EjKvnFotRbJ+idKxRS gxnQ== X-Gm-Message-State: AA+aEWar35qltPSLk7oGIVCf4DmewxdjbfQD5/cLA/fNQ2+3WZYRb2S7 6tnwN3/ktWFbUCdlTNAvNrMSUAytD1Q= X-Google-Smtp-Source: AFSGD/W5CzhxlqWZl4I4bAQuZ5nuyRH/SbKABViQd4AkjDovHZoHS78Cwqw3roZDZrGA/LVNRTmqYg== X-Received: by 2002:a63:4e15:: with SMTP id c21mr21230068pgb.50.1544692112735; Thu, 13 Dec 2018 01:08:32 -0800 (PST) Received: from qualcomm-HP-ZBook-14-G2.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id m11sm1650533pgh.51.2018.12.13.01.08.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Dec 2018 01:08:32 -0800 (PST) From: Firoz Khan To: linux-mips@vger.kernel.org, Ralf Baechle , Paul Burton , James Hogan , Greg Kroah-Hartman , Philippe Ombredanne , Thomas Gleixner , Kate Stewart Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, arnd@arndb.de, deepa.kernel@gmail.com, marcin.juszkiewicz@linaro.org, firoz.khan@linaro.org Subject: [PATCH v5 3/7] mips: rename macros and files from '64' to 'n64' Date: Thu, 13 Dec 2018 14:37:35 +0530 Message-Id: <1544692059-9728-4-git-send-email-firoz.khan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544692059-9728-1-git-send-email-firoz.khan@linaro.org> References: <1544692059-9728-1-git-send-email-firoz.khan@linaro.org> Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we get nanoMIPS support we'll be introducing the p32 ABI, and there's a reasonable chance that the equivalent p64 ABI may come along in the future. Using 'n64' now would avoid confusion in that case where we may have 2 different 64-bit ABIs. Suggested-by: Paul Burton Signed-off-by: Firoz Khan --- arch/mips/include/uapi/asm/unistd.h | 4 ++-- arch/mips/kernel/Makefile | 2 +- arch/mips/kernel/ftrace.c | 4 ++-- arch/mips/kernel/{scall64-64.S => scall64-n64.S} | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename arch/mips/kernel/{scall64-64.S => scall64-n64.S} (99%) diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index c897195..baea6e4 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h @@ -742,8 +742,8 @@ #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ -#define __NR_64_Linux 5000 -#define __NR_64_Linux_syscalls 328 +#define __NR_N64_Linux 5000 +#define __NR_N64_Linux_syscalls 328 #if _MIPS_SIM == _MIPS_SIM_NABI32 diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 210c280..25af613 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -72,7 +72,7 @@ obj-$(CONFIG_IRQ_GT641XX) += irq-gt641xx.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_32BIT) += scall32-o32.o -obj-$(CONFIG_64BIT) += scall64-64.o +obj-$(CONFIG_64BIT) += scall64-n64.o obj-$(CONFIG_MIPS32_COMPAT) += linux32.o ptrace32.o signal32.o obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o signal_o32.o diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c index b122cbb..d91a6e7 100644 --- a/arch/mips/kernel/ftrace.c +++ b/arch/mips/kernel/ftrace.c @@ -403,8 +403,8 @@ unsigned long __init arch_syscall_addr(int nr) if (nr >= __NR_N32_Linux && nr <= __NR_N32_Linux + __NR_N32_Linux_syscalls) return (unsigned long)sysn32_call_table[nr - __NR_N32_Linux]; #endif - if (nr >= __NR_64_Linux && nr <= __NR_64_Linux + __NR_64_Linux_syscalls) - return (unsigned long)sys_call_table[nr - __NR_64_Linux]; + if (nr >= __NR_N64_Linux && nr <= __NR_N64_Linux + __NR_N64_Linux_syscalls) + return (unsigned long)sys_call_table[nr - __NR_N64_Linux]; #ifdef CONFIG_MIPS32_O32 if (nr >= __NR_O32_Linux && nr <= __NR_O32_Linux + __NR_O32_Linux_syscalls) return (unsigned long)sys32_call_table[nr - __NR_O32_Linux]; diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-n64.S similarity index 99% rename from arch/mips/kernel/scall64-64.S rename to arch/mips/kernel/scall64-n64.S index 358d959..497cd62 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-n64.S @@ -53,8 +53,8 @@ NESTED(handle_sys64, PT_SIZE, sp) bnez t0, syscall_trace_entry syscall_common: - dsubu t2, v0, __NR_64_Linux - sltiu t0, t2, __NR_64_Linux_syscalls + 1 + dsubu t2, v0, __NR_N64_Linux + sltiu t0, t2, __NR_N64_Linux_syscalls + 1 beqz t0, illegal_syscall dsll t0, t2, 3 # offset into table