Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39063
b: refs/heads/master
c: 815a965
h: refs/heads/master
i:
  39061: 3e8161b
  39059: c2ec6fb
  39055: 60bef25
v: v3
  • Loading branch information
Jiri Kosina authored and Linus Torvalds committed Oct 6, 2006
1 parent 8e62e0d commit 5e94dc1
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 428929a234d2c4b8a6d0145d0dcf687fcfa27325
refs/heads/master: 815a965b0e6d925646e1f6012175830ef21e0d21
5 changes: 3 additions & 2 deletions trunk/include/asm-i386/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ extern u8 x86_cpu_to_apicid[];

#define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu]

extern u8 apicid_2_node[];

#ifdef CONFIG_HOTPLUG_CPU
extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
Expand Down Expand Up @@ -101,6 +99,9 @@ extern unsigned int num_processors;
#endif

#ifndef __ASSEMBLY__

extern u8 apicid_2_node[];

#ifdef CONFIG_X86_LOCAL_APIC
static __inline int logical_smp_processor_id(void)
{
Expand Down

0 comments on commit 5e94dc1

Please sign in to comment.