From patchwork Thu Dec 6 05:18:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Firoz Khan X-Patchwork-Id: 152988 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp10126051ljp; Wed, 5 Dec 2018 21:19:35 -0800 (PST) X-Google-Smtp-Source: AFSGD/VqM/r35v2kvTSy0lcfAnmlpCTcesiZyw/APb/WmA9CGwvPmf+tGr+SWuzgK6pU7N6D8ntb X-Received: by 2002:a62:1b50:: with SMTP id b77mr27536234pfb.36.1544073575826; Wed, 05 Dec 2018 21:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544073575; cv=none; d=google.com; s=arc-20160816; b=JjXaBZ+51LcCtbiUJSsYLFaWBApGg5+/vWj1kTI49TAiyM7N0FLKM5dqoHoR9y5AJ1 5wcvV2q42IqewE3gQi7v5lkPIZc7GhMY5glvKVlvX6tKFQ7zO8ZVN5/8FzRs18TMUOWe m66H7cntxiZ+rZhiQ/ase58ptMRRD0hnymJ+saQKyj64AZen9AFLt8KkGcscSuE9A0sv UvthAXBwAQX2Kx3qJfEZWJXT/YvJsmgmWHwOOm5P48hZqNpqAR7a626390eUP2r+NXvr HQcHBWlSrhmEphOjEoL4vu/Jkvc5tdYrHdsNiauzE0+zS28sQ8JcEQLJwcpyUq1uLhde hK0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=kGl5LFLSs0dA190vDRXrA6LLA8QGbgKzTjmcNEweksU=; b=oZsD7sAfuC8aolFbI3BpQSdnYX1ocpIihngSyBg9dH3KOmvJMnvb7iBtWtyHWoXl/f dGHTcb3xCG0dO5ntvxIOsT23cBhGh6vah/67B9z7Hn4G9v6Gsszy8S0ysAtnlMYQDwIT Mw02a9qrZ6WwekJvfZBVW6P3BBvVn1CqGhpxUZRcPS8c1ihbCj2OlW07rhsS/RC15LOe Sze75V9VYG8MCbR25ZZe+cXlDBITWoukiUcw41k9vUJacPV3IhPIq5Lt7BHPqK/1nFfS 7AZWSVqQfdyErWCMzIPOsYGQD79enYqntmoaoWnjPKoJrnqVZgpB01alKmd7yHch9E/h qhYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hsyudtka; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h9si21411723pli.418.2018.12.05.21.19.35; Wed, 05 Dec 2018 21:19:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hsyudtka; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729049AbeLFFTc (ORCPT + 31 others); Thu, 6 Dec 2018 00:19:32 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:37484 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728489AbeLFFTa (ORCPT ); Thu, 6 Dec 2018 00:19:30 -0500 Received: by mail-pf1-f194.google.com with SMTP id y126so11198711pfb.4 for ; Wed, 05 Dec 2018 21:19:29 -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=kGl5LFLSs0dA190vDRXrA6LLA8QGbgKzTjmcNEweksU=; b=Hsyudtka9ZQUfqh0efmurP1Owbr5AEKLNzby5q59+sHWsBeUggmq7KyhIEUndJKWJI zBbS7oV5jPTCr7x/nGFF5p8SOhRI79iC1bbDKDZ75zdZFT9rTR04LlEm0JgO4Wyqgaru 6n81TGaqqWfk2rJnVsm3kaUsjbaptiwYWpn+o= 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=kGl5LFLSs0dA190vDRXrA6LLA8QGbgKzTjmcNEweksU=; b=rvHuw+XSgWVS9dgjvpuGgw7BvadaR++75zpAfzk0A++K4tXtFAFuR1H/OQouh2kMH7 ZcW8u7JTQyVtnX67TFliJqghmAkb+OPqgX0VY5aN4VB1ETKJLudfLmt43HTtX0+X/nht wGB43KZm8UIIn2olJQfzazQ1vKZbGCPkEx5gTNMslw//SY6ZaGXQv8rOhsO+oerQRsoZ 4KjdsLt87bzmrTp1wDornSaFZTmJlIyoOo6thMD8+g4KWM64pcMLtxFz/xr1lEi8G4yZ upkxgfMVXiVNPRAeHb7NLvb56XLLYiBPx/zLdh4mJ2hi71qYn42W7pz04ubiAiAJsskJ +enw== X-Gm-Message-State: AA+aEWa5mw66bFAm2UY2344jpGyFqcLeMLlTwRq7tC+A2VkIu8pkv3qg E/9A2x2jXUnwujTB8vCH98dlcw== X-Received: by 2002:a63:3f44:: with SMTP id m65mr23531925pga.115.1544073569336; Wed, 05 Dec 2018 21:19:29 -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 r66sm32877803pfk.157.2018.12.05.21.19.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Dec 2018 21:19:28 -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 v4 2/7] mips: remove unused macros Date: Thu, 6 Dec 2018 10:48:23 +0530 Message-Id: <1544073508-13720-3-git-send-email-firoz.khan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544073508-13720-1-git-send-email-firoz.khan@linaro.org> References: <1544073508-13720-1-git-send-email-firoz.khan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove NR_syscalls from asm/unistd.h as there is no users to use NR_syscalls macro in mips kernel. Remove __NR_Linux_syscalls from uapi/asm/unistd.h as there is no users to use NR_syscalls macro in mips kernel. MAX_SYSCALL_NO can also remove as there is commit 2957c9e61ee9 ("[MIPS] IRIX: Goodbye and thanks for all the fish"), eight years ago. Signed-off-by: Firoz Khan --- arch/mips/include/asm/unistd.h | 8 -------- arch/mips/include/uapi/asm/unistd.h | 15 --------------- arch/mips/kernel/scall32-o32.S | 3 --- 3 files changed, 26 deletions(-) -- 1.9.1 diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h index c68b8ae..d7ee846 100644 --- a/arch/mips/include/asm/unistd.h +++ b/arch/mips/include/asm/unistd.h @@ -14,14 +14,6 @@ #include -#ifdef CONFIG_MIPS32_N32 -#define NR_syscalls (__NR_N32_Linux + __NR_N32_Linux_syscalls) -#elif defined(CONFIG_64BIT) -#define NR_syscalls (__NR_64_Linux + __NR_64_Linux_syscalls) -#else -#define NR_syscalls (__NR_O32_Linux + __NR_O32_Linux_syscalls) -#endif - #ifndef __ASSEMBLY__ #define __ARCH_WANT_NEW_STAT diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index 6914be5..c897195 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h @@ -395,11 +395,6 @@ #define __NR_syscalls 368 #endif -/* - * Offset of the last Linux o32 flavoured syscall - */ -#define __NR_Linux_syscalls __NR_syscalls - #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ #define __NR_O32_Linux 4000 @@ -745,11 +740,6 @@ #define __NR_syscalls 328 #endif -/* - * Offset of the last Linux 64-bit flavoured syscall - */ -#define __NR_Linux_syscalls __NR_syscalls - #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ #define __NR_64_Linux 5000 @@ -1099,11 +1089,6 @@ #define __NR_syscalls 332 #endif -/* - * Offset of the last N32 flavoured syscall - */ -#define __NR_Linux_syscalls __NR_syscalls - #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ #define __NR_N32_Linux 6000 diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 91d3c8c..fea6edb 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S @@ -22,9 +22,6 @@ #include #include -/* Highest syscall used of any syscall flavour */ -#define MAX_SYSCALL_NO __NR_O32_Linux + __NR_O32_Linux_syscalls - .align 5 NESTED(handle_sys, PT_SIZE, sp) .set noat