diff options
author | Benjamin Herrenschmidt | 2009-06-12 08:53:38 +0200 |
---|---|---|
committer | Benjamin Herrenschmidt | 2009-06-12 08:53:38 +0200 |
commit | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch) | |
tree | b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /arch/powerpc/kernel/asm-offsets.c | |
parent | powerpc: Fix bug in move of altivec code to vector.S (diff) | |
parent | block: fix kernel-doc in recent block/ changes (diff) | |
download | kernel-qcow2-linux-bc47ab0241c7c86da4f5e5f82fbca7d45387c18d.tar.gz kernel-qcow2-linux-bc47ab0241c7c86da4f5e5f82fbca7d45387c18d.tar.xz kernel-qcow2-linux-bc47ab0241c7c86da4f5e5f82fbca7d45387c18d.zip |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/kernel/asm-offsets.c
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 ce90c570cd8e..561b64652311 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -129,6 +129,7 @@ int main(void) DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr)); DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled)); DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled)); + DEFINE(PACAPERFPEND, offsetof(struct paca_struct, perf_counter_pending)); DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id)); #ifdef CONFIG_PPC_MM_SLICES DEFINE(PACALOWSLICESPSIZE, offsetof(struct paca_struct, |