D35546.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D35546.diff
View Options

	Index: sys/powerpc/include/intr_machdep.h
	===================================================================
	--- sys/powerpc/include/intr_machdep.h
	+++ sys/powerpc/include/intr_machdep.h
	@@ -51,7 +51,7 @@
	u_int powerpc_register_pic(device_t, uint32_t, u_int, u_int, u_int);
	u_int powerpc_get_irq(uint32_t, u_int);

	-void powerpc_dispatch_intr(u_int, struct trapframe *);
	+u_long powerpc_dispatch_intr(u_int, struct trapframe *);
	int powerpc_enable_intr(void);
	int powerpc_setup_intr(const char *, u_int, driver_filter_t, driver_intr_t,
	void , enum intr_type, void *, int);
	Index: sys/powerpc/powerpc/intr_machdep.c
	===================================================================
	--- sys/powerpc/powerpc/intr_machdep.c
	+++ sys/powerpc/powerpc/intr_machdep.c
	@@ -631,7 +631,7 @@
	return (0);
	}

	-void
	+u_long
	powerpc_dispatch_intr(u_int vector, struct trapframe *tf)
	{
	struct powerpc_intr *i;
	@@ -656,7 +656,7 @@
	if (intr_event_handle(ie, tf) != 0) {
	goto stray;
	}
	- return;
	+ return (0);

	stray:
	stray_count++;
	@@ -669,6 +669,7 @@
	}
	if (i != NULL)
	PIC_MASK(i->pic, i->intline, i->priv);
	+ return (stray_count);
	}

	void