From patchwork Mon Nov 8 19:42:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12609035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 547E7C433EF for ; Mon, 8 Nov 2021 19:49:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD8D3619E2 for ; Mon, 8 Nov 2021 19:49:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BD8D3619E2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:37356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkAeO-0002Cx-T9 for qemu-devel@archiver.kernel.org; Mon, 08 Nov 2021 14:49:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkAcn-0001J1-5f for qemu-devel@nongnu.org; Mon, 08 Nov 2021 14:48:13 -0500 Received: from [2607:f8b0:4864:20::536] (port=43752 helo=mail-pg1-x536.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mkAcl-0005gA-JT for qemu-devel@nongnu.org; Mon, 08 Nov 2021 14:48:12 -0500 Received: by mail-pg1-x536.google.com with SMTP id b4so16094743pgh.10 for ; Mon, 08 Nov 2021 11:48:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2zhDUNlH9V2NZmbK5FxvXdG3eYIRKHrHgc0sLLsiMMM=; b=Oh+A4sr8YmpT9PBQ/NZnsXC1VC4FARrHuiDV3ybrFHpxWeZS4xauk4XbyWPcFocznQ Bc4RS2Oe5DLPsygK2YIjZMkxVbUyKgW0lTNA7SR0UBQMLOkZeCYaWp86GeT0cRdxTtJY KsPNYomCbK16PwJE5HYWw6kCLyb4MNTpPGsAKRArMlp91++BiocxqhlSgO0PHc+XCeXn McTZKTwC7vFXpm74aeZGT7PH4yGVKWo94ZsY30gNFAHzqNJnShcVR4tysDJjW/Gz71pm DDJCiE6f80vwAZLxYP3cdAY+h5fOzNI4YAmVgOzHFLpEf15kl23NTs+bDVijEEbAO/9T sSNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2zhDUNlH9V2NZmbK5FxvXdG3eYIRKHrHgc0sLLsiMMM=; b=a/21EkYY5tnruffubteeHGHDdvvWrVm8atlstPVCeP9A9iG5P0384NaXDfNPzhiKLz S/rhrwDY+w0BHygk58U+22HJ8j5pRyMyuz2yN8odMYUhKI4B2TG0rzOqOF27n9O15+7P wfbM9yXck8D9NL5Wdb8nF8+vksScSpsfEKnq1bF5oWzheguIBMte0BB9QyCxWBk6silz JJLFvfhpR4oECetYrqRBpxhLJrxX6HRxvLJtVZjWw7Z02ohuNxl5Qebdd/WGZaIIvewh uTxC+eQ4BqgdHaGIxOIFPb4n1OdNEtHe2LQMutelK3xaDJpkWi7ajH12XzvkzH53uPgW RB4g== X-Gm-Message-State: AOAM530Bkotbt+cv7t4ucKTQ3Lh7kWDi6x7di+mPDiE+LC+n1aN7clhx mtbQ1UWdPpgrKTvJuZNWdeQ/CS1TL+0= X-Google-Smtp-Source: ABdhPJyz49/p+xLlz2XmoXeUDwFPAn+gx6/69e6z3bR3Ii4wFk3hw1M3ilzmt2uVi0k6OcOqcr+kLA== X-Received: by 2002:a17:903:2055:b0:142:497c:a249 with SMTP id q21-20020a170903205500b00142497ca249mr1456779pla.35.1636400553571; Mon, 08 Nov 2021 11:42:33 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::f94a]) by smtp.gmail.com with ESMTPSA id b130sm16515581pfb.9.2021.11.08.11.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 11:42:33 -0800 (PST) From: Khem Raj To: qemu-devel@nongnu.org Subject: [PATCH] linux-user: Replace __u64 with uint64_t Date: Mon, 8 Nov 2021 11:42:30 -0800 Message-Id: <20211108194230.1836262-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::536 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=raj.khem@gmail.com; helo=mail-pg1-x536.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Khem Raj Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" uint64_t is available in all userspaces via compiler include stdint.h therefore use it instead of __u64 which is linux internal type, it fixes build on some platforms eg. aarch64 systems using musl C library Signed-off-by: Khem Raj Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Warner Losh --- linux-user/host/aarch64/hostdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h index a8d41a21ad..34d934f665 100644 --- a/linux-user/host/aarch64/hostdep.h +++ b/linux-user/host/aarch64/hostdep.h @@ -25,7 +25,7 @@ extern char safe_syscall_end[]; static inline void rewind_if_in_safe_syscall(void *puc) { ucontext_t *uc = puc; - __u64 *pcreg = &uc->uc_mcontext.pc; + uint64_t *pcreg = &uc->uc_mcontext.pc; if (*pcreg > (uintptr_t)safe_syscall_start && *pcreg < (uintptr_t)safe_syscall_end) {