diff -Nur linux-2.4.21/drivers/acpi/ec.c linux-2.4.21.new/drivers/acpi/ec.c
--- linux-2.4.21/drivers/acpi/ec.c	2003-09-18 09:00:56.000000000 +0800
+++ linux-2.4.21.new/drivers/acpi/ec.c	2003-09-18 17:23:45.000000000 +0800
@@ -90,6 +90,8 @@
 /* External interfaces use first EC only, so remember */
 static struct acpi_device *first_ec;
 
+/*We use kernel thread to handle ec's gpe query, so the query must defer. The query need a context, which can be released, when we replace ec_ecdt with EC device. So defered query may have a wrong context. We use a indication to avoid it*/
+static int ec_device_init = 0;
 /* --------------------------------------------------------------------------
                              Transaction Management
    -------------------------------------------------------------------------- */
@@ -389,8 +391,11 @@
 
 	acpi_disable_gpe(NULL, ec->gpe_bit, ACPI_ISR);
 
-	status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
-		acpi_ec_gpe_query, ec);
+        if(!ec_device_init)
+		acpi_ec_gpe_query(ec); /*directly query when device did't init*/
+        else
+                status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
+		        acpi_ec_gpe_query, ec);
 }
 
 /* --------------------------------------------------------------------------
@@ -582,6 +587,8 @@
 	   we now have the *real* EC info, so kill the makeshift one.*/
 	acpi_evaluate_integer(ec->handle, "_UID", NULL, &uid);
 	if (ec_ecdt && ec_ecdt->uid == uid) {
+                acpi_disable_gpe(NULL, ec_ecdt->gpe_bit, ACPI_NOT_ISR);
+                ec_device_init = 1;
 		acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
 			ACPI_ADR_SPACE_EC, &acpi_ec_space_handler);