Received: by 10.213.65.68 with SMTP id h4csp1037536imn; Wed, 14 Mar 2018 07:48:52 -0700 (PDT) X-Google-Smtp-Source: AG47ELsvbUn3VdCFNz2DWxeEK8G6qu0WuIWw5HI8JKNJdZ2oYiYsYaIxrOiH+gwUsQz3kXnZXPLt X-Received: by 10.99.107.72 with SMTP id g69mr3901782pgc.337.1521038932292; Wed, 14 Mar 2018 07:48:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521038932; cv=none; d=google.com; s=arc-20160816; b=gQ5luaFk+fRFInTp10gxqvvrMV0pbBcweVgt3BinUm65p3TpsZRenEZ2qhOoL6uF+N WcRavIIT6tDynah7HfRKVcjOYgntjUQZq+W/eXETVfcO7vSsdJl57OhFSPMGfcdokjSg pIpUqPq5X2p8YV2VOl1YGDbJ8eCOL6rDthWcn3Bhac0hb43UtsY7UnB7ol/tXWk41h0W ixbrpS9nRqBgIar/5CRyCQ97X5SrAw5cxvxRvA5fqacxCOpz6dBVSkPvYP+mNpZo0YZu TZdppDdrksLHqwYf99cjwyX4Y7t2pTjgwUWqzLugywjZxHm89wBFRDGDqO4bMBxhUFJP BcBw== 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:arc-authentication-results; bh=j+chHJHTJB2cUOJJE4wRI6txLoaHxiflrZGRgu+xruM=; b=sStMyaG6AnaFEN4jwoUQ7mnVjnKjNnRWq2uWQsjVTtmqqHHU7O3vrD7C0WfaqSLwEl DwaL3NM7Buu/AYBPs87udqa0KE5tPnfczkmg25FomOy9js5tmz5yFXB2rD6lJtBr6p5q UOH4kbcWOEX1YhLl/O73kA1/Nr+XHd+ukj6YBfWUOl2uRiNHoyNQbVylJPTVH6XXmJr4 HFqM8TEaiqhn0rmpiwgqCUWG2T7c+kL6ps0lI8G3uUoY68aV68o5q7DjZem8LDPhqEyk XGDToJeML0Z+UnRFC820Rh3ylCPoEFWqKZCNrr56Yhwhq+amjnYqf1yvQ38oH7A8d4W2 JVfQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g13si774671pfe.30.2018.03.14.07.48.37; Wed, 14 Mar 2018 07:48:52 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751966AbeCNOrC (ORCPT + 99 others); Wed, 14 Mar 2018 10:47:02 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:54841 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751901AbeCNOrA (ORCPT ); Wed, 14 Mar 2018 10:47:00 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0LnBmv-1eQ4Zt0krF-00hKYI; Wed, 14 Mar 2018 15:46:36 +0100 From: Arnd Bergmann To: linux-arch@vger.kernel.org, Arnd Bergmann Cc: linux-kernel@vger.kernel.org, "Eric W. Biederman" , Al Viro , Thomas Gleixner Subject: [PATCH 12/16] asm-generic: siginfo: remove obsolete #ifdefs Date: Wed, 14 Mar 2018 15:43:47 +0100 Message-Id: <20180314144614.1632190-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180314144614.1632190-1-arnd@arndb.de> References: <20180314143529.1456168-1-arnd@arndb.de> <20180314144614.1632190-1-arnd@arndb.de> X-Provags-ID: V03:K0:Iw8i5VRf5C8zCgOgutJ/i3JAtCt/ZGJOBpPZ4NiV+xe3p2Zf4AW ZRB6h20CNhX8IqA0XuGhpcIlnRT9OA8FDIroMauthDiwft6SkCcMJcHkShbVLQEoy8YnGvR R7hcxUn/ooRAYzON0oJPj1TI1JkiB1A/jKCSFtHPaP69TFH5Yko6yOOIydFULN5wkgurvq+ BgcLdOmBcjraS0eXUraCg== X-UI-Out-Filterresults: notjunk:1;V01:K0:CdJj1z6xgD0=:PBVoiANqKHVE7eDvdtIv3S +NSNLMZp8HRRp1lmHloPsuoCostaC77gPAIwVR9KhP1DUePsbBfv+wV5ojxnaJvLWUzAevNwo dBmI7NWtTjHhWvQqyOG6ETHCeWscaG2tgS4wfVKb2lJamCtr2IKVuYDhnpi45JzoEXkU0q4Rp couWG1/eWJopD6iAaoDcSu4VJEo0iddZRuWGCTNHCRpuuf8cri4pVmrVqrEpxXh6RP1479D0N 0tbGo6br4g5iklnJt+v0t4cvV86GAvIwS3K0MM/owsGSXG3WH0OGGIBk0H1kv+8lK+fp7uIHq uisKwhsQs/OtBlEdMKJSa1g3PdKTr2gX4VPfe0Qj5QEpX6neLu107B+1DqlEFMEsVg9dQzXwQ imyCd+8RQM7WNyscC317k6F+SujeULM6jW/FRNzPR04vDomTG8n676C8x81wxq4UWV93+XNnr EqQs9Q5dqU1pdVCUNQPgDsqAQcuek1Eqzlpv+g54h+e4Fn/BS45UDE5BLh1S8wWjUk2y8Cofw ORRA5Pli/q8rakY3+bRVL49yNQRyiypeRoHxd40vNFUTCriEKjwUNmiBhTOWHhGPQW8xXlYX8 /iyGGrjmPQojFODbziMS4ShufZQl5A7r+dVXoWiOumRTBPnjMUtevVYjFyuEte0HCMMnoI+L5 K68r/o7DuuxSZMCG3h1BiLW1CedoYEfgoGwhq676NMSvyDI/kFomIcBSnxNpBcGNVxfmHTyT+ mYrLb04wNn8aqncHdH07PeMkjI2NFoTPpyfCBg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The frv, tile and blackfin architectures are being removed, so we can clean up this header by removing all the special cases except those for ia64. Signed-off-by: Arnd Bergmann --- include/uapi/asm-generic/siginfo.h | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h index 85dc965afd89..b2ebf16c391a 100644 --- a/include/uapi/asm-generic/siginfo.h +++ b/include/uapi/asm-generic/siginfo.h @@ -179,28 +179,13 @@ typedef struct siginfo { * SIGILL si_codes */ #define ILL_ILLOPC 1 /* illegal opcode */ -#ifdef __bfin__ -# define ILL_ILLPARAOP 2 /* illegal opcode combine */ -#endif #define ILL_ILLOPN 2 /* illegal operand */ #define ILL_ILLADR 3 /* illegal addressing mode */ #define ILL_ILLTRP 4 /* illegal trap */ -#ifdef __bfin__ -# define ILL_ILLEXCPT 4 /* unrecoverable exception */ -#endif #define ILL_PRVOPC 5 /* privileged opcode */ #define ILL_PRVREG 6 /* privileged register */ #define ILL_COPROC 7 /* coprocessor error */ #define ILL_BADSTK 8 /* internal stack error */ -#ifdef __bfin__ -# define ILL_CPLB_VI 9 /* D/I CPLB protect violation */ -# define ILL_CPLB_MISS 10 /* D/I CPLB miss */ -# define ILL_CPLB_MULHIT 11 /* D/I CPLB multiple hit */ -#endif -#ifdef __tile__ -# define ILL_DBLFLT 9 /* double fault */ -# define ILL_HARDWALL 10 /* user networks hardwall violation */ -#endif #ifdef __ia64__ # define ILL_BADIADDR 9 /* unimplemented instruction address */ # define __ILL_BREAK 10 /* illegal break */ @@ -219,9 +204,6 @@ typedef struct siginfo { #define FPE_FLTRES 6 /* floating point inexact result */ #define FPE_FLTINV 7 /* floating point invalid operation */ #define FPE_FLTSUB 8 /* subscript out of range */ -#ifdef __frv__ -# define FPE_MDAOVF 9 /* media overflow */ -#endif #ifdef __ia64__ # define __FPE_DECOVF 9 /* decimal overflow */ # define __FPE_DECDIV 10 /* decimal division by zero */ @@ -236,11 +218,7 @@ typedef struct siginfo { */ #define SEGV_MAPERR 1 /* address not mapped to object */ #define SEGV_ACCERR 2 /* invalid permissions for mapped object */ -#ifdef __bfin__ -# define SEGV_STACKFLOW 3 /* stack overflow */ -#else -# define SEGV_BNDERR 3 /* failed address bound checks */ -#endif +#define SEGV_BNDERR 3 /* failed address bound checks */ #ifdef __ia64__ # define __SEGV_PSTKOVF 4 /* paragraph stack overflow */ #else @@ -254,12 +232,8 @@ typedef struct siginfo { #define BUS_ADRALN 1 /* invalid address alignment */ #define BUS_ADRERR 2 /* non-existent physical address */ #define BUS_OBJERR 3 /* object specific hardware error */ -#ifdef __bfin__ -# define BUS_OPFETCH 4 /* error from instruction fetch */ -#else /* hardware memory error consumed on a machine check: action required */ -# define BUS_MCEERR_AR 4 -#endif +#define BUS_MCEERR_AR 4 /* hardware memory error detected in process but not consumed: action optional*/ #define BUS_MCEERR_AO 5 #define NSIGBUS 5 @@ -271,12 +245,6 @@ typedef struct siginfo { #define TRAP_TRACE 2 /* process trace trap */ #define TRAP_BRANCH 3 /* process taken branch trap */ #define TRAP_HWBKPT 4 /* hardware breakpoint/watchpoint */ -#ifdef __bfin__ -# define TRAP_STEP 1 /* single-step breakpoint */ -# define TRAP_TRACEFLOW 2 /* trace buffer overflow */ -# define TRAP_WATCHPT 3 /* watchpoint match */ -# define TRAP_ILLTRAP 4 /* illegal trap */ -#endif #define NSIGTRAP 4 /* -- 2.9.0