Sync with f15 for rhbz 729340. Whee!
This commit is contained in:
parent
ed165f2540
commit
bba41d6786
10
kernel.spec
10
kernel.spec
|
@ -51,7 +51,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be prepended with "0.", so
|
||||
# for example a 3 here will become 0.3
|
||||
#
|
||||
%global baserelease 5
|
||||
%global baserelease 6
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -650,7 +650,9 @@ Patch800: linux-2.6-crash-driver.patch
|
|||
# crypto/
|
||||
|
||||
# virt + ksm patches
|
||||
Patch1555: fix_xen_guest_on_old_EC2.patch
|
||||
Patch1500: fix_xen_guest_on_old_EC2.patch
|
||||
Patch1501: xen-blkfront-name-adjust.patch
|
||||
|
||||
|
||||
# DRM
|
||||
|
||||
|
@ -1243,6 +1245,7 @@ ApplyPatch linux-2.6-e1000-ich9-montevina.patch
|
|||
|
||||
# Assorted Virt Fixes
|
||||
ApplyPatch fix_xen_guest_on_old_EC2.patch
|
||||
ApplyPatch xen-blkfront-name-adjust.patch
|
||||
|
||||
# DRM core
|
||||
|
||||
|
@ -1904,6 +1907,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Thu Aug 11 2011 Josh Boyer <jwboyer@redhat.com>
|
||||
- Add patch davej applied to f15 for rhbz 729340
|
||||
|
||||
* Tue Aug 09 2011 Josh Boyer <jwboyer@redhat.com>
|
||||
- Add Makefile.config and ARM config changes from David Marlin
|
||||
|
||||
|
|
|
@ -0,0 +1,30 @@
|
|||
commit 196cfe2ae8fcdc03b3c7d627e7dfe8c0ce7229f9
|
||||
Author: Stefan Bader <stefan.bader@canonical.com>
|
||||
Date: Thu Jul 14 15:30:22 2011 +0200
|
||||
|
||||
xen-blkfront: Drop name and minor adjustments for emulated scsi devices
|
||||
|
||||
These were intended to avoid the namespace clash when representing
|
||||
emulated IDE and SCSI devices. However that seems to confuse users
|
||||
more than expected (a disk defined as sda becomes xvde).
|
||||
So for now go back to the scheme which does no adjustments. This
|
||||
will break when mixing IDE and SCSI names in the configuration of
|
||||
guests but should be by now expected.
|
||||
|
||||
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
|
||||
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
|
||||
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||||
|
||||
--- linux-2.6.39.noarch/drivers/block/xen-blkfront.c~ 2011-08-11 11:54:25.656150889 -0400
|
||||
+++ linux-2.6.39.noarch/drivers/block/xen-blkfront.c 2011-08-11 11:54:54.573046334 -0400
|
||||
@@ -123,8 +123,8 @@ static DEFINE_SPINLOCK(minor_lock);
|
||||
#define BLKIF_MINOR_EXT(dev) ((dev)&(~EXTENDED))
|
||||
#define EMULATED_HD_DISK_MINOR_OFFSET (0)
|
||||
#define EMULATED_HD_DISK_NAME_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET / 256)
|
||||
-#define EMULATED_SD_DISK_MINOR_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET + (4 * 16))
|
||||
-#define EMULATED_SD_DISK_NAME_OFFSET (EMULATED_HD_DISK_NAME_OFFSET + 4)
|
||||
+#define EMULATED_SD_DISK_MINOR_OFFSET (0)
|
||||
+#define EMULATED_SD_DISK_NAME_OFFSET (EMULATED_SD_DISK_MINOR_OFFSET / 256)
|
||||
|
||||
#define DEV_NAME "xvd" /* name in /dev */
|
||||
|
Loading…
Reference in New Issue