Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261911AbVEPVud (ORCPT ); Mon, 16 May 2005 17:50:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261896AbVEPVuU (ORCPT ); Mon, 16 May 2005 17:50:20 -0400 Received: from ezoffice.mandriva.com ([84.14.106.134]:40968 "EHLO ezoffice.mandriva.com") by vger.kernel.org with ESMTP id S261917AbVEPVrx (ORCPT ); Mon, 16 May 2005 17:47:53 -0400 To: Kernel Mailing List , ACPI Developers Cc: Yann Droneaud From: Yann Droneaud In-Reply-To: References: Subject: [PATCH 2/2] IPMI and acpi=off|ht : ipmi_si_intf-acpi-disabled Date: 16 May 2005 23:47:52 +0200 Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.4 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 901 Lines: 24 This patch fix ipmi_si_intf to not use ACPI tables if the ACPI subsystem is disabled. --- linux-2.6.11.9/drivers/char/ipmi/ipmi_si_intf.c 2005-05-11 18:41:12.000000000 -0400 +++ linux-2.6.11.9-fixes/drivers/char/ipmi/ipmi_si_intf.c 2005-05-16 16:38:11.780589696 -0400 @@ -1443,6 +1443,9 @@ static int try_init_acpi(int intf_num, s char *io_type; u8 addr_space; + if (acpi_disabled) + return -ENODEV; + if (acpi_failure) return -ENODEV; Signed-Off-by: ydroneaud@mandriva.com -- Yann Droneaud Consulting Engineer Professional Services Mandriva http://mandriva.com/ (previously known as Mandrakesoft) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/