diff options
Diffstat (limited to 'arch/metag')
-rw-r--r-- | arch/metag/include/asm/metag_regs.h | 2 | ||||
-rw-r--r-- | arch/metag/include/asm/tbx.h | 6 | ||||
-rw-r--r-- | arch/metag/tbx/tbipcx.S | 2 | ||||
-rw-r--r-- | arch/metag/tbx/tbisoft.S | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/metag/include/asm/metag_regs.h b/arch/metag/include/asm/metag_regs.h index acf4b8e6e9d1..40c3f679c5b8 100644 --- a/arch/metag/include/asm/metag_regs.h +++ b/arch/metag/include/asm/metag_regs.h @@ -1165,7 +1165,7 @@ #define TXSTATUS_IPTOGGLE_BIT 0x80000000 /* Prev PToggle of TXPRIVEXT */ #define TXSTATUS_ISTATE_BIT 0x40000000 /* IState bit */ #define TXSTATUS_IWAIT_BIT 0x20000000 /* wait indefinitely in decision step*/ -#define TXSTATUS_IEXCEPT_BIT 0x10000000 /* Indicate an exception occured */ +#define TXSTATUS_IEXCEPT_BIT 0x10000000 /* Indicate an exception occurred */ #define TXSTATUS_IRPCOUNT_BITS 0x0E000000 /* Number of 'dirty' date entries*/ #define TXSTATUS_IRPCOUNT_S 25 #define TXSTATUS_IRQSTAT_BITS 0x0000F000 /* IRQEnc bits, trigger or interrupts */ diff --git a/arch/metag/include/asm/tbx.h b/arch/metag/include/asm/tbx.h index 703b9cb0ac5c..5cd2a6c86223 100644 --- a/arch/metag/include/asm/tbx.h +++ b/arch/metag/include/asm/tbx.h @@ -668,7 +668,7 @@ typedef union _tbires_tag_ { State.Sig.TrigMask will indicate the bits set within TXMASKI at the time of the handler call that have all been cleared to prevent - nested interrupt occuring immediately. + nested interrupt occurring immediately. State.Sig.SaveMask is a bit-mask which will be set to Zero when a trigger occurs at background level and TBICTX_CRIT_BIT and optionally @@ -1083,7 +1083,7 @@ TBIRES __TBINestInts( TBIRES State, void *pExt, int NoNestMask ); /* This routine causes the TBICTX structure specified in State.Sig.pCtx to be restored. This implies that execution will not return to the caller. The State.Sig.TrigMask field will be restored during the context switch - such that any immediately occuring interrupts occur in the context of the + such that any immediately occurring interrupts occur in the context of the newly specified task. The State.Sig.SaveMask parameter is ignored. */ void __TBIASyncResume( TBIRES State ); @@ -1305,7 +1305,7 @@ extern const char __TBISigNames[]; /* * Calculate linear PC value from real PC and Minim mode control, the LSB of - * the result returned indicates if address compression has occured. + * the result returned indicates if address compression has occurred. */ #ifndef __ASSEMBLY__ #define METAG_LINPC( PCVal ) (\ diff --git a/arch/metag/tbx/tbipcx.S b/arch/metag/tbx/tbipcx.S index de0626fdad25..163c79ac913b 100644 --- a/arch/metag/tbx/tbipcx.S +++ b/arch/metag/tbx/tbipcx.S @@ -15,7 +15,7 @@ #include <asm/tbx.h> /* BEGIN HACK */ -/* define these for now while doing inital conversion to GAS +/* define these for now while doing initial conversion to GAS will fix properly later */ /* Signal identifiers always have the TBID_SIGNAL_BIT set and contain the diff --git a/arch/metag/tbx/tbisoft.S b/arch/metag/tbx/tbisoft.S index 0346fe8a53b1..b04f50df8d91 100644 --- a/arch/metag/tbx/tbisoft.S +++ b/arch/metag/tbx/tbisoft.S @@ -56,7 +56,7 @@ ___TBIJumpX: /* * TBIRES __TBISwitch( TBIRES Switch, PTBICTX *rpSaveCtx ) * - * Software syncronous context switch between soft threads, save only the + * Software synchronous context switch between soft threads, save only the * registers which are actually valid on call entry. * * A0FrP, D0RtP, D0.5, D0.6, D0.7 - Saved on stack @@ -76,7 +76,7 @@ $LSwitchStart: SETL [A0StP+#8++],D0FrT,D1RtP /* * Save current frame state - we save all regs because we don't want - * uninitialised crap in the TBICTX structure that the asyncronous resumption + * uninitialised crap in the TBICTX structure that the asynchronous resumption * of a thread will restore. */ MOVT D1Re0,#HI($LSwitchExit) /* ASync resume point here */ @@ -117,7 +117,7 @@ $LSwitchExit: * This routine causes the TBICTX structure specified in State.Sig.pCtx to * be restored. This implies that execution will not return to the caller. * The State.Sig.TrigMask field will be ored into TXMASKI during the - * context switch such that any immediately occuring interrupts occur in + * context switch such that any immediately occurring interrupts occur in * the context of the newly specified task. The State.Sig.SaveMask parameter * is ignored. */ |