Looks good to me.

Acked-by: H. Peter Anvin <hpa@zytor.com>

I'll add it to tip:x86/mtrr in a bit.

	-hpa


Yinghai Lu wrote:
quoted text
> change enable_mtrr_cleanup to mtrrcleanup, disable_mtrr_cleanup to nomtrrcleanup.
> so doc mtrrcleanup_debug.
> 
> and change MTRR_SANITIZER to def_bool y
> 
> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
> 
> ---
>  Documentation/kernel-parameters.txt |    7 +++++--
>  arch/x86/Kconfig                    |    6 +++---
>  arch/x86/kernel/cpu/mtrr/main.c     |    6 +++---
>  3 files changed, 11 insertions(+), 8 deletions(-)
> 
> Index: linux-2.6/Documentation/kernel-parameters.txt
> ===================================================================
> --- linux-2.6.orig/Documentation/kernel-parameters.txt
> +++ linux-2.6/Documentation/kernel-parameters.txt
> @@ -614,12 +614,15 @@ and is between 256 and 4096 characters.
>  			See drivers/char/README.epca and
>  			Documentation/digiepca.txt.
>  
> -	disable_mtrr_cleanup [X86]
> -	enable_mtrr_cleanup [X86]
> +	nomtrrcleanup [X86]
> +	mtrrcleanup [X86]
>  			The kernel tries to adjust MTRR layout from continuous
>  			to discrete, to make X server driver able to add WB
>  			entry later. This parameter enables/disables that.
>  
> +	mtrrcleanup_debug [X86]
> +			print out more debug info for mtrr cleanup.
> +
>  	mtrr_chunk_size=nn[KMG] [X86]
>  			used for mtrr cleanup. It is largest continous chunk
>  			that could hold holes aka. UC entries.
> Index: linux-2.6/arch/x86/Kconfig
> ===================================================================
> --- linux-2.6.orig/arch/x86/Kconfig
> +++ linux-2.6/arch/x86/Kconfig
> @@ -1243,18 +1243,18 @@ config MTRR
>  	  See <file:Documentation/x86/mtrr.txt> for more information.
>  
>  config MTRR_SANITIZER
> -	bool
> +	def_bool y
>  	prompt "MTRR cleanup support"
>  	depends on MTRR
>  	help
>  	  Convert MTRR layout from continuous to discrete, so X drivers can
>  	  add writeback entries.
>  
> -	  Can be disabled with disable_mtrr_cleanup on the kernel command line.
> +	  Can be disabled with nomtrrcleanup on the kernel command line.
>  	  The largest mtrr entry size for a continous block can be set with
>  	  mtrr_chunk_size.
>  
> -	  If unsure, say N.
> +	  If unsure, say Y.
>  
>  config MTRR_SANITIZER_ENABLE_DEFAULT
>  	int "MTRR cleanup enable value (0-1)"
> Index: linux-2.6/arch/x86/kernel/cpu/mtrr/main.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/cpu/mtrr/main.c
> +++ linux-2.6/arch/x86/kernel/cpu/mtrr/main.c
> @@ -826,7 +826,7 @@ static int __init disable_mtrr_cleanup_s
>  		enable_mtrr_cleanup = 0;
>  	return 0;
>  }
> -early_param("disable_mtrr_cleanup", disable_mtrr_cleanup_setup);
> +early_param("nomtrrcleanup", disable_mtrr_cleanup_setup);
>  
>  static int __init enable_mtrr_cleanup_setup(char *str)
>  {
> @@ -834,14 +834,14 @@ static int __init enable_mtrr_cleanup_se
>  		enable_mtrr_cleanup = 1;
>  	return 0;
>  }
> -early_param("enable_mtrr_cleanup", enable_mtrr_cleanup_setup);
> +early_param("mtrrcleanup", enable_mtrr_cleanup_setup);
>  
>  static int __init mtrr_cleanup_debug_setup(char *str)
>  {
>  	debug_print = 1;
>  	return 0;
>  }
> -early_param("mtrr_cleanup_debug", mtrr_cleanup_debug_setup);
> +early_param("mtrrcleanup_debug", mtrr_cleanup_debug_setup);
>  
>  struct var_mtrr_state {
>  	unsigned long	range_startk;
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/