diff options
| author | Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 17:24:52 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-03-31 17:24:52 -0400 |
| commit | 50fbe56c127efde659c686495eb1f925fd84ff0a (patch) | |
| tree | 6eb331035b3c03b4f97ba888c6d66017e84df4c5 /arch/ia64/kernel/perfmon.c | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
| parent | 5d8c39f68e1dc78c1a958e28bc685a5bac125b21 (diff) | |
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) | |||
| 5603 | * /proc/perfmon interface, for debug only | 5603 | * /proc/perfmon interface, for debug only |
| 5604 | */ | 5604 | */ |
| 5605 | 5605 | ||
| 5606 | #define PFM_PROC_SHOW_HEADER ((void *)NR_CPUS+1) | 5606 | #define PFM_PROC_SHOW_HEADER ((void *)nr_cpu_ids+1) |
| 5607 | 5607 | ||
| 5608 | static void * | 5608 | static void * |
| 5609 | pfm_proc_start(struct seq_file *m, loff_t *pos) | 5609 | pfm_proc_start(struct seq_file *m, loff_t *pos) |
| @@ -5612,7 +5612,7 @@ pfm_proc_start(struct seq_file *m, loff_t *pos) | |||
| 5612 | return PFM_PROC_SHOW_HEADER; | 5612 | return PFM_PROC_SHOW_HEADER; |
| 5613 | } | 5613 | } |
| 5614 | 5614 | ||
| 5615 | while (*pos <= NR_CPUS) { | 5615 | while (*pos <= nr_cpu_ids) { |
| 5616 | if (cpu_online(*pos - 1)) { | 5616 | if (cpu_online(*pos - 1)) { |
| 5617 | return (void *)*pos; | 5617 | return (void *)*pos; |
| 5618 | } | 5618 | } |