lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/apic' into irq/numa

Browse Source 
Merge reason: both topics modify the APIC code but were able to do it in
              parallel so far. An upcoming patch generates a conflict so
              merge them to avoid the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-05-12 12:17:30 +02:00
parent b9c61b7007 cec6be6d10
commit 6cda3eb62e
573 changed files with 16239 additions and 15593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pci/htirq.c
View File

@@ -160,6 +160,7 @@ int ht_create_irq(struct pci_dev *dev, int idx)
/**
* ht_destroy_irq - destroy an irq created with ht_create_irq
* @irq: irq to be destroyed
*
* This reverses ht_create_irq removing the specified irq from
* existence. The irq should be free before this happens.