Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / lppaca.h

diff --git a/include/asm-powerpc/lppaca.h b/include/asm-powerpc/lppaca.h
index 942bb450baff35f6af41ace84fb191c8472ce8dd..567ed92cd91ff6f1cf0b7193b990de75ec90ede1 100644 (file)
--- a/include/asm-powerpc/lppaca.h
+++ b/include/asm-powerpc/lppaca.h
@@ -98,7 +98,7 @@ struct lppaca {
        u64     saved_gpr5;             // Saved GPR5                   x30-x37
 
        u8      reserved4;              // Reserved                     x38-x38
-       u8      cpuctls_task_attrs;     // Task attributes for cpuctls  x39-x39
+       u8      donate_dedicated_cpu;   // Donate dedicated CPU cycles  x39-x39
        u8      fpregs_in_use;          // FP regs in use               x3A-x3A
        u8      pmcregs_in_use;         // PMC regs in use              x3B-x3B
        volatile u32 saved_decr;        // Saved Decr Value             x3C-x3F
@@ -116,7 +116,7 @@ struct lppaca {
 
 
 //=============================================================================
-// CACHE_LINE_3 0x0100 - 0x007F: This line is shared with other processors
+// CACHE_LINE_3 0x0100 - 0x017F: This line is shared with other processors
 //=============================================================================
        // This is the yield_count.  An "odd" value (low bit on) means that
        // the processor is yielded (either because of an OS yield or a PLIC
@@ -128,7 +128,7 @@ struct lppaca {
        u8      reserved6[124];         // Reserved                     x04-x7F
 
 //=============================================================================
-// CACHE_LINE_4-5 0x0100 - 0x01FF Contains PMC interrupt data
+// CACHE_LINE_4-5 0x0180 - 0x027F Contains PMC interrupt data
 //=============================================================================
        u8      pmc_save_area[256];     // PMC interrupt Area           x00-xFF
 } __attribute__((__aligned__(0x400)));