From nobody Wed Feb 11 11:30:16 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0B1A78C88 for ; Wed, 22 May 2024 02:28:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716344922; cv=none; b=J5JXY/dGc06ULX5cziim3S1/FsylKXcPJL5T0dRf4rSXc4ivuhTMIm11VJmEf891JqMpSTj7nnDFZ1U2OiCM/YrD3wdW23EWZwAWn/r128lDKAV3KCB4iOdPerfDCWM7RKWIhRMWKkimHxzsnRI1Gpw/lvMFh3eU0Xexx0941M0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716344922; c=relaxed/simple; bh=anPM5N+OHWuLglN6BHbuA0ZyXvZryJxlwQUZs1Mzw2k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DpMHcXQg0PLFuzt2pmQlYIgAjJ5j2VVuVQ4aHZ6sl8eeuRWb43JraH8sqKT87/o7y2asDdxOC+H5VmZ20rvC24kpIXP2ePx6PjbKWg3B8/eD1KUvn8uzZ4EsK8C17N9984sZ/knTRL+xb26fxq4sqiravpUU1rcQ9RqY35UONBI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1p1pLXDr; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1p1pLXDr" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2b364c4c4b0so13253906a91.1 for ; Tue, 21 May 2024 19:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1716344919; x=1716949719; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=w+U7wzbNqJl9ii7+XfVEw3LB69135VJ3H5IvnuX0LIo=; b=1p1pLXDrHSnLRUSnh0ne5QbMLkP0u/LYjrV6a7iE4z8n6MfMhrKpGkhZYaAgZnhNDd Svnqap3lGuq/kMPIEwn2hboW9mjj5WOZyeyeR0/3qB8JXxsuiXJPcwBu2A9IeQsGzoZx 1MThP9c7hrrJBPx59l01fb34C1M3M+1wh21INVWeaHfpEbgsSG4vPMXQMrDCRowJfX+Q 4VrJtiHe8kqhzqkrZBxq08EUSTzJKIVHV48tkKajcv+3AvVp5Z+QqHTS+5cwPLTs2/Vg qpOkUdnHdiRKBL9RSpyYUFdydPFnFA2HKf2gVxfX0AqLmySa4G4QwhN4zJ4NHPUfZIti sn+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716344919; x=1716949719; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=w+U7wzbNqJl9ii7+XfVEw3LB69135VJ3H5IvnuX0LIo=; b=dpf+6G8pGNFxqTmqIN1uMkrmiqougNsaUtp507GQ5I41tJvvT70yTcmOCTfpKa8kFZ 2VhdwOw0WzOA0fqMtot1/fFJpBoJhbB8d1VKoQubiLbXsosp+jhfWJVrhAsM/3d7cR3U vSXAuSg821rR8d6dpK8K6Ce38FSdm7aFz7prgMG2iakmFEY5HZ/aAo4M8VMyKCyIv0QG TQN/Bl2SykpqK39UyAdD7Opxl/188nzelbE8734XzuTadOVFXJjwPfN3qB2fO6Cj1zsM ZSQF6Ux0bIt0T2LGWX3/xCc+k2oFHNu3lIvsQoOoA5FRwxaN2BByCnAEh1zDPyZZobYS yeHA== X-Forwarded-Encrypted: i=1; AJvYcCUD0R5bNm8x6YNcg8Gcfh1QA8SwOwKm3Bc6JNTnSjiNFtnWQbpRMRGZWswM9kQGLhm8yyRGjPcHRj+8h1dyaBZMLjbNX4i9iZbdTl0a X-Gm-Message-State: AOJu0YyQIqs7ka+hFZ7RKdQq40ouzcGhnaS5vgJgwQvcj3tfAZOqYUAU 0CFC6pXzcH9uB7knEr+oyuhhH5yKJo9ffKgotuxgrhhzck8wwlsNA/LL02E8s/yTOm0HG3Z/5Y6 hFw== X-Google-Smtp-Source: AGHT+IEHUZ71Ny+Ioure2hruFjw2oRt0QpKd4bMsocwR7aZc6kl7/SQ67avYLUaT2vnq64tKh1daPSDmX5I= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:4a0f:b0:2a5:dd7:1c35 with SMTP id 98e67ed59e1d1-2bd9f6458d9mr9574a91.8.1716344919071; Tue, 21 May 2024 19:28:39 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 21 May 2024 19:28:26 -0700 In-Reply-To: <20240522022827.1690416-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240522022827.1690416-1-seanjc@google.com> X-Mailer: git-send-email 2.45.0.215.g3402c0e53f-goog Message-ID: <20240522022827.1690416-6-seanjc@google.com> Subject: [PATCH v2 5/6] x86/reboot: Unconditionally define cpu_emergency_virt_cb typedef From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Chao Gao , Kai Huang Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Define cpu_emergency_virt_cb even if the kernel is being built without KVM support so that KVM can reference the typedef in asm/kvm_host.h without needing yet more #ifdefs. No functional change intended. Signed-off-by: Sean Christopherson Acked-by: Kai Huang Reviewed-by: Chao Gao --- arch/x86/include/asm/reboot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index 6536873f8fc0..d0ef2a678d66 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -25,8 +25,8 @@ void __noreturn machine_real_restart(unsigned int type); #define MRR_BIOS 0 #define MRR_APM 1 =20 -#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD) typedef void (cpu_emergency_virt_cb)(void); +#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD) void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback); void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callbac= k); void cpu_emergency_disable_virtualization(void); --=20 2.45.0.215.g3402c0e53f-goog