From dae65cfffe829b8e1bfd0a708049e8d51d4db425 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sat, 17 Feb 2007 19:58:30 +0100
Subject: [PATCH] --- yaml --- r: 49079 b: refs/heads/master c:
 78f92a82c20a9f66d215f6c6d96fb91c0763ce95 h: refs/heads/master i:   49077:
 773f32669c6512918e1789a34452a67b8003d939   49075:
 397679b27ed2abb550a7abdf8d71b9785fc641ff   49071:
 145c9d53b454ae97b0e3a32dcd1cb2caabd4bb47 v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/kernel-parameters.txt | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ee4e00af5144..4812962f5a54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b2d5c049079d342e3e268c162dcecbd7bad1411
+refs/heads/master: 78f92a82c20a9f66d215f6c6d96fb91c0763ce95
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index abd575cfc759..f6a3961da349 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -863,7 +863,14 @@ and is between 256 and 4096 characters. It is defined in the file
 			Format: <1-256>
 
 	maxcpus=	[SMP] Maximum number of processors that	an SMP kernel
-			should make use of
+			should make use of.
+			Using "nosmp" or "maxcpus=0" will disable SMP
+			entirely (the MPS table probe still happens, though).
+			A command-line option of "maxcpus=<NUM>", where <NUM>
+			is an integer greater than 0, limits the maximum number
+			of CPUs activated in SMP mode to <NUM>.
+			Using "maxcpus=1" on an SMP kernel is the trivial
+			case of an SMP kernel with only one CPU.
 
 	max_addr=[KMG]	[KNL,BOOT,ia64] All physical memory greater than or
 			equal to this physical address is ignored.