From patchwork Tue Aug 15 20:52:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1821573 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RQNlK2NT4z1yfd for ; Wed, 16 Aug 2023 06:53:17 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A2622385558A for ; Tue, 15 Aug 2023 20:53:13 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 8AE9F3858C78 for ; Tue, 15 Aug 2023 20:53:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8AE9F3858C78 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 34438200DD; Tue, 15 Aug 2023 22:53:01 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X4lihbS87g0q; Tue, 15 Aug 2023 22:53:01 +0200 (CEST) Received: from begin (unknown [46.231.241.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 15BD5200D9; Tue, 15 Aug 2023 22:53:01 +0200 (CEST) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1qW12C-00Db8u-0w; Tue, 15 Aug 2023 22:53:00 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] hurd: Add prototype for and thus fix _hurdsig_abort_rpcs call Date: Tue, 15 Aug 2023 22:52:58 +0200 Message-Id: <20230815205258.3241032-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" This was actually not a problem since NULL was getting passed. --- hurd/hurd/signal.h | 6 ++++++ hurd/thread-cancel.c | 11 +---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 96b6fae007..290c455ad4 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -183,6 +184,11 @@ _hurd_self_sigstate (void) } # endif #endif + +extern mach_port_t +_hurdsig_abort_rpcs (struct hurd_sigstate *ss, int signo, int sigthread, + struct machine_thread_all_state *state, int *state_change, + void (*reply) (void)); /* Thread listening on our message port; also called the "signal thread". */ diff --git a/hurd/thread-cancel.c b/hurd/thread-cancel.c index b648046c3d..669d92c606 100644 --- a/hurd/thread-cancel.c +++ b/hurd/thread-cancel.c @@ -22,15 +22,6 @@ #include -/* See hurdsig.c. */ -extern mach_port_t _hurdsig_abort_rpcs (struct hurd_sigstate *ss, - int signo, int sigthread, - struct machine_thread_all_state *, - int *state_change, - mach_port_t *reply_port, - mach_msg_type_name_t reply_port_type, - int untraced); - error_t hurd_thread_cancel (thread_t thread) { @@ -64,7 +55,7 @@ hurd_thread_cancel (thread_t thread) /* Interrupt any interruptible RPC now in progress. */ state.set = 0; - _hurdsig_abort_rpcs (ss, 0, 0, &state, &state_change, NULL, 0, 0); + _hurdsig_abort_rpcs (ss, 0, 0, &state, &state_change, NULL); if (state_change) err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR, (natural_t *) &state.basic,