Commit 45740f3d authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

[PATCH] ppc64: Fix g5-only build

The iommu_free_table() patch broke g5 only build by adding back some
incestuous relationship between generic code and pSeries code. 

This wraps this in #ifdef as a quick fix until the original author of
the patch comes up with a better solution.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d0c6430b
...@@ -1818,8 +1818,13 @@ int of_remove_node(struct device_node *np) ...@@ -1818,8 +1818,13 @@ int of_remove_node(struct device_node *np)
return -EBUSY; return -EBUSY;
} }
/* XXX This is a layering violation, should be moved to the caller
* --BenH.
*/
#ifdef CONFIG_PPC_PSERIES
if (np->iommu_table) if (np->iommu_table)
iommu_free_table(np); iommu_free_table(np);
#endif /* CONFIG_PPC_PSERIES */
write_lock(&devtree_lock); write_lock(&devtree_lock);
OF_MARK_STALE(np); OF_MARK_STALE(np);
......
...@@ -111,9 +111,17 @@ extern void iommu_setup_pSeries(void); ...@@ -111,9 +111,17 @@ extern void iommu_setup_pSeries(void);
extern void iommu_setup_u3(void); extern void iommu_setup_u3(void);
/* Creates table for an individual device node */ /* Creates table for an individual device node */
/* XXX: This isn't generic, please name it accordingly or add
* some ppc_md. hooks for iommu implementations to do what they
* need to do. --BenH.
*/
extern void iommu_devnode_init(struct device_node *dn); extern void iommu_devnode_init(struct device_node *dn);
/* Frees table for an individual device node */ /* Frees table for an individual device node */
/* XXX: This isn't generic, please name it accordingly or add
* some ppc_md. hooks for iommu implementations to do what they
* need to do. --BenH.
*/
extern void iommu_free_table(struct device_node *dn); extern void iommu_free_table(struct device_node *dn);
#endif /* CONFIG_PPC_MULTIPLATFORM */ #endif /* CONFIG_PPC_MULTIPLATFORM */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment