On Fri, Jan 14, 2005 at 01:08:36PM +0100, San Vu-Ngoc wrote:
> Horms a écrit :
>
> >Hi,
> >
> >I think this is the same bug as #290039, #290013 and #289517,
> >could you take a look at the fix that I have proposed there?
> >
> >
> >
> Could you tell me where exactly you proposed your patch ?
Here it is.
--
Horms
# origin: len.brown (BitKeeper)
# cset: 1.1458.1.9 (2.4) key=41afcab8Wwiw4tJmged5k36s38Ms8A
# inclusion: upstream
# descrition: [ACPI] acpi=off must disable acpi_early_init()
# revision date: Fri, 14 Jan 2005 19:32:18 +0900
#
# S rset: ChangeSet|1.1458.1.8..1.1458.1.9
# I rset: drivers/acpi/bus.c|1.31..1.32
#
# Key:
# S: Skipped ChangeSet file only
# O: Original Followed by Updated
# U: Updated Included with updated range of versions
# I: Included Included verbatim
# E: Excluded Excluded on request from user
# D: Deleted Manually deleted by subsequent user edit
#
#
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/12/02 21:08:56-05:00 [EMAIL PROTECTED]
# [ACPI] acpi=off must disable acpi_early_init()
#
# Signed-off-by: Philippe Troin <[EMAIL PROTECTED]>
# Signed-off-by: Len Brown <[EMAIL PROTECTED]>
#
# drivers/acpi/bus.c
# 2004/12/02 21:08:54-05:00 [EMAIL PROTECTED] +6 -3
# acpi_early_init() should not run if acpi=off
#
#
===== drivers/acpi/bus.c 1.31 vs 1.32 =====
--- 1.31/drivers/acpi/bus.c 2004-08-25 11:54:26 +09:00
+++ 1.32/drivers/acpi/bus.c 2004-12-03 11:08:54 +09:00
@@ -1850,7 +1850,10 @@
acpi_status status = AE_OK;
struct acpi_buffer buffer = {sizeof(acpi_fadt), &acpi_fadt};
- ACPI_FUNCTION_TRACE("acpi_bus_init");
+ ACPI_FUNCTION_TRACE("acpi_early_init");
+
+ if (acpi_disabled)
+ return_VOID;
status = acpi_initialize_subsystem();
if (ACPI_FAILURE(status)) {
@@ -1899,11 +1902,11 @@
goto error0;
}
- return;
+ return_VOID;
error0:
disable_acpi();
- return;
+ return_VOID;
}
static int __init
