Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (abdba717) · Commits · 戴 / test

arch/sparc64/kernel/irq.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -329,6 +329,10 @@ static void sun4v_irq_enable(unsigned int virt_irq)
		if (err != HV_EOK)
		printk("sun4v_intr_settarget(%x,%lu): err(%d)\n",
		ino, cpuid, err);
		err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);
		if (err != HV_EOK)
		printk("sun4v_intr_setstate(%x): "
		"err(%d)\n", ino, err);
		err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED);
		if (err != HV_EOK)
		printk("sun4v_intr_setenabled(%x): err(%d)\n",
		@@ -400,6 +404,12 @@ static void sun4v_virq_enable(unsigned int virt_irq)
		"err(%d)\n",
		dev_handle, dev_ino, cpuid, err);
		err = sun4v_vintr_set_state(dev_handle, dev_ino,
		HV_INTR_STATE_IDLE);
		if (err != HV_EOK)
		printk("sun4v_vintr_set_state(%lx,%lx,"
		"HV_INTR_STATE_IDLE): err(%d)\n",
		dev_handle, dev_ino, err);
		err = sun4v_vintr_set_valid(dev_handle, dev_ino,
		HV_INTR_ENABLED);
		if (err != HV_EOK)
		printk("sun4v_vintr_set_state(%lx,%lx,"
		@@ -420,7 +430,7 @@ static void sun4v_virq_disable(unsigned int virt_irq)
		dev_handle = ino & IMAP_IGN;
		dev_ino = ino & IMAP_INO;

		err = sun4v_vintr_set_state(dev_handle, dev_ino,
		err = sun4v_vintr_set_valid(dev_handle, dev_ino,
		HV_INTR_DISABLED);
		if (err != HV_EOK)
		printk("sun4v_vintr_set_state(%lx,%lx,"

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ struct mdesc_node {
		u64 node;
		unsigned int unique_id;
		unsigned int num_arcs;
		unsigned int irqs[2];
		struct property *properties;
		struct mdesc_node *hash_next;
		struct mdesc_node *allnodes_next;

+1 −0