Date: Tue, 20 Jul 2010 05:14:28 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r210279 - in user/jmallett/octeon/sys/mips: cavium mips Message-ID: <201007200514.o6K5ESJj094715@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Tue Jul 20 05:14:27 2010 New Revision: 210279 URL: http://svn.freebsd.org/changeset/base/210279 Log: Fix after merge. Modified: user/jmallett/octeon/sys/mips/cavium/octeon_mp.c user/jmallett/octeon/sys/mips/mips/pmap.c Modified: user/jmallett/octeon/sys/mips/cavium/octeon_mp.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octeon_mp.c Tue Jul 20 04:46:04 2010 (r210278) +++ user/jmallett/octeon/sys/mips/cavium/octeon_mp.c Tue Jul 20 05:14:27 2010 (r210279) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/hwfunc.h> +#include <machine/md_var.h> #include <machine/smp.h> #include <mips/cavium/octeon_pcmap_regs.h> @@ -95,7 +96,7 @@ platform_init_ap(int cpuid) */ clock_int_mask = hard_int_mask(5); ipi_int_mask = hard_int_mask(platform_ipi_intrnum()); - set_intr_mask(ALL_INT_MASK & ~(ipi_int_mask | clock_int_mask)); + set_intr_mask(MIPS_SR_INT_MASK & ~(ipi_int_mask | clock_int_mask)); mips_wbflush(); } Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Tue Jul 20 04:46:04 2010 (r210278) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Tue Jul 20 05:14:27 2010 (r210279) @@ -453,8 +453,6 @@ again: } } #endif - -#endif /* * Allocate segment table for the kernel */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007200514.o6K5ESJj094715>