From nobody Thu Feb 2 11:22:34 2023 X-Original-To: dev-commits-src-branches@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 4P6xGM1v0Gz3cxSl; Thu, 2 Feb 2023 11:22:35 +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 4P6xGM1RzKz49yc; Thu, 2 Feb 2023 11:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675336955; 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=v5GPFGgetBYnP/c7CTzcwE7x1EKgQvuDlhST8/4rr7U=; b=qlUhPcKdXlYWmxNpxgdZdIbUNJAuk1axbz2Lc6dC3rNKXanNjFnwNYpb0TJHHy+S3A7tgs GumX4YyJ3mYnKfrSjcK2KJi89RzNSfh8rPj0TcQ4xQD2UeI+5j9BUi/fNf8SQH/4dlJmGb xHEzr2pF/rg1VG046Tx/sHHIBFCnVgmioJn0cLDMoiVtEumXygFdW3rzJSuDNF3AzSGrAN wynvJywzC21V//F1OV49wDeMSw9HMrtihaI9hXx41JtV2xA2U6xR+q4auPfWkgfMMwmKrD llv69xkKqR81y3aeSEpz/68PMNBdYVRL4vNNz00vV3t2MJBiCcxbR5g4uXOU6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675336955; 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=v5GPFGgetBYnP/c7CTzcwE7x1EKgQvuDlhST8/4rr7U=; b=yK2iHBnKLt41XchQkSTS+w3gjrvdG64QXzbIDapO8z/2nPuwj3lskRWOkfxIhxE016iXRj gibA3wefivtyow2OL+6YPNWuLyK/8nI5iqplpS5OCouLgQHtV+3ZAoVSRFxcPmvFDfBZUS eiTgo6KR+VWNemm5gyLjSgMjx5rItZUC/qaYsCyrlXSN5MXlZNSL8noNAYNQTn6jcoH2UO dmSeuwOFYDW4LpTvN/YSuOqMwo+zEqHxgor4rnxiMggi5HSE7jziUD1qldS4ViFu0HxlEA YU8IBzizs94kfgcKctSt1sj6RCdInuaipKSU/126PIdZykcLAEPuXnkWyO5w5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675336955; a=rsa-sha256; cv=none; b=nJDWewqezWoyhUva41garDw2kbGiICBpcUWUI+h1IA4tTwaUzN3cIrN8rUww/BQG9MY8hh 1IZZOjyN+/k3vYkPdbFwEl8OlnQ4SNRjBaUg+8gFfJEDPrNMapoPPgMgetQAEPMokpX8sy euTKrYWitC6qFW9Cl96hOHaKZEwMyh6GvNhKZh4d8MgbBQP7eihr3kZR4RUh7vDvQRdbp3 zHpPT9PG7RZfRnqXd66JHCfhCAR4vFm5MuBJ6XIzXf4iTf/1hN/I5JVYIdjudvufJ4F+NX IZs6Q0RlJUcw25QT2YDHjtBN5IhyfCD8+KjvkZNpJIHS9+aw/M6ANYoi6qy6lg== 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 4P6xGM0W4Czsdr; Thu, 2 Feb 2023 11:22:35 +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 312BMYRr090669; Thu, 2 Feb 2023 11:22:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312BMYlm090668; Thu, 2 Feb 2023 11:22:34 GMT (envelope-from git) Date: Thu, 2 Feb 2023 11:22:34 GMT Message-Id: <202302021122.312BMYlm090668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 4a90c1df208e - stable/13 - linuxkpi: Move cpu_relax out of ifdef for x86 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4a90c1df208ed24bbeade42717c21faad0b13724 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4a90c1df208ed24bbeade42717c21faad0b13724 commit 4a90c1df208ed24bbeade42717c21faad0b13724 Author: Emmanuel Vadot AuthorDate: 2022-11-10 11:50:51 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-02 11:20:58 +0000 linuxkpi: Move cpu_relax out of ifdef for x86 It's needed by drm-kmod and this allow building on arm64 and powerpc. Reported by: jhibbits Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit ee247fc1e93e6d37cf509a640a7d273616056f5d) --- sys/compat/linuxkpi/common/include/asm/processor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/processor.h b/sys/compat/linuxkpi/common/include/asm/processor.h index ee2f48b50b44..86d4ab9de98f 100644 --- a/sys/compat/linuxkpi/common/include/asm/processor.h +++ b/sys/compat/linuxkpi/common/include/asm/processor.h @@ -39,9 +39,9 @@ struct cpuinfo_x86 { uint16_t x86_max_cores; }; -#define cpu_relax() cpu_spinwait() - extern struct cpuinfo_x86 boot_cpu_data; #endif +#define cpu_relax() cpu_spinwait() + #endif /* _LINUXKPI_ASM_PROCESSOR_H_ */