rpms/kernel/devel linux-2.6-ia64-export-account_system_vtime.patch, NONE, 1.1 linux-2.6-x86-efi-fix-low-mappings.patch, NONE, 1.1 kernel.spec, 1.729, 1.730

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32677

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ia64-export-account_system_vtime.patch 
	linux-2.6-x86-efi-fix-low-mappings.patch 
Log Message:
* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com>
- Fix EFI boot.
- Export account_system_vtime on IA64.


linux-2.6-ia64-export-account_system_vtime.patch:

--- NEW FILE linux-2.6-ia64-export-account_system_vtime.patch ---
The symbol account_system_vtime is used by the kvm module but
not exported.  This breaks building with CONFIG_VIRT_CPU_ACCOUNTING
and CONFIG_KVM=m.

Signed-off-by: Doug Chapman <doug.chapman at hp.com>
Acked-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>

---
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 8c73643..aad1b7b 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -117,6 +117,7 @@ void account_system_vtime(struct task_struct *tsk)
 
 	local_irq_restore(flags);
 }
+EXPORT_SYMBOL_GPL(account_system_vtime);
 
 /*
  * Called from the timer interrupt handler to charge accumulated user time


linux-2.6-x86-efi-fix-low-mappings.patch:

--- NEW FILE linux-2.6-x86-efi-fix-low-mappings.patch ---
Fedora reports that mem_init()'s zap_low_mappings(), extended to SMP in
61165d7a035f6571c7576e7f51e7230157724c8d x86: fix app crashes after SMP resume
causes 32-bit Intel Mac machines to reboot very early when booting with EFI.

The EFI code appears to manage low mappings for itself when needed; but like
many before it, confuses PSE with PAE.  So it has only been mapping half the
space it needed when PSE but not PAE.  This remained unnoticed until we moved
the SMP zap_low_mappings() before efi_enter_virtual_mode().  Presumably could
have been noticed years ago if anyone ran a UP kernel on such machines?

Reported-by: Peter Jones <pjones at redhat.com>
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Tested-by: Peter Jones <pjones at redhat.com>
---
 arch/x86/kernel/efi_32.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- 2.6.26-rc8/arch/x86/kernel/efi_32.c	2008-04-17 03:49:44.000000000 +0100
+++ linux/arch/x86/kernel/efi_32.c	2008-07-02 17:02:36.000000000 +0100
@@ -49,13 +49,13 @@ void efi_call_phys_prelog(void)
 	local_irq_save(efi_rt_eflags);
 
 	/*
-	 * If I don't have PSE, I should just duplicate two entries in page
-	 * directory. If I have PSE, I just need to duplicate one entry in
+	 * If I don't have PAE, I should just duplicate two entries in page
+	 * directory. If I have PAE, I just need to duplicate one entry in
 	 * page directory.
 	 */
 	cr4 = read_cr4();
 
-	if (cr4 & X86_CR4_PSE) {
+	if (cr4 & X86_CR4_PAE) {
 		efi_bak_pg_dir_pointer[0].pgd =
 		    swapper_pg_dir[pgd_index(0)].pgd;
 		swapper_pg_dir[0].pgd =
@@ -93,7 +93,7 @@ void efi_call_phys_epilog(void)
 
 	cr4 = read_cr4();
 
-	if (cr4 & X86_CR4_PSE) {
+	if (cr4 & X86_CR4_PAE) {
 		swapper_pg_dir[pgd_index(0)].pgd =
 		    efi_bak_pg_dir_pointer[0].pgd;
 	} else {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.729
retrieving revision 1.730
diff -u -r1.729 -r1.730
--- kernel.spec	3 Jul 2008 04:21:56 -0000	1.729
+++ kernel.spec	3 Jul 2008 05:21:14 -0000	1.730
@@ -663,6 +663,9 @@
 
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
+Patch2610: linux-2.6-x86-efi-fix-low-mappings.patch
+
+Patch2700: linux-2.6-ia64-export-account_system_vtime.patch
 
 %endif
 
@@ -1194,6 +1197,11 @@
 
 # get rid of imacfb and make efifb work everywhere it was used
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
+# fix efi boot
+ApplyPatch linux-2.6-x86-efi-fix-low-mappings.patch
+
+# export account_system_vtime() on IA64
+ApplyPatch linux-2.6-ia64-export-account_system_vtime.patch
 
 # ---------- below all scheduled for 2.6.24 -----------------
 
@@ -1788,6 +1796,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
+* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com>
+- Fix EFI boot.
+- Export account_system_vtime on IA64.
+
 * Thu Jul  3 2008 Jeremy Katz <katzj at redhat.com>
 - Disable the garmin_gps driver; programs are using libusb for this now
 - Make padlock warnings quieter