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

Changeset db6e419 in mainline for kernel/arch/ia64/include/register.h


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/ia64/include/register.h

    re0e922d rdb6e419  
    6161#define PSR_CPL_MASK_SHIFTED  3
    6262
    63 #define PSR_RI_SHIFT    41
    64 #define PSR_RI_LEN      2
     63#define PSR_RI_SHIFT  41
     64#define PSR_RI_LEN    2
    6565
    6666#define PFM_MASK  (~0x3fffffffff)
     
    145145#ifndef __ASM__
    146146
    147 #ifdef KERNEL
    148 #include <typedefs.h>
    149 #else
    150 #include <sys/types.h>
    151 #endif
    152 
    153147/** Processor Status Register. */
    154148typedef union {
Note: See TracChangeset for help on using the changeset viewer.