diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 14:57:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 14:57:54 -0400 |
| commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
| tree | 6de4096f1887e2c00966177354b1c378e59bd632 /include/asm-powerpc/paca.h | |
| parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
| parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'include/asm-powerpc/paca.h')
| -rw-r--r-- | include/asm-powerpc/paca.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h index 3d5d590bc4b0..0a4e5c93e8e6 100644 --- a/include/asm-powerpc/paca.h +++ b/include/asm-powerpc/paca.h | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | register struct paca_struct *local_paca asm("r13"); | 23 | register struct paca_struct *local_paca asm("r13"); |
| 24 | #define get_paca() local_paca | 24 | #define get_paca() local_paca |
| 25 | #define get_lppaca() (get_paca()->lppaca_ptr) | 25 | #define get_lppaca() (get_paca()->lppaca_ptr) |
| 26 | #define get_slb_shadow() (get_paca()->slb_shadow_ptr) | ||
| 26 | 27 | ||
| 27 | struct task_struct; | 28 | struct task_struct; |
| 28 | 29 | ||
| @@ -99,6 +100,8 @@ struct paca_struct { | |||
| 99 | u64 user_time; /* accumulated usermode TB ticks */ | 100 | u64 user_time; /* accumulated usermode TB ticks */ |
| 100 | u64 system_time; /* accumulated system TB ticks */ | 101 | u64 system_time; /* accumulated system TB ticks */ |
| 101 | u64 startpurr; /* PURR/TB value snapshot */ | 102 | u64 startpurr; /* PURR/TB value snapshot */ |
| 103 | |||
| 104 | struct slb_shadow *slb_shadow_ptr; | ||
| 102 | }; | 105 | }; |
| 103 | 106 | ||
| 104 | extern struct paca_struct paca[]; | 107 | extern struct paca_struct paca[]; |