diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
commit | bda307ed7bdc160fcf1475a49f6c2e796fcb1294 (patch) | |
tree | aa24926a83001373cb4ac2d8be9fd1b6994e7c60 /include/asm-powerpc/lppaca.h | |
parent | x86: fix up a comment in ack_APIC_irq() (diff) | |
parent | x86_64: fix ia32 AMD syscall audit fast-path (diff) | |
download | linux-bda307ed7bdc160fcf1475a49f6c2e796fcb1294.tar.xz linux-bda307ed7bdc160fcf1475a49f6c2e796fcb1294.zip |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'include/asm-powerpc/lppaca.h')
-rw-r--r-- | include/asm-powerpc/lppaca.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-powerpc/lppaca.h b/include/asm-powerpc/lppaca.h index 567ed92cd91f..2fe268b10333 100644 --- a/include/asm-powerpc/lppaca.h +++ b/include/asm-powerpc/lppaca.h @@ -125,7 +125,10 @@ struct lppaca { // NOTE: This value will ALWAYS be zero for dedicated processors and // will NEVER be zero for shared processors (ie, initialized to a 1). volatile u32 yield_count; // PLIC increments each dispatchx00-x03 - u8 reserved6[124]; // Reserved x04-x7F + u32 reserved6; + volatile u64 cmo_faults; // CMO page fault count x08-x0F + volatile u64 cmo_fault_time; // CMO page fault time x10-x17 + u8 reserved7[104]; // Reserved x18-x7F //============================================================================= // CACHE_LINE_4-5 0x0180 - 0x027F Contains PMC interrupt data |