diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 13:08:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 13:08:16 +0200 |
| commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
| tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /arch/x86/kernel/genapic_flat_64.c | |
| parent | 510b37258dfd61693ca6c039865c78bd996e3718 (diff) | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/genapic_flat_64.c')
| -rw-r--r-- | arch/x86/kernel/genapic_flat_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c index 1740b83329f6..9eca5ba7a6b1 100644 --- a/arch/x86/kernel/genapic_flat_64.c +++ b/arch/x86/kernel/genapic_flat_64.c @@ -223,7 +223,7 @@ static unsigned int physflat_cpu_mask_to_apicid(cpumask_t cpumask) * May as well be the first. */ cpu = first_cpu(cpumask); - if ((unsigned)cpu < NR_CPUS) + if ((unsigned)cpu < nr_cpu_ids) return per_cpu(x86_cpu_to_apicid, cpu); else return BAD_APICID; |