Changeset 86ffa27f in mainline for kernel/arch/mips32/src


Ignore:
Timestamp:
2011-08-07T11:21:44Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc574511
Parents:
15f3c3f (diff), e8067c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
kernel/arch/mips32/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/mips32/src/cache.c

    r15f3c3f r86ffa27f  
    2727 */
    2828
    29 /** @addtogroup mips32 
     29/** @addtogroup mips32
    3030 * @{
    3131 */

  • kernel/arch/mips32/src/cpu/cpu.c

    r15f3c3f r86ffa27f  
    3737#include <arch.h>
    3838#include <arch/cp0.h>
    39 #include <print.h>     
     39#include <print.h>
    4040
    4141struct data_t {

  • kernel/arch/mips32/src/fpu_context.c

    r15f3c3f r86ffa27f  
    2727 */
    2828
    29 /** @addtogroup mips32 
     29/** @addtogroup mips32
    3030 * @{
    3131 */
    … …  
    4040
    4141void fpu_disable(void)
    42 {       
     42{
    4343#ifdef CONFIG_FPU
    4444        cp0_status_write(cp0_status_read() & ~cp0_status_fpu_bit);

  • kernel/arch/mips32/src/mm/as.c

    r15f3c3f r86ffa27f  
    6161        /*
    6262         * Install ASID.
    63          */     
     63         */
    6464        hi.value = cp0_entry_hi_read();
    6565
    6666        hi.asid = as->asid;
    67         cp0_entry_hi_write(hi.value);   
     67        cp0_entry_hi_write(hi.value);
    6868}
    6969

  • kernel/arch/mips32/src/mm/tlb.c

    r15f3c3f r86ffa27f  
    7373                tlbwi();
    7474        }
    75                
     75       
    7676        /*
    7777         * The kernel is going to make use of some wired
    … …  
    386386                        ASSERT(pte->w || access != PF_ACCESS_WRITE);
    387387                        return pte;
    388                         break;
    389388                case AS_PF_DEFER:
    390389                        *pfrc = AS_PF_DEFER;
    391390                        return NULL;
    392                         break;
    393391                case AS_PF_FAULT:
    394392                        *pfrc = AS_PF_FAULT;
    395393                        return NULL;
    396                         break;
    397394                default:
    398395                        panic("Unexpected rc (%d).", rc);

  • kernel/arch/mips32/src/start.S

    r15f3c3f r86ffa27f  
    222222       
    223223        /* move $k0 pointer to kernel stack */
    224         lui $k0, %hi(supervisor_sp)
    225         ori $k0, $k0, %lo(supervisor_sp)
     224        la $k0, supervisor_sp
    226225       
    227226        /* move $k0 (supervisor_sp) */
Note: See TracChangeset for help on using the changeset viewer.