Changeset 89c57b6 in mainline for kernel/arch/sparc64/include/mm/tlb.h


Ignore:
Timestamp:
2011-04-13T14:45:41Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
88634420
Parents:
cefb126 (diff), 17279ead (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/include/mm/tlb.h

    rcefb126 r89c57b6  
    2727 */
    2828
    29 /** @addtogroup sparc64mm       
     29/** @addtogroup sparc64mm
    3030 * @{
    3131 */
    … …  
    3636#define KERN_sparc64_TLB_H_
    3737
     38#if defined (SUN4U)
    3839
    39 #if defined (SUN4U)
    4040#include <arch/mm/sun4u/tlb.h>
     41
    4142#elif defined (SUN4V)
     43
    4244#include <arch/mm/sun4v/tlb.h>
     45
    4346#endif
    4447
Note: See TracChangeset for help on using the changeset viewer.