diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-04-17 19:13:57 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-04-17 19:13:57 +0200 |
| commit | f4df39cbdd9e9ab615e80148cc271db22a8508ad (patch) | |
| tree | 312fcf9de1154c85782c121a46fa2952f9812292 /arch/ia64/kernel/setup.c | |
| parent | Pull kvm-patches into release branch (diff) | |
| parent | [IA64] Kernel parameter for max number of concurrent global TLB purges (diff) | |
| download | linux-f4df39cbdd9e9ab615e80148cc271db22a8508ad.tar.xz linux-f4df39cbdd9e9ab615e80148cc271db22a8508ad.zip | |
Pull nptcg into release branch
Conflicts:
arch/ia64/mm/tlb.c
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 6206541f9e87..b86a072418a2 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -59,6 +59,7 @@ #include <asm/setup.h> #include <asm/smp.h> #include <asm/system.h> +#include <asm/tlbflush.h> #include <asm/unistd.h> #include <asm/hpsim.h> @@ -948,9 +949,10 @@ cpu_init (void) #endif /* set ia64_ctx.max_rid to the maximum RID that is supported by all CPUs: */ - if (ia64_pal_vm_summary(NULL, &vmi) == 0) + if (ia64_pal_vm_summary(NULL, &vmi) == 0) { max_ctx = (1U << (vmi.pal_vm_info_2_s.rid_size - 3)) - 1; - else { + setup_ptcg_sem(vmi.pal_vm_info_2_s.max_purges, NPTCG_FROM_PAL); + } else { printk(KERN_WARNING "cpu_init: PAL VM summary failed, assuming 18 RID bits\n"); max_ctx = (1U << 15) - 1; /* use architected minimum */ } |