Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74560
b: refs/heads/master
c: da54bec
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Ingo Molnar committed Dec 4, 2007
1 parent 0912f4b commit f892d90
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: f22d9bc1e87270586610216084b00cb2fb09abba
refs/heads/master: da54becc7166b5fad70538acea5e93bdd83dd8a6
5 changes: 3 additions & 2 deletions trunk/arch/x86/kernel/topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

static struct i386_cpu cpu_devices[NR_CPUS];

int arch_register_cpu(int num)
int __cpuinit arch_register_cpu(int num)
{
/*
* CPU0 cannot be offlined due to several
Expand All @@ -53,7 +53,8 @@ int arch_register_cpu(int num)
}

#ifdef CONFIG_HOTPLUG_CPU
void arch_unregister_cpu(int num) {
void arch_unregister_cpu(int num)
{
return unregister_cpu(&cpu_devices[num].cpu);
}
EXPORT_SYMBOL(arch_register_cpu);
Expand Down

0 comments on commit f892d90

Please sign in to comment.