diff options
author | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
commit | ab11d1ea281e85895369ef57c5259ad8a432fabb (patch) | |
tree | 684147479c6a8bb2fbed21bdcf12de1dd519c730 /include/asm-ppc64 | |
parent | 952ecef7a0479049c8abb7c34a688ec2981ceadd (diff) | |
parent | 664cceb0093b755739e56572b836a99104ee8a75 (diff) |
Merge by hand from Linus' tree.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r-- | include/asm-ppc64/tlbflush.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ppc64/tlbflush.h b/include/asm-ppc64/tlbflush.h index 800bc0010cfb..626f505c6ee3 100644 --- a/include/asm-ppc64/tlbflush.h +++ b/include/asm-ppc64/tlbflush.h | |||
@@ -23,6 +23,7 @@ struct ppc64_tlb_batch { | |||
23 | struct mm_struct *mm; | 23 | struct mm_struct *mm; |
24 | pte_t pte[PPC64_TLB_BATCH_NR]; | 24 | pte_t pte[PPC64_TLB_BATCH_NR]; |
25 | unsigned long vaddr[PPC64_TLB_BATCH_NR]; | 25 | unsigned long vaddr[PPC64_TLB_BATCH_NR]; |
26 | unsigned int large; | ||
26 | }; | 27 | }; |
27 | DECLARE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch); | 28 | DECLARE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch); |
28 | 29 | ||