Mon Jun 15 01:17:07 UTC 2009

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16354

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	kvm-make-efer-reads-safe-when-efer-does-not-exist.patch 
	patch-2.6.27.25.bz2.sign 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	ext4.git-1-8657e625a390d09a21970a810f271d74e99b4c8f.patch 
	ext4.git-2-b3239aab20df1446ddfb8d0520076d5fd0d4ecd2.patch 
	ext4.git-3-e9b9a50398f0cc909e5645716c74cc1aecd6699e.patch 
	ext4.git-4-ce54e9c7949d1158512accf23825641a92bd07f9.patch 
	ext4.git-5-e0ee7aa0b15299bc678758a754eec51ee537c53f.patch 
	linux-2.6-ext4-clear-unwritten-flag.patch 
	linux-2.6-ext4-fake-delalloc-bno.patch 
	linux-2.6-ext4-fix-i_cached_extent-race.patch 
	linux-2.6-ext4-prealloc-fixes.patch patch-2.6.27.24.bz2.sign 
Log Message:
Linux 2.6.27.25
Dropped patches, merged in .25
    ext4.git-1-8657e625a390d09a21970a810f271d74e99b4c8f.patch
    ext4.git-2-b3239aab20df1446ddfb8d0520076d5fd0d4ecd2.patch
    ext4.git-3-e9b9a50398f0cc909e5645716c74cc1aecd6699e.patch
    ext4.git-4-ce54e9c7949d1158512accf23825641a92bd07f9.patch
    ext4.git-5-e0ee7aa0b15299bc678758a754eec51ee537c53f.patch
    linux-2.6-ext4-clear-unwritten-flag.patch
    linux-2.6-ext4-fake-delalloc-bno.patch
    linux-2.6-ext4-fix-i_cached_extent-race.patch
    linux-2.6-ext4-prealloc-fixes.patch
Added patch from 2.6.29.4:
    kvm-make-efer-reads-safe-when-efer-does-not-exist.patch

kvm-make-efer-reads-safe-when-efer-does-not-exist.patch:

--- NEW FILE kvm-make-efer-reads-safe-when-efer-does-not-exist.patch ---
>From e286e86e6d2042d67d09244aa0e05ffef75c9d54 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi at redhat.com>
Date: Sun, 3 May 2009 18:50:55 +0300
Subject: KVM: Make EFER reads safe when EFER does not exist

From: Avi Kivity <avi at redhat.com>

commit e286e86e6d2042d67d09244aa0e05ffef75c9d54 upstream.

Some processors don't have EFER; don't oops if userspace wants us to
read EFER when we check NX.

Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/kvm/x86.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1075,9 +1075,9 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *
 
 static int is_efer_nx(void)
 {
-	u64 efer;
+	unsigned long long efer = 0;
 
-	rdmsrl(MSR_EFER, efer);
+	rdmsrl_safe(MSR_EFER, &efer);
 	return efer & EFER_NX;
 }
 


--- NEW FILE patch-2.6.27.25.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKMclByGugalF9Dw4RAk5iAJ45FefbLXBAemsxugIayhAWYzAKIgCgjDMb
P65/OIQ7nvm1OM4P8UvP5A0=
=kmpq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837.2.14
retrieving revision 1.837.2.15
diff -u -p -r1.837.2.14 -r1.837.2.15
--- .cvsignore	20 May 2009 08:49:47 -0000	1.837.2.14
+++ .cvsignore	15 Jun 2009 01:16:34 -0000	1.837.2.15
@@ -4,4 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.24.bz2
+patch-2.6.27.25.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.53
retrieving revision 1.891.2.54
diff -u -p -r1.891.2.53 -r1.891.2.54
--- kernel.spec	21 May 2009 02:40:06 -0000	1.891.2.53
+++ kernel.spec	15 Jun 2009 01:16:35 -0000	1.891.2.54
@@ -36,7 +36,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 24
+%define stable_update 25
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -747,23 +747,11 @@ Patch2600: linux-2.6-merge-efifb-imacfb.
 Patch2900: linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
 Patch2901: linux-2.6.27.9-ext4-cap-check-delay.patch
 
-# next round for -stable
-Patch2910: ext4.git-1-8657e625a390d09a21970a810f271d74e99b4c8f.patch
-Patch2911: ext4.git-2-b3239aab20df1446ddfb8d0520076d5fd0d4ecd2.patch
-Patch2912: ext4.git-3-e9b9a50398f0cc909e5645716c74cc1aecd6699e.patch
-Patch2913: ext4.git-4-ce54e9c7949d1158512accf23825641a92bd07f9.patch
-Patch2914: ext4.git-5-e0ee7aa0b15299bc678758a754eec51ee537c53f.patch
-
-# ext4 fixes from fedora 11
-Patch2920: linux-2.6-ext4-clear-unwritten-flag.patch
-Patch2921: linux-2.6-ext4-fake-delalloc-bno.patch
-Patch2922: linux-2.6-ext4-fix-i_cached_extent-race.patch
-Patch2923: linux-2.6-ext4-prealloc-fixes.patch
-
 # Add better support for DMI-based autoloading
 Patch3110: linux-2.6-dmi-autoload.patch
 
 Patch4000: kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
