diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:44:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:44:08 -0500 |
| commit | c0d362a832ee70435fc4555a64f820893b1da0bd (patch) | |
| tree | 162497df64451936dfdb70f972dd7849d3e3e520 /arch/powerpc/kernel/asm-offsets.c | |
| parent | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (diff) | |
| parent | f78628374a13bc150db77c6e02d4f2c0a7f932ef (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters into perfcounters/core
Diffstat (limited to 'arch/powerpc/kernel/asm-offsets.c')
| -rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 9937fe44555f..ce3f8f12f731 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c | |||
| @@ -127,6 +127,7 @@ int main(void) | |||
| 127 | DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr)); | 127 | DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr)); |
| 128 | DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled)); | 128 | DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled)); |
| 129 | DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled)); | 129 | DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled)); |
| 130 | DEFINE(PACAPERFPEND, offsetof(struct paca_struct, perf_counter_pending)); | ||
| 130 | DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache)); | 131 | DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache)); |
| 131 | DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr)); | 132 | DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr)); |
| 132 | DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id)); | 133 | DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id)); |