Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5878
b: refs/heads/master
c: 6be382e
h: refs/heads/master
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Aug 18, 2005
1 parent db98051 commit 05cd6cc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 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: c6a3ea22af7a2ed36afa4672a86b3a86d604db33
refs/heads/master: 6be382ea0c767a81be0e7980400b9b18167b3261
4 changes: 0 additions & 4 deletions trunk/arch/i386/kernel/apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -726,15 +726,11 @@ __setup("apic=", apic_set_verbosity);
static int __init detect_init_APIC (void)
{
u32 h, l, features;
extern void get_cpu_vendor(struct cpuinfo_x86*);

/* Disabled by kernel option? */
if (enable_local_apic < 0)
return -1;

/* Workaround for us being called before identify_cpu(). */
get_cpu_vendor(&boot_cpu_data);

switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_AMD:
if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) ||
Expand Down

0 comments on commit 05cd6cc

Please sign in to comment.