rpms/kernel/F-9 linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch, NONE, 1.1 config-generic, 1.101, 1.102 kernel.spec, 1.646, 1.647

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14359

Modified Files:
	config-generic kernel.spec 
Added Files:
	linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch 
Log Message:
* Tue May 20 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-29
- Disable the group scheduler (CONFIG_GROUP_SCHED) (#446192)


linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch:

--- NEW FILE linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch ---
x86: don't read maxlvt before checking if APIC is mapped

A check for unmapped apic was added before reading maxlvt but the early
read of maxlvt wasn't removed.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.25.noarch/arch/x86/kernel/apic_64.c
===================================================================
--- linux-2.6.25.noarch.orig/arch/x86/kernel/apic_64.c
+++ linux-2.6.25.noarch/arch/x86/kernel/apic_64.c
@@ -524,7 +524,7 @@ int setup_profiling_timer(unsigned int m
  */
 void clear_local_APIC(void)
 {
-	int maxlvt = lapic_get_maxlvt();
+	int maxlvt;
 	u32 v;
 
 	/* APIC hasn't been mapped yet */


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- config-generic	19 May 2008 22:15:18 -0000	1.101
+++ config-generic	20 May 2008 08:19:52 -0000	1.102
@@ -3154,16 +3154,18 @@
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_SCHED=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_GROUP_SCHED=n
+# with GROUP_SCHED disabled these three have no effect
+# CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED=y
+# CONFIG_CGROUP_SCHED=y
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_CPUACCT=y
+# CONFIG_CGROUP_MEM_RES_CTLR is not set
 CONFIG_PROC_PID_CPUSET=y
 
 # CONFIG_SYSFS_DEPRECATED is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -r1.646 -r1.647
--- kernel.spec	20 May 2008 07:15:46 -0000	1.646
+++ kernel.spec	20 May 2008 08:19:52 -0000	1.647
@@ -579,6 +579,7 @@
 Patch86: linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch
 Patch87: linux-2.6-x86-fix-asm-constraint-in-do_IRQ.patch
 Patch88: linux-2.6-x86-pci-revert-remove-default-rom-allocation.patch
+Patch89: linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch
 
 Patch123: linux-2.6-ppc-rtc.patch
 Patch140: linux-2.6-ps3-ehci-iso.patch
@@ -1034,6 +1035,8 @@
 ApplyPatch linux-2.6-x86-fix-asm-constraint-in-do_IRQ.patch
 # allocate PCI ROM by default again
 ApplyPatch linux-2.6-x86-pci-revert-remove-default-rom-allocation.patch
+# don't read the apic if it's not mapped (#447183)
+ApplyPatch linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch
 
 #
 # PowerPC
@@ -1817,6 +1820,12 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue May 20 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-29
+- Disable the group scheduler (CONFIG_GROUP_SCHED) (#446192)
+
+* Tue May 20 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-28
+- x86: don't read the APIC if it's not mapped (#447183)
+
 * Tue May 20 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-27
 - x86: don't map VDSO into userspace when it's disabled (#229304)
 - x86: fix ASM constraint in do_IRQ()