Date: Tue, 13 Jul 2010 22:30:27 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r210027 - head/sys/mips/sibyte Message-ID: <201007132230.o6DMURb6074517@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Jul 13 22:30:27 2010 New Revision: 210027 URL: http://svn.freebsd.org/changeset/base/210027 Log: Remove redunant machine/cpuregs.h include. Also, spell things like in machine/cpuregs.h instead of machine/cpu.h. Modified: head/sys/mips/sibyte/sb_machdep.c Modified: head/sys/mips/sibyte/sb_machdep.c ============================================================================== --- head/sys/mips/sibyte/sb_machdep.c Tue Jul 13 22:27:19 2010 (r210026) +++ head/sys/mips/sibyte/sb_machdep.c Tue Jul 13 22:30:27 2010 (r210027) @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <machine/cpuregs.h> #include "opt_ddb.h" #include "opt_kdb.h" @@ -253,7 +252,7 @@ mips_init(void) * code to the XTLB exception vector. */ { - bcopy(MipsTLBMiss, (void *)XTLB_MISS_EXC_VEC, + bcopy(MipsTLBMiss, (void *)MIPS3_XTLB_MISS_EXC_VEC, MipsTLBMissEnd - MipsTLBMiss); mips_icache_sync_all(); @@ -314,7 +313,7 @@ kseg0_map_coherent(void) const int CFG_K0_COHERENT = 5; config = mips_rd_config(); - config &= ~CFG_K0_MASK; + config &= ~MIPS3_CONFIG_K0_MASK; config |= CFG_K0_COHERENT; mips_wr_config(config); } @@ -371,7 +370,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)); } int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007132230.o6DMURb6074517>