git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
xics
/
xics-common.c
diff --git
a/arch/powerpc/sysdev/xics/xics-common.c
b/arch/powerpc/sysdev/xics/xics-common.c
index
445c5a0
..
63762c6
100644
(file)
--- a/
arch/powerpc/sysdev/xics/xics-common.c
+++ b/
arch/powerpc/sysdev/xics/xics-common.c
@@
-134,11
+134,10
@@
static void xics_request_ipi(void)
BUG_ON(ipi == NO_IRQ);
/*
BUG_ON(ipi == NO_IRQ);
/*
- * IPIs are marked IRQF_DISABLED as they must run with irqs
- * disabled, and PERCPU. The handler was set in map.
+ * IPIs are marked IRQF_PERCPU. The handler was set in map.
*/
BUG_ON(request_irq(ipi, icp_ops->ipi_action,
*/
BUG_ON(request_irq(ipi, icp_ops->ipi_action,
- IRQF_
DISABLED|IRQF_
PERCPU, "IPI", NULL));
+ IRQF_PERCPU, "IPI", NULL));
}
int __init xics_smp_probe(void)
}
int __init xics_smp_probe(void)
@@
-409,14
+408,10
@@
void __init xics_init(void)
int rc = -1;
/* Fist locate ICP */
int rc = -1;
/* Fist locate ICP */
-#ifdef CONFIG_PPC_ICP_HV
if (firmware_has_feature(FW_FEATURE_LPAR))
rc = icp_hv_init();
if (firmware_has_feature(FW_FEATURE_LPAR))
rc = icp_hv_init();
-#endif
-#ifdef CONFIG_PPC_ICP_NATIVE
if (rc < 0)
rc = icp_native_init();
if (rc < 0)
rc = icp_native_init();
-#endif
if (rc < 0) {
pr_warning("XICS: Cannot find a Presentation Controller !\n");
return;
if (rc < 0) {
pr_warning("XICS: Cannot find a Presentation Controller !\n");
return;
@@
-429,9
+424,9
@@
void __init xics_init(void)
xics_ipi_chip.irq_eoi = icp_ops->eoi;
/* Now locate ICS */
xics_ipi_chip.irq_eoi = icp_ops->eoi;
/* Now locate ICS */
-#ifdef CONFIG_PPC_ICS_RTAS
rc = ics_rtas_init();
rc = ics_rtas_init();
-#endif
+ if (rc < 0)
+ rc = ics_opal_init();
if (rc < 0)
pr_warning("XICS: Cannot find a Source Controller !\n");
if (rc < 0)
pr_warning("XICS: Cannot find a Source Controller !\n");