+Patch4010: kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
 
 %endif
 
@@ -1351,18 +1339,6 @@ ApplyPatch drm-mm-readd-nopfn.patch
 ApplyPatch linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
 ApplyPatch linux-2.6.27.9-ext4-cap-check-delay.patch
 
-ApplyPatch ext4.git-1-8657e625a390d09a21970a810f271d74e99b4c8f.patch
-ApplyPatch ext4.git-2-b3239aab20df1446ddfb8d0520076d5fd0d4ecd2.patch
-ApplyPatch ext4.git-3-e9b9a50398f0cc909e5645716c74cc1aecd6699e.patch
-ApplyPatch ext4.git-4-ce54e9c7949d1158512accf23825641a92bd07f9.patch
-ApplyPatch ext4.git-5-e0ee7aa0b15299bc678758a754eec51ee537c53f.patch
-
-# ext4 patches from f-11
-ApplyPatch linux-2.6-ext4-clear-unwritten-flag.patch
-ApplyPatch linux-2.6-ext4-fake-delalloc-bno.patch
-ApplyPatch linux-2.6-ext4-fix-i_cached_extent-race.patch
-ApplyPatch linux-2.6-ext4-prealloc-fixes.patch
-
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
 
@@ -1375,6 +1351,7 @@ fi
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
 ApplyPatch kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
+ApplyPatch kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1979,6 +1956,21 @@ fi
 %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 Jun 14 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.25-78.2.54
+- Linux 2.6.27.25
+- Dropped patches, merged in .25
+    ext4.git-1-8657e625a390d09a21970a810f271d74e99b4c8f.patch
+    ext4.git-2-b3239aab20df1446ddfb8d0520076d5fd0d4ecd2.patch
+    ext4.git-3-e9b9a50398f0cc909e5645716c74cc1aecd6699e.patch
+    ext4.git-4-ce54e9c7949d1158512accf23825641a92bd07f9.patch
+    ext4.git-5-e0ee7aa0b15299bc678758a754eec51ee537c53f.patch
+    linux-2.6-ext4-clear-unwritten-flag.patch
+    linux-2.6-ext4-fake-delalloc-bno.patch
+    linux-2.6-ext4-fix-i_cached_extent-race.patch
+    linux-2.6-ext4-prealloc-fixes.patch
+- Added patch from 2.6.29.4:
+    kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
+
 * Wed May 20 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.24-78.2.53
 - Allow building the F-9 kernel on F-11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798.2.14
retrieving revision 1.798.2.15
diff -u -p -r1.798.2.14 -r1.798.2.15
--- sources	20 May 2009 08:49:48 -0000	1.798.2.14
+++ sources	15 Jun 2009 01:16:36 -0000	1.798.2.15
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-e80fcf73166ec34e54ab7c720cadc925  patch-2.6.27.24.bz2
+53981d997d85d4a65e086fd1cada61a0  patch-2.6.27.25.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717.2.14
retrieving revision 1.717.2.15
diff -u -p -r1.717.2.14 -r1.717.2.15
--- upstream	20 May 2009 08:49:48 -0000	1.717.2.14
+++ upstream	15 Jun 2009 01:16:36 -0000	1.717.2.15
@@ -1,2 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.24.bz2
+patch-2.6.27.25.bz2


--- ext4.git-1-8657e625a390d09a21970a810f271d74e99b4c8f.patch DELETED ---


--- ext4.git-2-b3239aab20df1446ddfb8d0520076d5fd0d4ecd2.patch DELETED ---


--- ext4.git-3-e9b9a50398f0cc909e5645716c74cc1aecd6699e.patch DELETED ---


--- ext4.git-4-ce54e9c7949d1158512accf23825641a92bd07f9.patch DELETED ---


--- ext4.git-5-e0ee7aa0b15299bc678758a754eec51ee537c53f.patch DELETED ---


--- linux-2.6-ext4-clear-unwritten-flag.patch DELETED ---


--- linux-2.6-ext4-fake-delalloc-bno.patch DELETED ---


--- linux-2.6-ext4-fix-i_cached_extent-race.patch DELETED ---


--- linux-2.6-ext4-prealloc-fixes.patch DELETED ---


--- patch-2.6.27.24.bz2.sign DELETED ---


