[PATCH]: Resubmit Fix overloaded use of acpi= on bootline

[Prarit Bhargava <prarit@redhat.com>]

The use of "apic=" on the boot line is overloaded.  It is used once to
override the type of genapic, and then later on it is used to determine a debug
level.  Because of this a bogus error message is sent to the console when using
the debug option:

	Unknown genapic `apic=debug' specified.

This patch changes the genapic situation to use "genapic=".

Signed-off-by: Prarit Bhargava <prarit@redhat.com>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ef2ffde..8cbd90c 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -589,6 +589,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	gamma=		[HW,DRM]
 
+	genapic=	[APIC,i386] Select a specific genapic type to be used.
+			Format: <name>
+
 	gdth=		[HW,SCSI]
 			See header of drivers/scsi/gdth.c.
 
diff --git a/arch/i386/mach-generic/probe.c b/arch/i386/mach-generic/probe.c
index a7b3999..cabe31b 100644
--- a/arch/i386/mach-generic/probe.c
+++ b/arch/i386/mach-generic/probe.c
@@ -49,7 +49,7 @@ static int __init parse_apic(char *arg)
 	/* Parsed again by __setup for debug/verbose */
 	return 0;
 }
-early_param("apic", parse_apic);
+early_param("genapic", parse_apic);
 
 void __init generic_bigsmp_probe(void)
 {