From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752855AbeANUjJ (ORCPT + 1 other); Sun, 14 Jan 2018 15:39:09 -0500 Received: from terminus.zytor.com ([65.50.211.136]:60031 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752188AbeANUjH (ORCPT ); Sun, 14 Jan 2018 15:39:07 -0500 Date: Sun, 14 Jan 2018 12:37:56 -0800 From: tip-bot for Jan Kiszka Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, jan.kiszka@siemens.com Reply-To: mingo@kernel.org, tglx@linutronix.de, jan.kiszka@siemens.com, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <939687007cbd7643b02fd330e8616e7e5944063f.1511770314.git.jan.kiszka@siemens.com> References: <939687007cbd7643b02fd330e8616e7e5944063f.1511770314.git.jan.kiszka@siemens.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/jailhouse: Silence ACPI warning Git-Commit-ID: 5ae4443010b83cce3d55ce5259870e542a7c9551 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: 5ae4443010b83cce3d55ce5259870e542a7c9551 Gitweb: https://git.kernel.org/tip/5ae4443010b83cce3d55ce5259870e542a7c9551 Author: Jan Kiszka AuthorDate: Mon, 27 Nov 2017 09:11:51 +0100 Committer: Thomas Gleixner CommitDate: Sun, 14 Jan 2018 21:11:56 +0100 x86/jailhouse: Silence ACPI warning Jailhouse support does not depend on ACPI, and does not even use it. But if it should be enabled, avoid warning about its absence in the platform. Signed-off-by: Jan Kiszka Signed-off-by: Thomas Gleixner Cc: jailhouse-dev@googlegroups.com Link: https://lkml.kernel.org/r/939687007cbd7643b02fd330e8616e7e5944063f.1511770314.git.jan.kiszka@siemens.com --- arch/x86/kernel/jailhouse.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c index b9f116d..54469ef 100644 --- a/arch/x86/kernel/jailhouse.c +++ b/arch/x86/kernel/jailhouse.c @@ -125,6 +125,12 @@ static void __init jailhouse_init_platform(void) pr_debug("Jailhouse: PM-Timer IO Port: %#x\n", pmtmr_ioport); precalibrated_tsc_khz = setup_data.tsc_khz; + + /* + * Avoid that the kernel complains about missing ACPI tables - there + * are none in a non-root cell. + */ + disable_acpi(); } bool jailhouse_paravirt(void)