[PATCH] powerpc: remove IOMMU_VMERGE config option

[Michael Ellerman]

On Wed, 2010-03-03 at 08:54 +0900, FUJITA Tomonori wrote:
> Seems that IOMMU_VMERGE option description gives the false
> information:
> 
> http://marc.info/?l=linux-sparc&m=126753808727669&w=2
> http://marc.info/?l=linux-sparc&m=126753880528825&w=2
> 
> IOMMU_VMERGE is unnecessary nowadays so how about removing it?

Except you didn't remove it, you just made it uneditable? Why not get
rid of it entirely.

cheers

> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 155d571..2dfa83b 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -314,17 +314,8 @@ config 8XX_MINIMAL_FPEMU
>  	  It is recommended that you build a soft-float userspace instead.
>  
>  config IOMMU_VMERGE
> -	bool "Enable IOMMU virtual merging"
> +	def_bool y
>  	depends on PPC64
> -	default y
> -	help
> -	  Cause IO segments sent to a device for DMA to be merged virtually
> -	  by the IOMMU when they happen to have been allocated contiguously.
> -	  This doesn't add pressure to the IOMMU allocator. However, some
> -	  drivers don't support getting large merged segments coming back
> -	  from *_map_sg().
> -
> -	  Most drivers don't have this problem; it is safe to say Y here.
>  
>  config IOMMU_HELPER
>  	def_bool PPC64


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20100303/3196633a/attachment.pgp>