]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Linux 3.4.49 v3.4.49
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Jun 2013 17:48:31 +0000 (10:48 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Jun 2013 17:48:31 +0000 (10:48 -0700)
34 files changed:
queue-3.9/powerpc-pseries-make-32-bit-msi-quirk-work-on-systems-lacking-firmware-support.patch
releases/3.4.49/acpi-video-ignore-bios-initial-backlight-value-for-hp-m4.patch [moved from queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-m4.patch with 100% similarity]
releases/3.4.49/acpi-video-ignore-bios-initial-backlight-value-for-hp-pavilion-g6.patch [moved from queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-pavilion-g6.patch with 100% similarity]
releases/3.4.49/alsa-usb-audio-apply-logitech-quickcam-pro-9000-quirk-only-to-audio-iface.patch [moved from queue-3.4/alsa-usb-audio-apply-logitech-quickcam-pro-9000-quirk-only-to-audio-iface.patch with 100% similarity]
releases/3.4.49/alsa-usb-audio-fix-invalid-volume-resolution-on-logitech-hd-webcam-c270.patch [moved from queue-3.4/alsa-usb-audio-fix-invalid-volume-resolution-on-logitech-hd-webcam-c270.patch with 100% similarity]
releases/3.4.49/alsa-usb-audio-fix-roland-cakewalk-um-3g-support.patch [moved from queue-3.4/alsa-usb-audio-fix-roland-cakewalk-um-3g-support.patch with 100% similarity]
releases/3.4.49/drm-fix-a-use-after-free-when-gpu-acceleration-disabled.patch [moved from queue-3.4/drm-fix-a-use-after-free-when-gpu-acceleration-disabled.patch with 100% similarity]
releases/3.4.49/drm-gma500-increase-max-resolution-for-mode-setting.patch [moved from queue-3.4/drm-gma500-increase-max-resolution-for-mode-setting.patch with 100% similarity]
releases/3.4.49/drm-i915-no-lvds-quirk-for-hp-t5740.patch [moved from queue-3.4/drm-i915-no-lvds-quirk-for-hp-t5740.patch with 100% similarity]
releases/3.4.49/drm-i915-sdvo-use-intel_sdvo-ddc-instead-of-intel_sdvo-i2c-for-ddc.patch [moved from queue-3.4/drm-i915-sdvo-use-intel_sdvo-ddc-instead-of-intel_sdvo-i2c-for-ddc.patch with 100% similarity]
releases/3.4.49/drm-radeon-don-t-allow-audio-on-dce6.patch [moved from queue-3.4/drm-radeon-don-t-allow-audio-on-dce6.patch with 100% similarity]
releases/3.4.49/ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch [moved from queue-3.4/ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch with 100% similarity]
releases/3.4.49/hwmon-adm1021-strengthen-chip-detection-for-adm1021-lm84-and-max1617.patch [moved from queue-3.4/hwmon-adm1021-strengthen-chip-detection-for-adm1021-lm84-and-max1617.patch with 100% similarity]
releases/3.4.49/powerpc-eeh-don-t-check-rtas-token-to-get-pe-addr.patch [moved from queue-3.4/powerpc-eeh-don-t-check-rtas-token-to-get-pe-addr.patch with 100% similarity]
releases/3.4.49/radeon-fix-system-hang-issue-when-using-kms-with-older-cards.patch [moved from queue-3.4/radeon-fix-system-hang-issue-when-using-kms-with-older-cards.patch with 100% similarity]
releases/3.4.49/series [moved from queue-3.4/series with 100% similarity]
releases/3.4.49/tracing-fix-possible-null-pointer-dereferences.patch [moved from queue-3.4/tracing-fix-possible-null-pointer-dereferences.patch with 100% similarity]
releases/3.4.49/usb-ark3116-fix-control-message-timeout.patch [moved from queue-3.4/usb-ark3116-fix-control-message-timeout.patch with 100% similarity]
releases/3.4.49/usb-ftdi_sio-quiet-sparse-noise-about-using-plain-integer-was-null-pointer.patch [moved from queue-3.4/usb-ftdi_sio-quiet-sparse-noise-about-using-plain-integer-was-null-pointer.patch with 100% similarity]
releases/3.4.49/usb-iuu_phoenix-fix-bulk-message-timeout.patch [moved from queue-3.4/usb-iuu_phoenix-fix-bulk-message-timeout.patch with 100% similarity]
releases/3.4.49/usb-keyspan-fix-bogus-array-index.patch [moved from queue-3.4/usb-keyspan-fix-bogus-array-index.patch with 100% similarity]
releases/3.4.49/usb-mos7720-fix-dma-to-stack.patch [moved from queue-3.4/usb-mos7720-fix-dma-to-stack.patch with 100% similarity]
releases/3.4.49/usb-mos7720-fix-hardware-flow-control.patch [moved from queue-3.4/usb-mos7720-fix-hardware-flow-control.patch with 100% similarity]
releases/3.4.49/usb-mos7720-fix-message-timeouts.patch [moved from queue-3.4/usb-mos7720-fix-message-timeouts.patch with 100% similarity]
releases/3.4.49/usb-option-blacklist-network-interface-on-huawei-e1820.patch [moved from queue-3.4/usb-option-blacklist-network-interface-on-huawei-e1820.patch with 100% similarity]
releases/3.4.49/usb-revert-periodic-scheduling-bugfix.patch [moved from queue-3.4/usb-revert-periodic-scheduling-bugfix.patch with 100% similarity]
releases/3.4.49/usb-serial-cypress_m8-enable-frwd-dongle-hidcom-device.patch [moved from queue-3.4/usb-serial-cypress_m8-enable-frwd-dongle-hidcom-device.patch with 100% similarity]
releases/3.4.49/usb-serial-fix-treo-kyocera-interrrupt-in-urb-context.patch [moved from queue-3.4/usb-serial-fix-treo-kyocera-interrrupt-in-urb-context.patch with 100% similarity]
releases/3.4.49/usb-visor-fix-initialisation-of-treo-kyocera-devices.patch [moved from queue-3.4/usb-visor-fix-initialisation-of-treo-kyocera-devices.patch with 100% similarity]
releases/3.4.49/usb-whiteheat-fix-broken-port-configuration.patch [moved from queue-3.4/usb-whiteheat-fix-broken-port-configuration.patch with 100% similarity]
releases/3.4.49/xen-pciback-rate-limit-error-messages-from-xen_pcibk_enable_msi-x.patch [moved from queue-3.4/xen-pciback-rate-limit-error-messages-from-xen_pcibk_enable_msi-x.patch with 100% similarity]
releases/3.4.49/xhci-correct-comp_mode_recovery_timer-on-return-from-hibernate.patch [moved from queue-3.4/xhci-correct-comp_mode_recovery_timer-on-return-from-hibernate.patch with 100% similarity]
releases/3.4.49/xhci-fix-list-access-before-init.patch [moved from queue-3.4/xhci-fix-list-access-before-init.patch with 100% similarity]
releases/3.4.49/xhci-mem-init-list-heads-at-the-beginning-of-init.patch [moved from queue-3.4/xhci-mem-init-list-heads-at-the-beginning-of-init.patch with 100% similarity]

index ac128f65a8f0e9dbd0490d1f97dc976ea2216d9d..239facab07618d86ab332fa453c3e2106b9a74d1 100644 (file)
@@ -21,19 +21,21 @@ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Signed-off-by: Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
+
 ---
- arch/powerpc/platforms/pseries/msi.c |   40 ++++++++++++++++++++++++++++++++---
- 1 file changed, 37 insertions(+), 3 deletions(-)
+ arch/powerpc/platforms/pseries/msi.c |   42 ++++++++++++++++++++++++++++++++---
+ 1 file changed, 39 insertions(+), 3 deletions(-)
 
 --- a/arch/powerpc/platforms/pseries/msi.c
 +++ b/arch/powerpc/platforms/pseries/msi.c
-@@ -394,6 +394,23 @@ static int check_msix_entries(struct pci
+@@ -394,6 +394,25 @@ static int check_msix_entries(struct pci
        return 0;
  }
  
 +static void rtas_hack_32bit_msi_gen2(struct pci_dev *pdev)
 +{
 +      u32 addr_hi, addr_lo;
++      int pos;
 +
 +      /*
 +       * We should only get in here for IODA1 configs. This is based on the
@@ -42,16 +44,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       */
 +      dev_info(&pdev->dev,
 +               "rtas_msi: No 32 bit MSI firmware support, forcing 32 bit MSI\n");
-+      pci_read_config_dword(pdev, pdev->msi_cap + PCI_MSI_ADDRESS_HI, &addr_hi);
++      pos = pci_find_capability(pdev, PCI_CAP_ID_MSI);
++      pci_read_config_dword(pdev, pos + PCI_MSI_ADDRESS_HI, &addr_hi);
 +      addr_lo = 0xffff0000 | ((addr_hi >> (48 - 32)) << 4);
-+      pci_write_config_dword(pdev, pdev->msi_cap + PCI_MSI_ADDRESS_LO, addr_lo);
-+      pci_write_config_dword(pdev, pdev->msi_cap + PCI_MSI_ADDRESS_HI, 0);
++      pci_write_config_dword(pdev, pos + PCI_MSI_ADDRESS_LO, addr_lo);
++      pci_write_config_dword(pdev, pos + PCI_MSI_ADDRESS_HI, 0);
 +}
 +
  static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec_in, int type)
  {
        struct pci_dn *pdn;
-@@ -401,6 +418,7 @@ static int rtas_setup_msi_irqs(struct pc
+@@ -401,6 +420,7 @@ static int rtas_setup_msi_irqs(struct pc
        struct msi_desc *entry;
        struct msi_msg msg;
        int nvec = nvec_in;
@@ -59,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        pdn = get_pdn(pdev);
        if (!pdn)
-@@ -428,15 +446,31 @@ static int rtas_setup_msi_irqs(struct pc
+@@ -428,15 +448,31 @@ static int rtas_setup_msi_irqs(struct pc
         */
  again:
        if (type == PCI_CAP_ID_MSI) {
similarity index 100%
rename from queue-3.4/series
rename to releases/3.4.49/series