rpms/kernel/devel linux-2.6-x86-apic-off-by-default.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17732

Modified Files:
	linux-2.6-x86-apic-off-by-default.patch 
Log Message:
another respin of the apic off by default diff.


linux-2.6-x86-apic-off-by-default.patch:
 arch/i386/Kconfig          |   12 ++++++++++++
 arch/i386/kernel/apic.c    |   11 +++++++++--
 arch/i386/kernel/io_apic.c |    2 +-
 arch/i386/kernel/setup.c   |    4 ++++
 include/asm-i386/acpi.h    |    4 ++++
 include/asm-i386/apic.h    |    6 ++++++
 6 files changed, 36 insertions(+), 3 deletions(-)

Index: linux-2.6-x86-apic-off-by-default.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86-apic-off-by-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-x86-apic-off-by-default.patch	25 Oct 2005 02:12:46 -0000	1.2
+++ linux-2.6-x86-apic-off-by-default.patch	27 Oct 2005 23:37:52 -0000	1.3
@@ -25,7 +25,7 @@
  	depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER)
 diff -Naur orig/arch/i386/kernel/apic.c linux-2.6.13/arch/i386/kernel/apic.c
 --- orig/arch/i386/kernel/apic.c	2005-10-24 17:54:05.000000000 -0700
-+++ linux-2.6.13/arch/i386/kernel/apic.c	2005-10-24 16:00:43.000000000 -0700
++++ linux-2.6.13/arch/i386/kernel/apic.c	2005-10-24 23:02:33.000000000 -0700
 @@ -42,8 +42,9 @@
  
  /*
@@ -46,19 +46,19 @@
  			       "you can enable it with \"lapic\"\n");
  			return -1;
  		}
-@@ -1269,8 +1270,10 @@
- 	 * Complain if the BIOS pretends there is one.
- 	 */
- 	if (!cpu_has_apic && APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {
--		printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
--			boot_cpu_physical_apicid);
-+		/* if lapic is off because of the config_x86_apic_off option, say nothing */
-+		if (enable_local_apic != -2)
-+			printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
-+				boot_cpu_physical_apicid);
+@@ -1265,6 +1266,12 @@
+ 	if (!smp_found_config && !cpu_has_apic)
  		return -1;
- 	}
  
++	/* if local apic is off due to config_x86_apic_off option, jump out here */
++	if (enable_local_apic < -1) {
++		printk(KERN_INFO "Local APIC disabled by default; use 'lapic' to enable it.\n");
++		return -1;
++	}
++
+ 	/*
+ 	 * Complain if the BIOS pretends there is one.
+ 	 */
 diff -Naur orig/arch/i386/kernel/io_apic.c linux-2.6.13/arch/i386/kernel/io_apic.c
 --- orig/arch/i386/kernel/io_apic.c	2005-10-24 17:54:05.000000000 -0700
 +++ linux-2.6.13/arch/i386/kernel/io_apic.c	2005-10-24 15:39:36.000000000 -0700