diff options
| author | Adrian Bunk | 2005-11-07 12:26:59 +0100 |
|---|---|---|
| committer | Adrian Bunk | 2005-11-07 12:26:59 +0100 |
| commit | b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2 (patch) | |
| tree | 66bf5c66ed505a739bf8633d1931f0d0526bd6d6 /include/asm-ppc64/paca.h | |
| parent | Update Michal Wronski contact info (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| download | kernel-qcow2-linux-b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2.tar.gz kernel-qcow2-linux-b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2.tar.xz kernel-qcow2-linux-b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2.zip | |
Merge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc64/paca.h')
| -rw-r--r-- | include/asm-ppc64/paca.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/asm-ppc64/paca.h b/include/asm-ppc64/paca.h index f68fe91debaf..bccacd6aa93a 100644 --- a/include/asm-ppc64/paca.h +++ b/include/asm-ppc64/paca.h @@ -72,10 +72,15 @@ struct paca_struct { /* * Now, starting in cacheline 2, the exception save areas */ - u64 exgen[8] __attribute__((aligned(0x80))); /* used for most interrupts/exceptions */ - u64 exmc[8]; /* used for machine checks */ - u64 exslb[8]; /* used for SLB/segment table misses - * on the linear mapping */ + /* used for most interrupts/exceptions */ + u64 exgen[10] __attribute__((aligned(0x80))); + u64 exmc[10]; /* used for machine checks */ + u64 exslb[10]; /* used for SLB/segment table misses + * on the linear mapping */ +#ifdef CONFIG_PPC_64K_PAGES + pgd_t *pgdir; +#endif /* CONFIG_PPC_64K_PAGES */ + mm_context_t context; u16 slb_cache[SLB_CACHE_ENTRIES]; u16 slb_cache_ptr; |