From 8e9e4fc08e69a8180eeb6d3d4faf1cfebe847e6f Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 5 Jul 2008 15:53:38 +0400
Subject: [PATCH] --- yaml --- r: 104339 b: refs/heads/master c:
 4d8cc874d7ed43eda72765e9c0e141e170fee4f3 h: refs/heads/master i:   104337:
 0800fa027226053adc7b96704332a7f379f9dea2   104335:
 fed47bab234c613853b71b2c9ddd74ee0394211f v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/smpboot.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 997db00035b7..5b8694e6a208 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6cd7effcc5e0047faf15ab0a54c980f1a616a07
+refs/heads/master: 4d8cc874d7ed43eda72765e9c0e141e170fee4f3
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index fd933b5465b6..e47bfac70c38 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -1452,7 +1452,8 @@ static int __init parse_maxcpus(char *arg)
 {
 	extern unsigned int maxcpus;
 
-	maxcpus = simple_strtoul(arg, NULL, 0);
+	if (arg)
+		maxcpus = simple_strtoul(arg, NULL, 0);
 	return 0;
 }
 early_param("maxcpus", parse_maxcpus);