diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2008-08-06 01:10:03 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-08-20 08:34:58 +0200 |
| commit | 25235f712b680d00756a73ee64289137989fc6fd (patch) | |
| tree | 3237a42b97fd5f7136ad7a7be9ef3540697cb5f4 /arch/powerpc/include | |
| parent | powerpc: Convert the FSL MSI code to use msi_bitmap (diff) | |
| download | linux-25235f712b680d00756a73ee64289137989fc6fd.tar.xz linux-25235f712b680d00756a73ee64289137989fc6fd.zip | |
powerpc: Convert the MPIC MSI code to use msi_bitmap
This affects the U3 MSI code as well as the PASEMI MSI code. We keep
some of the MPIC routines as helpers, and also the U3 best-guess
reservation logic. The rest is replaced by the generic code.
And a few printk format changes due to hwirq type change.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/mpic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index fe566a348a86..34d9ac433ace 100644 --- a/arch/powerpc/include/asm/mpic.h +++ b/arch/powerpc/include/asm/mpic.h @@ -5,6 +5,7 @@ #include <linux/irq.h> #include <linux/sysdev.h> #include <asm/dcr.h> +#include <asm/msi_bitmap.h> /* * Global registers @@ -301,8 +302,7 @@ struct mpic #endif #ifdef CONFIG_PCI_MSI - spinlock_t bitmap_lock; - unsigned long *hwirq_bitmap; + struct msi_bitmap msi_bitmap; #endif #ifdef CONFIG_MPIC_BROKEN_REGREAD |