Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352
b: refs/heads/master
c: 1cff94c
h: refs/heads/master
v: v3
  • Loading branch information
James Bottomley authored and Linus Torvalds committed Apr 21, 2005
1 parent 4123366 commit c3f26c2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 62b56faa43a7e672e659d14f38f553ed8b40ea70
refs/heads/master: 1cff94c6fecdc54d6f022ae5a22888f8272804a1
4 changes: 2 additions & 2 deletions trunk/arch/i386/kernel/cpu/amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ __asm__(".align 4\nvide: ret");

static void __init init_amd(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_SMP
#ifdef CONFIG_X86_SMP
int cpu = c == &boot_cpu_data ? 0 : c - cpu_data;
#endif
u32 l, h;
Expand Down Expand Up @@ -198,7 +198,7 @@ static void __init init_amd(struct cpuinfo_x86 *c)
c->x86_num_cores = 1;
}

#ifdef CONFIG_SMP
#ifdef CONFIG_X86_SMP
/*
* On a AMD dual core setup the lower bits of the APIC id
* distingush the cores. Assumes number of cores is a power
Expand Down

0 comments on commit c3f26c2

Please sign in to comment.