[PATCH 1/2] ramdisk: make powerpc allmodconfig build

From: Randy Dunlap <redacted>

Fix build error for allmodconfig on powerpc:
arch/powerpc/platforms/built-in.o:(.toc+0x10b0): undefined reference to `rd_size'

Signed-off-by: Randy Dunlap <redacted>
---
 arch/powerpc/platforms/iseries/setup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2619-rc2-pv.orig/arch/powerpc/platforms/iseries/setup.c
+++ linux-2619-rc2-pv/arch/powerpc/platforms/iseries/setup.c

@@ -295,7 +295,7 @@ static void __init iSeries_init_early(vo
 {
 	DBG(" -> iSeries_init_early()\n");
 
-#if defined(CONFIG_BLK_DEV_INITRD)
+#if defined(CONFIG_BLK_DEV_INITRD) && defined(CONFIG_BLK_DEV_RAM)
 	/*
 	 * If the init RAM disk has been configured and there is
 	 * a non-zero starting address for it, set it up


---

---
~Randy

Hi Randy,

There is another section in that function which depends on 
'CONFIG_BLK_DEV_INITRD' being defined.  Although it does not throw an
error, it does depend on some of the variables set in this section,
but not 'rd_size'.  I think for consistancy it might be better to do 
somthing like this(below)?  Or else add the same ifdef down there...

Judith


Index: 2/linux/arch/powerpc/platforms/iseries/setup.c
===================================================================

--- 2.orig/linux/arch/powerpc/platforms/iseries/setup.c	2006-10-17 10:49:31.423551104 -0700
+++ 2/linux/arch/powerpc/platforms/iseries/setup.c	2006-10-17 10:52:22.682515784 -0700

@@ -305,8 +305,10 @@
 		initrd_end = initrd_start + naca.xRamDiskSize * HW_PAGE_SIZE;
 		initrd_below_start_ok = 1;	// ramdisk in kernel space
 		ROOT_DEV = Root_RAM0;
+#if defined(CONFIG_BLK_DEV_RAM)
 		if (((rd_size * 1024) / HW_PAGE_SIZE) < naca.xRamDiskSize)
 			rd_size = (naca.xRamDiskSize * HW_PAGE_SIZE) / 1024;
+#endif /* CONFIG_BLK_DEV_RAM */
 	} else
 #endif /* CONFIG_BLK_DEV_INITRD */
 	{

Judith Lebzelter wrote:

Hi Randy,

There is another section in that function which depends on 
'CONFIG_BLK_DEV_INITRD' being defined.  Although it does not throw an
error, it does depend on some of the variables set in this section,
but not 'rd_size'.  I think for consistancy it might be better to do 
somthing like this(below)?  Or else add the same ifdef down there...

Judith

I agree.  Just this patch, not my previous patch.

-- 
~Randy

Judith Lebzelter wrote:

Hi Randy,

There is another section in that function which depends on 
'CONFIG_BLK_DEV_INITRD' being defined.  Although it does not throw an
error, it does depend on some of the variables set in this section,
but not 'rd_size'.  I think for consistancy it might be better to do 
somthing like this(below)?  Or else add the same ifdef down there...

Judith

Yes, I agree, this is better.  Just drop my patch 1/2.

-- 
~Randy

On Tue, 2006-10-17 at 11:04 -0700, Judith Lebzelter wrote:

That code is bogus, we'll remove it entirely.

cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

Michael Ellerman wrote:

On Tue, 2006-10-17 at 11:04 -0700, Judith Lebzelter wrote:

quoted

Hi Randy,

There is another section in that function which depends on 
'CONFIG_BLK_DEV_INITRD' being defined.  Although it does not throw an
error, it does depend on some of the variables set in this section,
but not 'rd_size'.  I think for consistancy it might be better to do 
somthing like this(below)?  Or else add the same ifdef down there...

Judith


Index: 2/linux/arch/powerpc/platforms/iseries/setup.c
===================================================================

--- 2.orig/linux/arch/powerpc/platforms/iseries/setup.c	2006-10-17 10:49:31.423551104 -0700
+++ 2/linux/arch/powerpc/platforms/iseries/setup.c	2006-10-17 10:52:22.682515784 -0700

@@ -305,8 +305,10 @@
 		initrd_end = initrd_start + naca.xRamDiskSize * HW_PAGE_SIZE;
 		initrd_below_start_ok = 1;	// ramdisk in kernel space
 		ROOT_DEV = Root_RAM0;
+#if defined(CONFIG_BLK_DEV_RAM)
 		if (((rd_size * 1024) / HW_PAGE_SIZE) < naca.xRamDiskSize)
 			rd_size = (naca.xRamDiskSize * HW_PAGE_SIZE) / 1024;
+#endif /* CONFIG_BLK_DEV_RAM */
 	} else
 #endif /* CONFIG_BLK_DEV_INITRD */
 	{

That code is bogus, we'll remove it entirely.

Great, thanks.  :)

-- 
~Randy