diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-08-20 08:13:48 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-20 08:13:48 -0400 |
| commit | 0ad3713581707dc6d4d25ab7d148a37b654cff48 (patch) | |
| tree | ef85a4fc962a97739da2aee14a164180cc775178 /xen-blkfront-name-adjust.patch | |
| parent | 7aac3ebb1e0cc675b2cbc54fcc1f98dd73c011b9 (diff) | |
| download | kernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.tar.gz kernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.tar.xz kernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.zip | |
3.1-rc2-git7 snapshot. Fix provides/obsoletes for cpupowerutils-devel
Diffstat (limited to 'xen-blkfront-name-adjust.patch')
| -rw-r--r-- | xen-blkfront-name-adjust.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/xen-blkfront-name-adjust.patch b/xen-blkfront-name-adjust.patch deleted file mode 100644 index 9573c7bf5..000000000 --- a/xen-blkfront-name-adjust.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 */ - |