projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
apic
/
x2apic_uv_x.c
diff --git
a/arch/x86/kernel/apic/x2apic_uv_x.c
b/arch/x86/kernel/apic/x2apic_uv_x.c
index 004f017aa7b9e633923aa6d861bb964f7abbe658..8e9dcfd630e4b539e7936050b7bb1673660ae752 100644
(file)
--- a/
arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/
arch/x86/kernel/apic/x2apic_uv_x.c
@@
-204,7
+204,6
@@
EXPORT_SYMBOL(sn_rtc_cycles_per_second);
static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
{
-#ifdef CONFIG_SMP
unsigned long val;
int pnode;
@@
-223,7
+222,6
@@
static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
atomic_set(&init_deasserted, 1);
-#endif
return 0;
}