diff options
| author |   Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 14:24:52 -0700 |
|---|---|---|
| committer |   Tony Luck <tony.luck@intel.com> | 2009-03-31 14:24:52 -0700 |
| commit | 50fbe56c127efde659c686495eb1f925fd84ff0a (patch) | |
| tree | 6eb331035b3c03b4f97ba888c6d66017e84df4c5 /arch/ia64/kernel/perfmon.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | cpumask: use mm_cpumask() wrapper: ia64 (diff) | |
| download | linux-dev-50fbe56c127efde659c686495eb1f925fd84ff0a.tar.xz linux-dev-50fbe56c127efde659c686495eb1f925fd84ff0a.zip | |
Pull cpumask into release branch
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 5c0f408cfd71..8a06dc480594 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -5603,7 +5603,7 @@ pfm_interrupt_handler(int irq, void *arg) * /proc/perfmon interface, for debug only */ -#define PFM_PROC_SHOW_HEADER ((void *)NR_CPUS+1) +#define PFM_PROC_SHOW_HEADER ((void *)nr_cpu_ids+1) static void * pfm_proc_start(struct seq_file *m, loff_t *pos) @@ -5612,7 +5612,7 @@ pfm_proc_start(struct seq_file *m, loff_t *pos) return PFM_PROC_SHOW_HEADER; } - while (*pos <= NR_CPUS) { + while (*pos <= nr_cpu_ids) { if (cpu_online(*pos - 1)) { return (void *)*pos; } |