Date: Tue, 6 Apr 2010 01:06:52 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r206231 - in user/jmallett/octeon/sys/mips: include mips rmi Message-ID: <201004060106.o3616q4s099269@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Tue Apr 6 01:06:52 2010 New Revision: 206231 URL: http://svn.freebsd.org/changeset/base/206231 Log: o) Use TRAPF_USERMODE(tf) rather than USERMODE(tf->sr). o) Remove unused <machine/psl.h>. Deleted: user/jmallett/octeon/sys/mips/include/psl.h Modified: user/jmallett/octeon/sys/mips/include/cpu.h user/jmallett/octeon/sys/mips/include/param.h user/jmallett/octeon/sys/mips/mips/tick.c user/jmallett/octeon/sys/mips/mips/trap.c user/jmallett/octeon/sys/mips/rmi/clock.c Modified: user/jmallett/octeon/sys/mips/include/cpu.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/cpu.h Tue Apr 6 01:04:32 2010 (r206230) +++ user/jmallett/octeon/sys/mips/include/cpu.h Tue Apr 6 01:06:52 2010 (r206231) @@ -47,7 +47,6 @@ #ifndef _MACHINE_CPU_H_ #define _MACHINE_CPU_H_ -#include <machine/psl.h> #include <machine/endian.h> #define MIPS_KSEG0_LARGEST_PHYS (0x20000000) @@ -315,7 +314,6 @@ #define clockframe trapframe /* Use normal trap frame */ #define CLKF_USERMODE(framep) ((framep)->sr & SR_KSU_USER) -#define CLKF_BASEPRI(framep) ((framep)->cpl == 0) #define CLKF_PC(framep) ((framep)->pc) #define CLKF_INTR(framep) (0) #define MIPS_CLKF_INTR() (intr_nesting_level >= 1) Modified: user/jmallett/octeon/sys/mips/include/param.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/param.h Tue Apr 6 01:04:32 2010 (r206230) +++ user/jmallett/octeon/sys/mips/include/param.h Tue Apr 6 01:06:52 2010 (r206231) @@ -46,9 +46,7 @@ #include <sys/cdefs.h> #ifdef _KERNEL -#ifdef _LOCORE -#include <machine/psl.h> -#else +#ifndef _LOCORE #include <machine/cpu.h> #endif #endif Modified: user/jmallett/octeon/sys/mips/mips/tick.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/tick.c Tue Apr 6 01:04:32 2010 (r206230) +++ user/jmallett/octeon/sys/mips/mips/tick.c Tue Apr 6 01:06:52 2010 (r206231) @@ -301,16 +301,16 @@ clock_intr(void *arg) if (cpu_ticks->hard_ticks >= cycles_per_hz) { cpu_ticks->hard_ticks -= cycles_per_hz; if (PCPU_GET(cpuid) == 0) - hardclock(USERMODE(tf->sr), tf->pc); + hardclock(TRAPF_USERMODE(tf), tf->pc); else - hardclock_cpu(USERMODE(tf->sr)); + hardclock_cpu(TRAPF_USERMODE(tf)); } /* Fire statclock at stathz. */ cpu_ticks->stat_ticks += delta; if (cpu_ticks->stat_ticks >= cycles_per_stathz) { cpu_ticks->stat_ticks -= cycles_per_stathz; - statclock(USERMODE(tf->sr)); + statclock(TRAPF_USERMODE(tf)); } /* Fire profclock at profhz, but only when needed. */ @@ -318,7 +318,7 @@ clock_intr(void *arg) if (cpu_ticks->prof_ticks >= cycles_per_profhz) { cpu_ticks->prof_ticks -= cycles_per_profhz; if (profprocs != 0) - profclock(USERMODE(tf->sr), tf->pc); + profclock(TRAPF_USERMODE(tf), tf->pc); } critical_exit(); #if 0 /* TARGET_OCTEON */ Modified: user/jmallett/octeon/sys/mips/mips/trap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/trap.c Tue Apr 6 01:04:32 2010 (r206230) +++ user/jmallett/octeon/sys/mips/mips/trap.c Tue Apr 6 01:06:52 2010 (r206231) @@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$"); #include <net/netisr.h> #include <machine/trap.h> -#include <machine/psl.h> #include <machine/cpu.h> #include <machine/pte.h> #include <machine/pmap.h> @@ -293,7 +292,7 @@ trap(struct trapframe *trapframe) trapdebug_enter(trapframe, 0); type = (trapframe->cause & CR_EXC_CODE) >> CR_EXC_CODE_SHIFT; - if (USERMODE(trapframe->sr)) { + if (TRAPF_USERMODE(trapframe)) { type |= T_USER; usermode = 1; } else { Modified: user/jmallett/octeon/sys/mips/rmi/clock.c ============================================================================== --- user/jmallett/octeon/sys/mips/rmi/clock.c Tue Apr 6 01:04:32 2010 (r206230) +++ user/jmallett/octeon/sys/mips/rmi/clock.c Tue Apr 6 01:06:52 2010 (r206231) @@ -116,11 +116,11 @@ count_compare_clockhandler(struct trapfr cycles += XLR_CPU_HZ / hz; mips_wr_compare(cycles); - hardclock_cpu(USERMODE(tf->sr)); + hardclock_cpu(TRAPF_USERMODE(tf)); if (count_scale_factor[cpu] == STAT_PROF_CLOCK_SCALE_FACTOR) { - statclock(USERMODE(tf->sr)); + statclock(TRAPF_USERMODE(tf)); if (profprocs != 0) { - profclock(USERMODE(tf->sr), tf->pc); + profclock(TRAPF_USERMODE(tf), tf->pc); } count_scale_factor[cpu] = 0; } @@ -148,11 +148,11 @@ pic_hardclockhandler(struct trapframe *t printf("Clock tick foo at %ld\n", clock_tick_foo); } */ - hardclock(USERMODE(tf->sr), tf->pc); + hardclock(TRAPF_USERMODE(tf), tf->pc); if (scale_factor == STAT_PROF_CLOCK_SCALE_FACTOR) { - statclock(USERMODE(tf->sr)); + statclock(TRAPF_USERMODE(tf)); if (profprocs != 0) { - profclock(USERMODE(tf->sr), tf->pc); + profclock(TRAPF_USERMODE(tf), tf->pc); } scale_factor = 0; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004060106.o3616q4s099269>