From nobody Fri Jan 14 01:18:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 03116195BB46; Fri, 14 Jan 2022 01:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JZk2907pDz4t2k; Fri, 14 Jan 2022 01:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642123089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1G8VEbTA6yv5OMvZc9EH6UZn6Z4nFQK/Y796Z5RjgAU=; b=T7CHwbrIC4wLnVMClwYESTrxrS5cNrL1+DeU0P+/REjIBhmKHscq8Os5A8apJfkclTdLa0 LpZT+/cPMxN/nyF/Tjb/R+KmTdZ8edYALwOcfl9dSzLT7YFUBontshhhHw/h09ytFWVTqE iC7vH6jTTe5PKq81JbYOmWH32RooqCmeZSMf7L7VLl29a/GjD79OvfXtDmC45A0woN1UNh NX+5xNyBH8k9w3T7TaWH7EA9OYmugSNPUdebEmsmDCAAl/D5hm0zU6d94W/vEXYmPFLvYy BNql0+8/lXgbpJuM6RcmMGvGZO6egUo39bkDudY6YWXobqTJhr477Ri7CB19uQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEA9F2936; Fri, 14 Jan 2022 01:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20E1I8iP037312; Fri, 14 Jan 2022 01:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20E1I8hR037311; Fri, 14 Jan 2022 01:18:08 GMT (envelope-from git) Date: Fri, 14 Jan 2022 01:18:08 GMT Message-Id: <202201140118.20E1I8hR037311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: be887b3e6cde - main - Move struct freebsd4_ucontext to sys/i386/include/ucontext.h. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be887b3e6cdec1b56db314b7da5501cf25c1a188 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642123089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1G8VEbTA6yv5OMvZc9EH6UZn6Z4nFQK/Y796Z5RjgAU=; b=VNJ6WMN2Z6Qmm5kmESF1ApTC+7gDSMlPsQ6rPXM3CA/45oT+3WkvDjTlwgAuv+lvtiUeq0 SednrAHr4PAYS6DUzJaIilPlfmQNMEUdMrtZt0xLh8exJUbEmZguk+QdAIrJMMwpWc3cCD VyJXs14Bbs02MAKuhSBqKnmtDAwqejgEPBSyCgiQ7Dj3ERDtVLQKnZKIDVXArKeN7YHfAF yUdwWB/qrUrTxSHrBVU4eU42LhHY7fgIU1PfyXnPq8rXrti8zm40hKQrrEI294iz5+dIXA aEmgwswCseU9Yn4hNm35TeTvLm1saUuUzHRTVfGABzspwA8a1+1qVKnGlp3LEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642123089; a=rsa-sha256; cv=none; b=K/rZFimrFiSPznlPr2dqpFf1Uo6qU6VWLZZemSBeMEsTqJSKZGA2SCkdFvLTQnSngEWuKC Lautr7P0y1HGV1Bl6z0qTJO0l4hsKXIRsgyxyhOESzsYVq2z5unOZ/raP8+vxey/7duzbm ZNlza8t30V6x1jGuJ49OAPwyc6id2HVa272osPG6rEcSzogSa5ayHyh67xr+qIgbafqHpS oN/uvRukNMkT2bc+3lS8BtoydiwT7t2J/ZDE9AMI7tLQiQypSqs59yeYz8jXGahtyk0k1g BsFRBX0gvNWkel+ppDmTx6iNT3NUMhGxwa7D3DjVjFcWkBt5ixwtYVXkSgLOFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=be887b3e6cdec1b56db314b7da5501cf25c1a188 commit be887b3e6cdec1b56db314b7da5501cf25c1a188 Author: John Baldwin AuthorDate: 2022-01-14 01:17:43 +0000 Commit: John Baldwin CommitDate: 2022-01-14 01:17:43 +0000 Move struct freebsd4_ucontext to sys/i386/include/ucontext.h. Requested by: kib Reviewed by: brooks, imp, kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33886 --- sys/i386/include/ucontext.h | 8 ++++++++ sys/sys/ucontext.h | 14 -------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/sys/i386/include/ucontext.h b/sys/i386/include/ucontext.h index 0b54b77ae144..292a2bb9573f 100644 --- a/sys/i386/include/ucontext.h +++ b/sys/i386/include/ucontext.h @@ -58,6 +58,14 @@ struct freebsd4_mcontext { __register_t mc_fpregs[28]; /* env87 + fpacc87 + u_long */ __register_t __spare__[17]; }; + +struct freebsd4_ucontext { + sigset_t uc_sigmask; + struct freebsd4_mcontext uc_mcontext; + struct freebsd4_ucontext *uc_link; + stack_t uc_stack; + int __spare__[8]; +}; #endif #include diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h index 8da481732c09..65a331b79086 100644 --- a/sys/sys/ucontext.h +++ b/sys/sys/ucontext.h @@ -39,20 +39,6 @@ #define UCF_SWAPPED 0x00000001 /* Used by swapcontext(3). */ -#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) -#if defined(__i386__) -struct freebsd4_ucontext { - sigset_t uc_sigmask; - struct freebsd4_mcontext uc_mcontext; - struct freebsd4_ucontext *uc_link; - stack_t uc_stack; - int __spare__[8]; -}; -#else /* __i386__ */ -#define freebsd4_ucontext ucontext -#endif /* __i386__ */ -#endif /* _KERNEL */ - #ifndef _KERNEL __BEGIN_DECLS