From: Len Brown <len.brown@intel.com>
Date: Thu, 7 Feb 2008 09:01:53 +0000 (-0500)
Subject: Merge branches 'release' and 'dsdt-override' into release
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=81e242d0efafb319938d511b115088a5c4523c91;p=deliverable%2Flinux.git

Merge branches 'release' and 'dsdt-override' into release
---

81e242d0efafb319938d511b115088a5c4523c91
diff --cc drivers/acpi/osl.c
index c2c585366fa6,2a400e08e74c..27ccd68b8f46
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@ -347,17 -410,18 +427,26 @@@ acpi_os_table_override(struct acpi_tabl
  	return AE_OK;
  }
  
+ #ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
+ int __init acpi_no_initrd_override_setup(char *s)
+ {
+ 	acpi_no_initrd_override = 1;
+ 	return 1;
+ }
+ __setup("acpi_no_initrd_override", acpi_no_initrd_override_setup);
+ #endif
+ 
  static irqreturn_t acpi_irq(int irq, void *dev_id)
  {
 -	return (*acpi_irq_handler) (acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE;
 +	u32 handled;
 +
 +	handled = (*acpi_irq_handler) (acpi_irq_context);
 +
 +	if (handled) {
 +		acpi_irq_handled++;
 +		return IRQ_HANDLED;
 +	} else
 +		return IRQ_NONE;
  }
  
  acpi_status