Date: Mon, 17 May 2010 19:19:48 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r208211 - projects/ppc64/sys/powerpc/ofw Message-ID: <201005171919.o4HJJmEW014796@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Mon May 17 19:19:48 2010 New Revision: 208211 URL: http://svn.freebsd.org/changeset/base/208211 Log: Fix mismerge -- make sure that the interrupt sense from the device tree is configured on the appropriate PIC. Reported by: Andreas Tobler Modified: projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c Modified: projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c ============================================================================== --- projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c Mon May 17 19:13:49 2010 (r208210) +++ projects/ppc64/sys/powerpc/ofw/ofw_pcibus.c Mon May 17 19:19:48 2010 (r208211) @@ -216,7 +216,8 @@ ofw_pcibus_enum_devtree(device_t dev, u_ intr[0] = INTR_VEC(iparent, intr[0]); if (iparent != 0 && icells > 1) { - powerpc_config_intr(intr[0], + powerpc_config_intr( + INTR_VEC(iparent, intr[0]), (intr[1] & 1) ? INTR_TRIGGER_LEVEL : INTR_TRIGGER_EDGE, INTR_POLARITY_HIGH);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005171919.o4HJJmEW014796>