diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-02-15 19:48:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-20 01:13:05 -0800 |
| commit | 9d29a3fafd06534ad73427fee3c968c094d05b9b (patch) | |
| tree | 4afd7455d6249d9143acea6c4704f69aa98d311a /drivers | |
| parent | 7890f794e0e6f7dce2a5f4a03ba64b0b3fe306bd (diff) | |
| download | kernel-crypto-9d29a3fafd06534ad73427fee3c968c094d05b9b.tar.gz kernel-crypto-9d29a3fafd06534ad73427fee3c968c094d05b9b.tar.xz kernel-crypto-9d29a3fafd06534ad73427fee3c968c094d05b9b.zip | |
[SPARC64]: Decode virtual-devices interrupts correctly.
Need to translate through the interrupt-map{,-mask] properties.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/sunhv.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index 71c70d7a998..cc46206a106 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c @@ -21,6 +21,7 @@ #include <asm/hypervisor.h> #include <asm/spitfire.h> #include <asm/vdev.h> +#include <asm/oplib.h> #include <asm/irq.h> #if defined(CONFIG_MAGIC_SYSRQ) @@ -427,7 +428,6 @@ static unsigned int __init get_interrupt(void) const char *cons_str = "console"; const char *compat_str = "compatible"; int node = prom_getchild(sun4v_vdev_root); - unsigned int irq; char buf[64]; int err, len; @@ -449,12 +449,7 @@ static unsigned int __init get_interrupt(void) /* Ok, the this is the OBP node for the sun4v hypervisor * console device. Decode the interrupt. */ - err = prom_getproperty(node, "interrupts", - (char *) &irq, sizeof(irq)); - if (err == -1) - return 0; - - return sun4v_build_irq(sun4v_vdev_devhandle, irq, 4, 0); + return sun4v_vdev_device_interrupt(node); } static u32 sunhv_irq; @@ -487,8 +482,8 @@ static int __init sunhv_init(void) return -ENODEV; } - printk("SUNHV: SUN4V virtual console, IRQ[%08x]\n", - sunhv_irq); + printk("SUNHV: SUN4V virtual console, IRQ %s\n", + __irq_itoa(sunhv_irq)); sunhv_reg.minor = sunserial_current_minor; sunhv_reg.nr = 1; @@ -520,7 +515,6 @@ static void __exit sunhv_exit(void) uart_remove_one_port(&sunhv_reg, port); free_irq(sunhv_irq, port); - sunserial_current_minor -= 1; uart_unregister_driver(&sunhv_reg); |