[PATCH] x86: remove impossible test in mtrr/main.c

[PATCH] x86: remove impossible test in mtrr/main.c

[Rusty Russell]

Impact: cleanup

enable_mtrr_cleanup is static, and is never set to anything but 0 or 1.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -823,16 +823,14 @@ static int enable_mtrr_cleanup __initdat
 
 static int __init disable_mtrr_cleanup_setup(char *str)
 {
-	if (enable_mtrr_cleanup != -1)
-		enable_mtrr_cleanup = 0;
+	enable_mtrr_cleanup = 0;
 	return 0;
 }
 early_param("disable_mtrr_cleanup", disable_mtrr_cleanup_setup);
 
 static int __init enable_mtrr_cleanup_setup(char *str)
 {
-	if (enable_mtrr_cleanup != -1)
-		enable_mtrr_cleanup = 1;
+	enable_mtrr_cleanup = 1;
 	return 0;
 }
 early_param("enable_mtrr_cleanup", enable_mtrr_cleanup_setup);

Re: [PATCH] x86: remove impossible test in mtrr/main.c

[H. Peter Anvin]

Rusty Russell wrote:
> Impact: cleanup
> 
> enable_mtrr_cleanup is static, and is never set to anything but 0 or 1.
> 
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Applied to tip:x86/pat2, thanks!

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

Re: [PATCH] x86: remove impossible test in mtrr/main.c

[H. Peter Anvin]

H. Peter Anvin wrote:
> Rusty Russell wrote:
>> Impact: cleanup
>>
>> enable_mtrr_cleanup is static, and is never set to anything but 0 or 1.
>>
>> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
> 
> Applied to tip:x86/pat2, thanks!
> 

I meant tip:x86/cleanups, of course.

	-hpa