Patchwork 2.6.28-git4 - powerpc - drivers build fails with !CONFIG_VIOPATH

login
register
mail settings
Submitter Kamalesh Babulal
Date Jan. 6, 2009, 3:57 p.m.
Message ID <20090106155724.GA6747@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/16813/
State Accepted, archived
Commit d2b4397bf87cf6547ca9fa75b6b84eada96c0848
Headers show

Comments

Kamalesh Babulal - Jan. 6, 2009, 3:57 p.m.
* Sam Ravnborg <sam@ravnborg.org> [2009-01-06 11:46:19]:

> Hi Kamalesh
> 
> Looks good, small nit below.
> 
> >  config VIOPATH
> >  	bool
> > -	depends on VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
> > -	default y
> > +	default n
> 
> As 'n' is default anyway this line is not needed and I suggest you
> spin a final version of the patch with this removed.
> 
> 	Sam

Hi Sam,

	Thanks for the review comments. I am resending the patch with the changes
you have recommended.

Impact: Fix the VIOPATH dependency in the iSeries dependent drivers.

iSeries depend drivers build fails, when CONFIG_VIOPATH is disabled.
Removing the dependency of VIOPATH by selecting it, when the drivers
dependent on iSeries code.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
---
 arch/powerpc/platforms/iseries/Kconfig |    5 +++--
 drivers/char/Kconfig                   |    1 +
 drivers/scsi/Kconfig                   |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
Sam Ravnborg - Jan. 6, 2009, 4:40 p.m.
On Tue, Jan 06, 2009 at 09:27:24PM +0530, Kamalesh Babulal wrote:
> * Sam Ravnborg <sam@ravnborg.org> [2009-01-06 11:46:19]:
> 
> > Hi Kamalesh
> > 
> > Looks good, small nit below.
> > 
> > >  config VIOPATH
> > >  	bool
> > > -	depends on VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
> > > -	default y
> > > +	default n
> > 
> > As 'n' is default anyway this line is not needed and I suggest you
> > spin a final version of the patch with this removed.
> > 
> > 	Sam
> 
> Hi Sam,
> 
> 	Thanks for the review comments. I am resending the patch with the changes
> you have recommended.
> 
> Impact: Fix the VIOPATH dependency in the iSeries dependent drivers.
> 
> iSeries depend drivers build fails, when CONFIG_VIOPATH is disabled.
> Removing the dependency of VIOPATH by selecting it, when the drivers
> dependent on iSeries code.
> 
> Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>

Patch

diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index ed3753d..7ddd0a2 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -10,18 +10,21 @@  menu "iSeries device drivers"
 config VIODASD
 	tristate "iSeries Virtual I/O disk support"
 	depends on BLOCK
+	select VIOPATH
 	help
 	  If you are running on an iSeries system and you want to use
 	  virtual disks created and managed by OS/400, say Y.
 
 config VIOCD
 	tristate "iSeries Virtual I/O CD support"
+	select VIOPATH
 	help
 	  If you are running Linux on an IBM iSeries system and you want to
 	  read a CD drive owned by OS/400, say Y here.
 
 config VIOTAPE
 	tristate "iSeries Virtual Tape Support"
+	select VIOPATH
 	help
 	  If you are running Linux on an iSeries system and you want Linux
 	  to read and/or write a tape drive owned by OS/400, say Y here.
@@ -30,5 +33,3 @@  endmenu
 
 config VIOPATH
 	bool
-	depends on VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
-	default y
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 1697043..b8da09a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -616,6 +616,7 @@  config HVC_ISERIES
 	default y
 	select HVC_DRIVER
 	select HVC_IRQ
+	select VIOPATH
 	help
 	  iSeries machines support a hypervisor virtual console.
 
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index b732297..256c7be 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -884,6 +884,7 @@  config SCSI_IBMVSCSI
 	tristate "IBM Virtual SCSI support"
 	depends on PPC_PSERIES || PPC_ISERIES
 	select SCSI_SRP_ATTRS
+	select VIOPATH if PPC_ISERIES
 	help
 	  This is the IBM POWER Virtual SCSI Client