Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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/sun4v/regdef.h

    re0e922d rdb6e419  
    2828 */
    2929
    30 /** @addtogroup sparc64 
     30/** @addtogroup sparc64
    3131 * @{
    3232 */
     
    3737#define KERN_sparc64_sun4v_REGDEF_H_
    3838
    39 #define PSTATE_IE_BIT   (1 << 1)
    40 #define PSTATE_PRIV_BIT (1 << 2)
    41 #define PSTATE_PEF_BIT  (1 << 4)
     39#define TSTATE_CWP_MASK  0x1f
    4240
    43 #define TSTATE_PSTATE_SHIFT     8
    44 #define TSTATE_PRIV_BIT         (PSTATE_PRIV_BIT << TSTATE_PSTATE_SHIFT)
    45 #define TSTATE_CWP_MASK         0x1f
    46 #define TSTATE_IE_BIT           (PSTATE_IE_BIT << TSTATE_PSTATE_SHIFT)
    47 
    48 #define WSTATE_NORMAL(n)        (n)
    49 #define WSTATE_OTHER(n)         ((n) << 3)
    50 
    51 #define TSTATE_PEF_BIT          (PSTATE_PEF_BIT << TSTATE_PSTATE_SHIFT)
     41#define WSTATE_NORMAL(n)  (n)
     42#define WSTATE_OTHER(n)   ((n) << 3)
    5243
    5344#endif
Note: See TracChangeset for help on using the changeset viewer.