diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2006-10-04 05:17:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:30 -0400 |
commit | 95d77884c77beed676036d2f74d10b470a483c63 (patch) | |
tree | 7897bc159d0d8ac972abc76e01d6e54c2bca3c84 /include/linux/pci.h | |
parent | 03571e11c4a6d08230657f80970f0a5cc7820471 (diff) |
[PATCH] htirq: tidy up the htirq code
This moves the declarations for the architecture helpers into
include/linux/htirq.h from the generic include/linux/pci.h. Hopefully this
will make this distinction clearer.
htirq.h is included where it is needed.
The dependency on the msi code is fixed and removed.
The Makefile is tidied up.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg KH <greg@kroah.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 0da5a4a8940f..5c604f5fad67 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -615,20 +615,9 @@ extern void msi_remove_pci_irq_vectors(struct pci_dev *dev); | |||
615 | #endif | 615 | #endif |
616 | 616 | ||
617 | #ifdef CONFIG_HT_IRQ | 617 | #ifdef CONFIG_HT_IRQ |
618 | /* Helper functions.. */ | ||
619 | void write_ht_irq_low(unsigned int irq, u32 data); | ||
620 | void write_ht_irq_high(unsigned int irq, u32 data); | ||
621 | u32 read_ht_irq_low(unsigned int irq); | ||
622 | u32 read_ht_irq_high(unsigned int irq); | ||
623 | void mask_ht_irq(unsigned int irq); | ||
624 | void unmask_ht_irq(unsigned int irq); | ||
625 | |||
626 | /* The functions a driver should call */ | 618 | /* The functions a driver should call */ |
627 | int ht_create_irq(struct pci_dev *dev, int idx); | 619 | int ht_create_irq(struct pci_dev *dev, int idx); |
628 | void ht_destroy_irq(unsigned int irq); | 620 | void ht_destroy_irq(unsigned int irq); |
629 | |||
630 | /* The arch hook for getting things started */ | ||
631 | int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev); | ||
632 | #endif /* CONFIG_HT_IRQ */ | 621 | #endif /* CONFIG_HT_IRQ */ |
633 | 622 | ||
634 | extern void pci_block_user_cfg_access(struct pci_dev *dev); | 623 | extern void pci_block_user_cfg_access(struct pci_dev *dev); |