[PATCH] powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock

[PATCH] powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock

[Kumar Gala]

arch/powerpc/platforms/85xx/p1022_ds.c:22:23: error: linux/lmb.h: No such file or directory
arch/powerpc/platforms/85xx/p1022_ds.c: In function 'p1022_ds_setup_arch':
arch/powerpc/platforms/85xx/p1022_ds.c:100: error: implicit declaration of function 'memblock_end_of_DRAM'
arch/powerpc/platforms/85xx/p1022_ds.c: At top level:
arch/powerpc/platforms/85xx/p1022_ds.c:147: error: 'udbg_progress' undeclared here (not in a function)
make[2]: *** [arch/powerpc/platforms/85xx/p1022_ds.o] Error 1

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/platforms/85xx/p1022_ds.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index e1467c9..34e0090 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -19,7 +19,7 @@
 
 #include <linux/pci.h>
 #include <linux/of_platform.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/mpic.h>
 #include <asm/swiotlb.h>
@@ -97,7 +97,7 @@ static void __init p1022_ds_setup_arch(void)
 #endif
 
 #ifdef CONFIG_SWIOTLB
-	if (lmb_end_of_DRAM() > max) {
+	if (memblock_end_of_DRAM() > max) {
 		ppc_swiotlb_enable = 1;
 		set_pci_dma_ops(&swiotlb_dma_ops);
 		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;
-- 
1.6.0.6

Re: [PATCH] powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock

[Kumar Gala]

On Aug 31, 2010, at 11:42 AM, Kumar Gala wrote:

> arch/powerpc/platforms/85xx/p1022_ds.c:22:23: error: linux/lmb.h: No =
such file or directory
> arch/powerpc/platforms/85xx/p1022_ds.c: In function =
'p1022_ds_setup_arch':
> arch/powerpc/platforms/85xx/p1022_ds.c:100: error: implicit =
declaration of function 'memblock_end_of_DRAM'
> arch/powerpc/platforms/85xx/p1022_ds.c: At top level:
> arch/powerpc/platforms/85xx/p1022_ds.c:147: error: 'udbg_progress' =
undeclared here (not in a function)
> make[2]: *** [arch/powerpc/platforms/85xx/p1022_ds.o] Error 1
>=20
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/platforms/85xx/p1022_ds.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

applied to merge

- k=