---

yaml --- r: 7791 b: refs/heads/master c: dd8f39b h: refs/heads/master i: 7789: efc3796 7787: 6ac133d 7783: 9464a6a 7775: 39e281d v: v3
git-mirror · Jul 30, 2005 · dbbe74a · dbbe74a
1 parent 8ef4159
commit dbbe74a
Show file tree

Hide file tree

Showing 15 changed files with 984 additions and 248 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2c2e03409f5f5405e79d9d9156202b75cb5b35b
+refs/heads/master: dd8f39bbf5154cdbfd698fc70c66faba33eafa44
diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -442,6 +442,13 @@ acpi_cpufreq_cpu_init (
 			(u32) data->acpi_data.states[i].transition_latency);
 
 	cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu);
+
+	/*
+	 * the first call to ->target() should result in us actually
+	 * writing something to the appropriate registers.
+	 */
+	data->resume = 1;
+
 	return (result);
 
  err_freqfree:

diff --git a/trunk/arch/i386/pci/acpi.c b/trunk/arch/i386/pci/acpi.c
@@ -30,6 +30,7 @@ static int __init pci_acpi_init(void)
 	acpi_irq_penalty_init();
 	pcibios_scanned++;
 	pcibios_enable_irq = acpi_pci_irq_enable;
+	pcibios_disable_irq = acpi_pci_irq_disable;
 
 	if (pci_routeirq) {
 		/*

diff --git a/trunk/arch/i386/pci/common.c b/trunk/arch/i386/pci/common.c
@@ -249,3 +249,9 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 
 	return pcibios_enable_irq(dev);
 }
+
+void pcibios_disable_device (struct pci_dev *dev)
+{
+	if (pcibios_disable_irq)
+		pcibios_disable_irq(dev);
+}
diff --git a/trunk/arch/i386/pci/irq.c b/trunk/arch/i386/pci/irq.c
@@ -56,6 +56,7 @@ struct irq_router_handler {
 };
 
 int (*pcibios_enable_irq)(struct pci_dev *dev) = NULL;
+void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
 
 /*
  *  Search 0xf0000 -- 0xfffff for the PCI IRQ Routing Table.

diff --git a/trunk/arch/i386/pci/pci.h b/trunk/arch/i386/pci/pci.h
@@ -72,3 +72,4 @@ extern int pcibios_scanned;
 extern spinlock_t pci_config_lock;
 
 extern int (*pcibios_enable_irq)(struct pci_dev *dev);
+extern void (*pcibios_disable_irq)(struct pci_dev *dev);
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ struct irq_router_handler { @@
     };
     int (*pcibios_enable_irq)(struct pci_dev *dev) = NULL;
+    void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
     /*
      *  Search 0xf0000 -- 0xfffff for the PCI IRQ Routing Table.
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,3 +72,4 @@ extern int pcibios_scanned;
		extern spinlock_t pci_config_lock;

		extern int (pcibios_enable_irq)(struct pci_dev dev);
		extern void (pcibios_disable_irq)(struct pci_dev dev);