From bc12142e94b6bc3c20e422e596cff4d0426c3be7 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Aug 16 2011 14:31:40 +0000 Subject: Add a few patches that were in f16 but not in rawhide --- diff --git a/block-stray-block-put-after-teardown.patch b/block-stray-block-put-after-teardown.patch new file mode 100644 index 0000000..f4bf9c4 --- /dev/null +++ b/block-stray-block-put-after-teardown.patch @@ -0,0 +1,11 @@ +--- linux-2.6.39.noarch/block/elevator.c~ 2011-08-09 10:07:41.532774872 -0400 ++++ linux-2.6.39.noarch/block/elevator.c 2011-08-09 10:07:56.131724173 -0400 +@@ -815,7 +815,7 @@ void elv_completed_request(struct reques + */ + if (blk_account_rq(rq)) { + q->in_flight[rq_is_sync(rq)]--; +- if ((rq->cmd_flags & REQ_SORTED) && ++ if ((rq->cmd_flags & REQ_SORTED) && e->ops && + e->ops->elevator_completed_req_fn) + e->ops->elevator_completed_req_fn(q, rq); + } diff --git a/efi-dont-map-boot-services-on-32bit.patch b/efi-dont-map-boot-services-on-32bit.patch new file mode 100644 index 0000000..7cc6149 --- /dev/null +++ b/efi-dont-map-boot-services-on-32bit.patch @@ -0,0 +1,22 @@ +diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c +index 3ae4128..ff7dc70 100644 +--- a/arch/x86/platform/efi/efi.c ++++ b/arch/x86/platform/efi/efi.c +@@ -659,10 +659,13 @@ void __init efi_enter_virtual_mode(void) + + for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { + md = p; +- if (!(md->attribute & EFI_MEMORY_RUNTIME) && +- md->type != EFI_BOOT_SERVICES_CODE && +- md->type != EFI_BOOT_SERVICES_DATA) +- continue; ++ if (!(md->attribute & EFI_MEMORY_RUNTIME)) { ++#ifdef CONFIG_X86_64 ++ if (md->type != EFI_BOOT_SERVICES_CODE && ++ md->type != EFI_BOOT_SERVICES_DATA) ++#endif ++ continue; ++ } + + size = md->num_pages << EFI_PAGE_SHIFT; + end = md->phys_addr + size; diff --git a/kernel.spec b/kernel.spec index 4d62e29..29dda4e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -650,6 +650,7 @@ Patch800: linux-2.6-crash-driver.patch # virt + ksm patches Patch1555: fix_xen_guest_on_old_EC2.patch +Patch1556: xen-blkfront-name-adjust.patch # DRM @@ -687,6 +688,9 @@ Patch12022: fix-cdc-ncm-dma-stack-vars.patch Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.patch Patch12024: epoll-fix-spurious-lockdep-warnings.patch Patch12025: rcu-avoid-just-onlined-cpu-resched.patch +Patch12026: block-stray-block-put-after-teardown.patch +Patch12027: usb-add-quirk-for-logitech-webcams.patch + # Runtime power management Patch12203: linux-2.6-usb-pci-autosuspend.patch @@ -695,6 +699,8 @@ Patch12205: runtime_pm_fixups.patch Patch12303: dmar-disable-when-ricoh-multifunction.patch +Patch13003: efi-dont-map-boot-services-on-32bit.patch + Patch20000: utrace.patch %endif @@ -1233,6 +1239,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 @@ -1264,6 +1271,8 @@ ApplyPatch fix-cdc-ncm-dma-stack-vars.patch ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch ApplyPatch epoll-fix-spurious-lockdep-warnings.patch ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch +ApplyPatch block-stray-block-put-after-teardown.patch +ApplyPatch usb-add-quirk-for-logitech-webcams.patch # Runtime PM #ApplyPatch linux-2.6-usb-pci-autosuspend.patch @@ -1274,6 +1283,8 @@ ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch # rhbz#605888 ApplyPatch dmar-disable-when-ricoh-multifunction.patch +ApplyPatch efi-dont-map-boot-services-on-32bit.patch + # utrace. ApplyPatch utrace.patch @@ -1902,6 +1913,7 @@ fi %changelog * Tue Aug 16 2011 Josh Boyer - Bring ARM config changes from David Marlin forward +- Sync a handful of patches from f16 * Mon Aug 15 2011 Josh Boyer - Linux-3.1-rc2 diff --git a/usb-add-quirk-for-logitech-webcams.patch b/usb-add-quirk-for-logitech-webcams.patch new file mode 100644 index 0000000..fa32f34 --- /dev/null +++ b/usb-add-quirk-for-logitech-webcams.patch @@ -0,0 +1,30 @@ +commit a218e3649310bd2ee0e8b7ec6353ab029d020289 +Author: Oliver Neukum +Date: Tue Aug 9 08:12:37 2011 -0400 + + USB: quirk for Logitech C250, C270, and C310 webcams + + This need for this was shown by the new PM code + + Signed-off-by: Oliver Neukum + +diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c +index 81ce6a8..5114281 100644 +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -41,6 +41,15 @@ static const struct usb_device_id usb_quirk_list[] = { + /* Logitech Harmony 700-series */ + { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT }, + ++ /* Logitech Webcam C250 */ ++ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C310 */ ++ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C270 */ ++ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* Philips PSC805 audio device */ + { USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME }, + diff --git a/xen-blkfront-name-adjust.patch b/xen-blkfront-name-adjust.patch new file mode 100644 index 0000000..9573c7b --- /dev/null +++ b/xen-blkfront-name-adjust.patch @@ -0,0 +1,30 @@ +commit 196cfe2ae8fcdc03b3c7d627e7dfe8c0ce7229f9 +Author: Stefan Bader +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 + Signed-off-by: Stefan Bader + Signed-off-by: Konrad Rzeszutek Wilk + +--- 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 */ +