Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8575
b: refs/heads/master
c: 7055646
h: refs/heads/master
i:
  8573: 4449570
  8571: 814142b
  8567: 8985cbf
  8559: 4dc1b6d
  8543: 2d1981a
  8511: d2fe88e
  8447: f1e3c5b
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Sep 12, 2005
1 parent 76d6fb2 commit 659a06d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5a40b7c2abdedcf53c9a6ee790991acfcef5b6c7
refs/heads/master: 70556463487f33bc6728a7596b97f86b811aad22
7 changes: 4 additions & 3 deletions trunk/arch/x86_64/kernel/genapic.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void __init clustered_apic_check(void)
u8 clusters, max_cluster;
u8 id;
u8 cluster_cnt[NUM_APIC_CLUSTERS];
int num_cpus = 0;
int max_apic = 0;

#if defined(CONFIG_ACPI)
/*
Expand All @@ -64,7 +64,8 @@ void __init clustered_apic_check(void)
id = bios_cpu_apicid[i];
if (id == BAD_APICID)
continue;
num_cpus++;
if (id > max_apic)
max_apic = id;
cluster_cnt[APIC_CLUSTERID(id)]++;
}

Expand All @@ -79,7 +80,7 @@ void __init clustered_apic_check(void)
we have ACPI platform support for CPU hotplug
we should detect hotplug capablity from ACPI tables and
only do this when really needed. -AK */
if (num_cpus <= 8)
if (max_apic <= 8)
genapic = &apic_flat;
#endif
goto print;
Expand Down

0 comments on commit 659a06d

Please sign in to comment.