diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 09:32:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 09:32:15 -0800 |
| commit | a07f523f264095759c6bb6e0e7a81c4d15bc3336 (patch) | |
| tree | 6e540813636ffa593f931cfc82ea36254ba82812 /arch/ia64/include/asm/tlb.h | |
| parent | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff) | |
| parent | 6c57a332901f851bd092aba7a2b4d8ef4e643829 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] __per_cpu_idtrs[] is a memory hog
[IA64] sanity in #include files. Move fnptr to types.h
[IA64] use helpers for rlimits
[IA64] cpumask_of_node() should handle -1 as a node
Diffstat (limited to 'arch/ia64/include/asm/tlb.h')
| -rw-r--r-- | arch/ia64/include/asm/tlb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/tlb.h b/arch/ia64/include/asm/tlb.h index 85d965cb19a..23cce999eb1 100644 --- a/arch/ia64/include/asm/tlb.h +++ b/arch/ia64/include/asm/tlb.h @@ -74,7 +74,7 @@ struct ia64_tr_entry { extern int ia64_itr_entry(u64 target_mask, u64 va, u64 pte, u64 log_size); extern void ia64_ptr_entry(u64 target_mask, int slot); -extern struct ia64_tr_entry __per_cpu_idtrs[NR_CPUS][2][IA64_TR_ALLOC_MAX]; +extern struct ia64_tr_entry *ia64_idtrs[NR_CPUS]; /* region register macros |