rpms/kernel/F-9 linux-2.6.27.7-vmi-fix-crash-on-boot.patch, NONE, 1.1 config-generic, 1.129, 1.130 kernel.spec, 1.881, 1.882
Chuck Ebbert
cebbert at fedoraproject.org
Sun Dec 14 08:18:33 UTC 2008
- Previous message (by thread): rpms/kernel/F-9 linux-2.6.27.9-alsa-driver-1.0.18a.patch, NONE, 1.1 linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch, NONE, 1.1 linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch, NONE, 1.1 linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch, NONE, 1.1 patch-2.6.27.9.bz2.sign, NONE, 1.1 .cvsignore, 1.835, 1.836 kernel.spec, 1.880, 1.881 sources, 1.796, 1.797 upstream, 1.715, 1.716 linux-2.6-net-atm-CVE-2008-5079.patch, 1.1, NONE linux-2.6.27.7-alsa-driver-1.0.18a.patch, 1.1, NONE patch-2.6.27.8.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/fuse-emulator-utils/F-9 .cvsignore, 1.5, 1.6 fuse-emulator-utils.spec, 1.7, 1.8 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22527
Modified Files:
config-generic kernel.spec
Added Files:
linux-2.6.27.7-vmi-fix-crash-on-boot.patch
Log Message:
Enable input beep feature in Intel HDA sound driver.
Fix VMI crash on boot introduced in 2.6.27.7 (F10#476062)
linux-2.6.27.7-vmi-fix-crash-on-boot.patch:
--- NEW FILE linux-2.6.27.7-vmi-fix-crash-on-boot.patch ---
VMI initialiation can relocate the fixmap, causing early_ioremap
to malfunction if it is initialized before the relocation.
To fix this, VMI activation is split into two phases; the detection,
which must happen before setting up ioremap, and the activation,
which must happen after parsing early boot parameters.
This fixes a crash on boot when VMI is enabled under VMware.
Signed-off-by: Zachary Amsden <zach at vmware.com>
diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h
index b7c0dea..61e08c0 100644
--- a/include/asm-x86/vmi.h
+++ b/include/asm-x86/vmi.h
@@ -223,9 +223,15 @@ struct pci_header {
} __attribute__((packed));
/* Function prototypes for bootstrapping */
+#ifdef CONFIG_VMI
extern void vmi_init(void);
+extern void vmi_activate(void);
extern void vmi_bringup(void);
-extern void vmi_apply_boot_page_allocations(void);
+#else
+static inline void vmi_init(void) {}
+static inline void vmi_activate(void) {}
+static inline void vmi_bringup(void) {}
+#endif
/* State needed to start an application processor in an SMP system. */
struct vmi_ap_state {
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 9d5674f..bdec76e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -634,6 +634,9 @@ void __init setup_arch(char **cmdline_p)
printk(KERN_INFO "Command line: %s\n", boot_command_line);
#endif
+ /* VMI may relocate the fixmap; do this before touching ioremap area */
+ vmi_init();
+
early_cpu_init();
early_ioremap_init();
@@ -707,13 +710,8 @@ void __init setup_arch(char **cmdline_p)
check_efer();
#endif
-#if defined(CONFIG_VMI) && defined(CONFIG_X86_32)
- /*
- * Must be before kernel pagetables are setup
- * or fixmap area is touched.
- */
- vmi_init();
-#endif
+ /* Must be before kernel pagetables are setup */
+ vmi_activate();
/* after early param, so could get panic from serial */
reserve_early_setup_data();
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 7b10933..f71f96f 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -289,9 +289,7 @@ static void __cpuinit start_secondary(void *unused)
* fragile that we want to limit the things done here to the
* most necessary things.
*/
-#ifdef CONFIG_VMI
vmi_bringup();
-#endif
cpu_init();
preempt_disable();
smp_callin();
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index 8b6c393..22fd657 100644
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -960,8 +960,6 @@ static inline int __init activate_vmi(void)
void __init vmi_init(void)
{
- unsigned long flags;
-
if (!vmi_rom)
probe_vmi_rom();
else
@@ -973,13 +971,21 @@ void __init vmi_init(void)
reserve_top_address(-vmi_rom->virtual_top);
- local_irq_save(flags);
- activate_vmi();
-
#ifdef CONFIG_X86_IO_APIC
/* This is virtual hardware; timer routing is wired correctly */
no_timer_check = 1;
#endif
+}
+
+void vmi_activate(void)
+{
+ unsigned long flags;
+
+ if (!vmi_rom)
+ return;
+
+ local_irq_save(flags);
+ activate_vmi();
local_irq_restore(flags & X86_EFLAGS_IF);
}
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- config-generic 3 Dec 2008 09:13:59 -0000 1.129
+++ config-generic 14 Dec 2008 08:18:02 -0000 1.130
@@ -2538,7 +2538,7 @@
CONFIG_SND_FM801_TEA575X_BOOL=y
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_HWDEP=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
+CONFIG_SND_HDA_INPUT_BEEP=y
CONFIG_SND_HDA_CODEC_NVHDMI=y
CONFIG_SND_HDA_CODEC_INTELHDMI=y
CONFIG_SND_HDA_CODEC_REALTEK=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -r1.881 -r1.882
--- kernel.spec 14 Dec 2008 08:10:45 -0000 1.881
+++ kernel.spec 14 Dec 2008 08:18:03 -0000 1.882
@@ -600,6 +600,8 @@
# fix idr bug in 27.8
Patch15: linux-2.6-lib-idr-fix-bug-introduced-by-rcu-fix.patch
+# fix VMI crash in 27.7
+Patch16: linux-2.6.27.7-vmi-fix-crash-on-boot.patch
Patch21: linux-2.6-utrace.patch
Patch22: linux-2.6-x86-tracehook.patch
@@ -1090,6 +1092,7 @@
fi
ApplyPatch linux-2.6-lib-idr-fix-bug-introduced-by-rcu-fix.patch
+ApplyPatch linux-2.6.27.7-vmi-fix-crash-on-boot.patch
# Roland's utrace ptrace replacement.
ApplyPatch linux-2.6-utrace.patch
@@ -1914,6 +1917,10 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Sun Dec 14 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-69
+- Enable input beep feature in Intel HDA sound driver.
+- Fix VMI crash on boot introduced in 2.6.27.7 (F10#476062)
+
* Sun Dec 14 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-68
- Linux 2.6.27.9
Dropped patches:
- Previous message (by thread): rpms/kernel/F-9 linux-2.6.27.9-alsa-driver-1.0.18a.patch, NONE, 1.1 linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch, NONE, 1.1 linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch, NONE, 1.1 linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch, NONE, 1.1 patch-2.6.27.9.bz2.sign, NONE, 1.1 .cvsignore, 1.835, 1.836 kernel.spec, 1.880, 1.881 sources, 1.796, 1.797 upstream, 1.715, 1.716 linux-2.6-net-atm-CVE-2008-5079.patch, 1.1, NONE linux-2.6.27.7-alsa-driver-1.0.18a.patch, 1.1, NONE patch-2.6.27.8.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/fuse-emulator-utils/F-9 .cvsignore, 1.5, 1.6 fuse-emulator-utils.spec, 1.7, 1.8 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list