Thread (6 messages) flat view 6 messages, 3 authors, 2006-10-18

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

From: Michael Ellerman <hidden>
Date: 2006-10-18 03:10:54

On Tue, 2006-10-17 at 11:04 -0700, Judith Lebzelter wrote:
quoted hunk ↗ jump to hunk
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.

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

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help