Date: Tue, 8 Dec 2009 05:23:08 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r200248 - stable/8/sys/powerpc/powermac Message-ID: <200912080523.nB85N8gV077003@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Tue Dec 8 05:23:07 2009 New Revision: 200248 URL: http://svn.freebsd.org/changeset/base/200248 Log: MFC r198444: Allow Heathrow-based machines to boot a kernel containing option SMP without panicing. Modified: stable/8/sys/powerpc/powermac/hrowpic.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/powerpc/powermac/hrowpic.c ============================================================================== --- stable/8/sys/powerpc/powermac/hrowpic.c Tue Dec 8 05:18:59 2009 (r200247) +++ stable/8/sys/powerpc/powermac/hrowpic.c Tue Dec 8 05:23:07 2009 (r200248) @@ -182,7 +182,13 @@ hrowpic_toggle_irq(struct hrowpic_softc u_int roffset; u_int rbit; - KASSERT((irq > 0) && (irq < HROWPIC_IRQMAX), ("en irq out of range")); + KASSERT((irq > 0) && (irq <= HROWPIC_IRQMAX), ("en irq out of range")); + + /* + * Humor the SMP layer if it wants to set up an IPI handler. + */ + if (irq == HROWPIC_IRQMAX) + return; /* * Calculate prim/sec register bank for the IRQ, update soft copy,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912080523.nB85N8gV077003>