From 53bf78fa285bddbafe79a4018bd9fcb00b174e65 Mon Sep 17 00:00:00 2001
From: Rene Herman <rene.herman@keyaccess.nl>
Date: Mon, 11 Aug 2008 19:20:17 +0200
Subject: [PATCH] --- yaml --- r: 108171 b: refs/heads/master c:
 48d97cb65e62a5f1122ac2cf1149800d4f4693e8 h: refs/heads/master i:   108169:
 eced5cc220d15e0358c8eb0b7f73a38ff4c736e5   108167:
 3659f96b906ade40d3f00bd2c3ab8c1e77b2a142 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/kernel/apic_32.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f177be4e283f..3e3f00a8a9ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0fbaa6b5976962434349849673b9ff63631b6d4
+refs/heads/master: 48d97cb65e62a5f1122ac2cf1149800d4f4693e8
diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c
index f432d4833a12..039a8d4aaf62 100644
--- a/trunk/arch/x86/kernel/apic_32.c
+++ b/trunk/arch/x86/kernel/apic_32.c
@@ -1720,12 +1720,16 @@ static int __init parse_lapic_timer_c2_ok(char *arg)
 }
 early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok);
 
-static int __init apic_set_verbosity(char *str)
+static int __init apic_set_verbosity(char *arg)
 {
-	if (strcmp("debug", str) == 0)
+	if (!arg)
+		return -EINVAL;
+
+	if (strcmp(arg, "debug") == 0)
 		apic_verbosity = APIC_DEBUG;
-	else if (strcmp("verbose", str) == 0)
+	else if (strcmp(arg, "verbose") == 0)
 		apic_verbosity = APIC_VERBOSE;
+
 	return 0;
 }
 early_param("apic", apic_set_verbosity);