From patchwork Thu Nov 23 18:02:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 169083 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp621335vqx; Thu, 23 Nov 2023 10:04:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrTqcWvcNrNW9WnWdCjVv0rxASbhK1KuOKMVZI7BXPqfiPg5NsI0Tqq/iyrAZRBAl32W4X X-Received: by 2002:a17:90b:350c:b0:281:10d:6067 with SMTP id ls12-20020a17090b350c00b00281010d6067mr259360pjb.16.1700762640647; Thu, 23 Nov 2023 10:04:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700762640; cv=none; d=google.com; s=arc-20160816; b=Omfj2gRwKJAXGox1JV0q50HlOYgORaQ7NbakhDSdddlC2ITLy0YqnyOmnyeYVfHzGW BzhT3xTbGpIA1CUGZTRy6p3XKGkgt613+2rJkQuJxbTpuy4mc4vDnyWBGxRZrONGVN0y d1Ilp7YkgEfLk7h7C01z04zJgzaoTQ5nOo3X/3g+bVV91GZJWbS6Xy6qY414xRUqVL5+ 5SFaBTeMu1Lw5pu5bIAU7F6GW9HEBk5qRNbIam8jOBvrMLvwT+MXfbd6VBa4FGPojVB/ 5QiopWtMXoe6GxZ6TN+0aVaYC8ISQKykWZPJTmfehBZ6SH1YJWsv+D9965d1FZfUDYUv yT5w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t/aBrAkZqTiWY/zs87nQmy2lYsgikda8sYn2IKoRE00=; fh=Ko90S6CcquqsKV5pBC25n2aB8JM02zepEUn8C/ehD7Y=; b=mwKxE8m0UQ/dQQwSkLiekjIevTOizYCfbC12O96+feu+FQSspO+wWu0mgg5kY9i/PJ scZKFkO8I4BVSf7ybHgiQs5MdTRl4kPelOQ7lxEvUVsxe4rUoHv1DA6EiZbjT0MECDGh ut1THX+R3/fgYs/FtG03gcukJMUgIXnq3b1FsLJk+xU+0cSJ/kkYu7Hwr6Sb3S4/348K nry0SGDmE0e7i1g/BUTQQmeNrpX9i6n21jyS8pPjbgSA3Tg735VDULmYEE7YkFP0lBXF LH93oSQ78w04/mbVMNCK+vZngv9W1oZtenFbCwbbqqcj3GRBxQ47IECplGPmM5j+v1vT AXIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=SPLfrWnp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id i11-20020a17090a718b00b00280f5032e03si2145976pjk.133.2023.11.23.10.03.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:04:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=SPLfrWnp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 51DC6809C148; Thu, 23 Nov 2023 10:03:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235229AbjKWSDn (ORCPT + 99 others); Thu, 23 Nov 2023 13:03:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231134AbjKWSDX (ORCPT ); Thu, 23 Nov 2023 13:03:23 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0213E1984 for ; Thu, 23 Nov 2023 10:03:21 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0158040C4F for ; Thu, 23 Nov 2023 18:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1700762597; bh=t/aBrAkZqTiWY/zs87nQmy2lYsgikda8sYn2IKoRE00=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SPLfrWnpza0ZLj9laeW39hNJMYTM9CyaBRTyyYaXnSnEdzQycPLtmWifV63DXaFWu ArylpzWo/oWp1FzvUFQkNbhUnbgZ/N5tZbIJIJBqWGNn0E6xHVB8emEZvxT2xMZQLv 2VV5MYLN/kSGu5/i+OCuHhuEPKCyB8/SUqHBs2igWtdVWI6BMDd+OPRs3TcA0tQrdC aSGnXJUDt2MCDD2yXMHrtlN/vySysnc2iUDI9HKKYaAi/0ZrppJFT7QQ6bfVq4tlRu uEoOdWQW+9Ng98T5tPB3iWMZnGUP3TNxGqEsXtsDdC7wwpD1ehsqQfqmYtrvqoulR1 oYcnQrtEgp4lQ== Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40b2977d7c5so5478255e9.2 for ; Thu, 23 Nov 2023 10:03:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700762589; x=1701367389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t/aBrAkZqTiWY/zs87nQmy2lYsgikda8sYn2IKoRE00=; b=c7ZYh9E4olF/P3B8l6ZoEaOlBYB+t3CvBYh7Evb2XqbBBwtBl+ZosCSrhtq2wEAHxy nKVf/Hcssa0depkKAFnMDi0cqQv0eq1et/RMS5Xa4cMUu1TUsz8LZmM2wgDRzssBKZWR aDd3DXjdmXpQJBYAgzVUtTAQOPZhsPucGwD2r8b+LZ+IXN48w33XfVOODNnbHqW6As4N 2j1IPExm3HijSMa+sedCmOIjuKTJImpGDoLhM3xWqPmORkDCk3xrWS2bwHBwa6kOfqz6 kUIjujA2k31O1CPkM077YhFY38WpOxUM8a0DFRN8Het1Hb4/XSe2KMSm9EYfFDQRoBt6 z10Q== X-Gm-Message-State: AOJu0YzTy6NlwkaYNkDpFOnqJ5dL8v8IVy7pKCY54Lz5wcaQkBlI3sLp GRrbukd3BL+XCXzFMMF/QFQmJF/lnLfreUz4lX/F+OTUxsy72FdG8sIe0IGqVMTXz6kcob7l/uM x1KL1rhxMwCJ8Tm1yUNnDOISbc1DO+aknMBzHCYdiDw== X-Received: by 2002:a05:600c:474d:b0:40b:32e7:2ffa with SMTP id w13-20020a05600c474d00b0040b32e72ffamr271275wmo.20.1700762588477; Thu, 23 Nov 2023 10:03:08 -0800 (PST) X-Received: by 2002:a05:600c:474d:b0:40b:32e7:2ffa with SMTP id w13-20020a05600c474d00b0040b32e72ffamr271257wmo.20.1700762588111; Thu, 23 Nov 2023 10:03:08 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id bd12-20020a05600c1f0c00b0040b3027ddc5sm3417227wmb.37.2023.11.23.10.03.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:07 -0800 (PST) From: Dimitri John Ledkov To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" Cc: linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] uapi: remove a.out.h uapi header Date: Thu, 23 Nov 2023 18:02:45 +0000 Message-Id: <20231123180246.750674-6-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123180246.750674-1-dimitri.ledkov@canonical.com> References: <20231123180246.750674-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 23 Nov 2023 10:03:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783378886635641543 X-GMAIL-MSGID: 1783378886635641543 Stop shipping a.out.h uapi headers, unused. Signed-off-by: Dimitri John Ledkov --- include/uapi/Kbuild | 4 - include/uapi/linux/a.out.h | 251 ------------------------------------- 2 files changed, 255 deletions(-) delete mode 100644 include/uapi/linux/a.out.h diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild index 61ee6e59c9..850597437b 100644 --- a/include/uapi/Kbuild +++ b/include/uapi/Kbuild @@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),) -no-export-headers += linux/a.out.h -endif - ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h),) no-export-headers += linux/kvm.h endif diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h deleted file mode 100644 index 5fafde3798..0000000000 --- a/include/uapi/linux/a.out.h +++ /dev/null @@ -1,251 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _UAPI__A_OUT_GNU_H__ -#define _UAPI__A_OUT_GNU_H__ - -#define __GNU_EXEC_MACROS__ - -#ifndef __STRUCT_EXEC_OVERRIDE__ - -#include - -#endif /* __STRUCT_EXEC_OVERRIDE__ */ - -#ifndef __ASSEMBLY__ - -/* these go in the N_MACHTYPE field */ -enum machine_type { -#if defined (M_OLDSUN2) - M__OLDSUN2 = M_OLDSUN2, -#else - M_OLDSUN2 = 0, -#endif -#if defined (M_68010) - M__68010 = M_68010, -#else - M_68010 = 1, -#endif -#if defined (M_68020) - M__68020 = M_68020, -#else - M_68020 = 2, -#endif -#if defined (M_SPARC) - M__SPARC = M_SPARC, -#else - M_SPARC = 3, -#endif - /* skip a bunch so we don't run into any of sun's numbers */ - M_386 = 100, - M_MIPS1 = 151, /* MIPS R3000/R3000 binary */ - M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ -}; - -#if !defined (N_MAGIC) -#define N_MAGIC(exec) ((exec).a_info & 0xffff) -#endif -#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) -#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) -#define N_SET_INFO(exec, magic, type, flags) \ - ((exec).a_info = ((magic) & 0xffff) \ - | (((int)(type) & 0xff) << 16) \ - | (((flags) & 0xff) << 24)) -#define N_SET_MAGIC(exec, magic) \ - ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff))) - -#define N_SET_MACHTYPE(exec, machtype) \ - ((exec).a_info = \ - ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16)) - -#define N_SET_FLAGS(exec, flags) \ - ((exec).a_info = \ - ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24)) - -/* Code indicating object file or impure executable. */ -#define OMAGIC 0407 -/* Code indicating pure executable. */ -#define NMAGIC 0410 -/* Code indicating demand-paged executable. */ -#define ZMAGIC 0413 -/* This indicates a demand-paged executable with the header in the text. - The first page is unmapped to help trap NULL pointer references */ -#define QMAGIC 0314 - -/* Code indicating core file. */ -#define CMAGIC 0421 - -#if !defined (N_BADMAG) -#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC \ - && N_MAGIC(x) != NMAGIC \ - && N_MAGIC(x) != ZMAGIC \ - && N_MAGIC(x) != QMAGIC) -#endif - -#define _N_HDROFF(x) (1024 - sizeof (struct exec)) - -#if !defined (N_TXTOFF) -#define N_TXTOFF(x) \ - (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \ - (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec))) -#endif - -#if !defined (N_DATOFF) -#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) -#endif - -#if !defined (N_TRELOFF) -#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) -#endif - -#if !defined (N_DRELOFF) -#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x)) -#endif - -#if !defined (N_SYMOFF) -#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x)) -#endif - -#if !defined (N_STROFF) -#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x)) -#endif - -/* Address of text segment in memory after it is loaded. */ -#if !defined (N_TXTADDR) -#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0) -#endif - -/* Address of data segment in memory after it is loaded. */ -#ifndef __KERNEL__ -#include -#endif -#if defined(__i386__) || defined(__mc68000__) -#define SEGMENT_SIZE 1024 -#else -#ifndef SEGMENT_SIZE -#ifndef __KERNEL__ -#define SEGMENT_SIZE getpagesize() -#endif -#endif -#endif - -#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE) - -#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) - -#ifndef N_DATADDR -#define N_DATADDR(x) \ - (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \ - : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x)))) -#endif - -/* Address of bss segment in memory after it is loaded. */ -#if !defined (N_BSSADDR) -#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data) -#endif - -#if !defined (N_NLIST_DECLARED) -struct nlist { - union { - char *n_name; - struct nlist *n_next; - long n_strx; - } n_un; - unsigned char n_type; - char n_other; - short n_desc; - unsigned long n_value; -}; -#endif /* no N_NLIST_DECLARED. */ - -#if !defined (N_UNDF) -#define N_UNDF 0 -#endif -#if !defined (N_ABS) -#define N_ABS 2 -#endif -#if !defined (N_TEXT) -#define N_TEXT 4 -#endif -#if !defined (N_DATA) -#define N_DATA 6 -#endif -#if !defined (N_BSS) -#define N_BSS 8 -#endif -#if !defined (N_FN) -#define N_FN 15 -#endif - -#if !defined (N_EXT) -#define N_EXT 1 -#endif -#if !defined (N_TYPE) -#define N_TYPE 036 -#endif -#if !defined (N_STAB) -#define N_STAB 0340 -#endif - -/* The following type indicates the definition of a symbol as being - an indirect reference to another symbol. The other symbol - appears as an undefined reference, immediately following this symbol. - - Indirection is asymmetrical. The other symbol's value will be used - to satisfy requests for the indirect symbol, but not vice versa. - If the other symbol does not have a definition, libraries will - be searched to find a definition. */ -#define N_INDR 0xa - -/* The following symbols refer to set elements. - All the N_SET[ATDB] symbols with the same name form one set. - Space is allocated for the set in the text section, and each set - element's value is stored into one word of the space. - The first word of the space is the length of the set (number of elements). - - The address of the set is made into an N_SETV symbol - whose name is the same as the name of the set. - This symbol acts like a N_DATA global symbol - in that it can satisfy undefined external references. */ - -/* These appear as input to LD, in a .o file. */ -#define N_SETA 0x14 /* Absolute set element symbol */ -#define N_SETT 0x16 /* Text set element symbol */ -#define N_SETD 0x18 /* Data set element symbol */ -#define N_SETB 0x1A /* Bss set element symbol */ - -/* This is output from LD. */ -#define N_SETV 0x1C /* Pointer to set vector in data area. */ - -#if !defined (N_RELOCATION_INFO_DECLARED) -/* This structure describes a single relocation to be performed. - The text-relocation section of the file is a vector of these structures, - all of which apply to the text section. - Likewise, the data-relocation section applies to the data section. */ - -struct relocation_info -{ - /* Address (within segment) to be relocated. */ - int r_address; - /* The meaning of r_symbolnum depends on r_extern. */ - unsigned int r_symbolnum:24; - /* Nonzero means value is a pc-relative offset - and it should be relocated for changes in its own address - as well as for changes in the symbol or section specified. */ - unsigned int r_pcrel:1; - /* Length (as exponent of 2) of the field to be relocated. - Thus, a value of 2 indicates 1<<2 bytes. */ - unsigned int r_length:2; - /* 1 => relocate with value of symbol. - r_symbolnum is the index of the symbol - in file's the symbol table. - 0 => relocate with the address of a segment. - r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS - (the N_EXT bit may be set also, but signifies nothing). */ - unsigned int r_extern:1; - /* Four bits that aren't used, but when writing an object file - it is desirable to clear them. */ - unsigned int r_pad:4; -}; -#endif /* no N_RELOCATION_INFO_DECLARED. */ - -#endif /*__ASSEMBLY__ */ -#endif /* _UAPI__A_OUT_GNU_H__ */