projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
smp.c
diff --git
a/arch/powerpc/platforms/powermac/smp.c
b/arch/powerpc/platforms/powermac/smp.c
index
bdb738a
..
5cbd4d6
100644
(file)
--- a/
arch/powerpc/platforms/powermac/smp.c
+++ b/
arch/powerpc/platforms/powermac/smp.c
@@
-192,7
+192,7
@@
static int psurge_secondary_ipi_init(void)
{
int rc = -ENOMEM;
{
int rc = -ENOMEM;
- psurge_host = irq_domain_add_nomap(NULL, 0, &psurge_host_ops, NULL);
+ psurge_host = irq_domain_add_nomap(NULL,
~
0, &psurge_host_ops, NULL);
if (psurge_host)
psurge_secondary_virq = irq_create_direct_mapping(psurge_host);
if (psurge_host)
psurge_secondary_virq = irq_create_direct_mapping(psurge_host);
@@
-885,7
+885,7
@@
static int smp_core99_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
return NOTIFY_OK;
}
-static struct notifier_block
__cpuinitdata
smp_core99_cpu_nb = {
+static struct notifier_block smp_core99_cpu_nb = {
.notifier_call = smp_core99_cpu_notify,
};
#endif /* CONFIG_HOTPLUG_CPU */
.notifier_call = smp_core99_cpu_notify,
};
#endif /* CONFIG_HOTPLUG_CPU */