Linux v3.3.8
This commit is contained in:
Josh Boyer
parent
474849beb1
commit
c701cb2c67
19
kernel.spec
19
kernel.spec
|
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 3
|
||||
%global baserelease 1
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -66,7 +66,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 7
|
||||
%define stable_update 8
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
|
@ -772,9 +772,6 @@ Patch21351: x86-add-io_apic_ops-to-allow-interception.patch
|
|||
Patch21352: x86-apic_ops-Replace-apic_ops-with-x86_apic_ops.patch
|
||||
Patch21353: xen-x86-Implement-x86_apic_ops.patch
|
||||
|
||||
#rhbz 807632
|
||||
Patch21385: libata-forbid-port-runtime-pm-by-default.patch
|
||||
|
||||
#rhbz 808559
|
||||
Patch21530: ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch
|
||||
|
||||
|
|
@ -797,9 +794,6 @@ Patch22018: atl1c_net_next_update-3.3.patch
|
|||
#rhbz 795176
|
||||
Patch22019: rtl818x-fix-sleeping-function-called-from-invalid-context.patch
|
||||
|
||||
#rhbz 822120
|
||||
Patch22020: rtlwifi-fix-for-race-condition-when-firmware-is-cach.patch
|
||||
|
||||
#rhbz 822825 822821 CVE-2012-2372
|
||||
Patch22021: mm-pmd_read_atomic-fix-32bit-PAE-pmd-walk-vs-pmd_populate-SMP-race-condition.patch
|
||||
|
||||
|
|
@ -1474,9 +1468,6 @@ ApplyPatch x86-add-io_apic_ops-to-allow-interception.patch
|
|||
ApplyPatch x86-apic_ops-Replace-apic_ops-with-x86_apic_ops.patch
|
||||
ApplyPatch xen-x86-Implement-x86_apic_ops.patch
|
||||
|
||||
#rhbz 807632
|
||||
ApplyPatch libata-forbid-port-runtime-pm-by-default.patch
|
||||
|
||||
#rhbz 806295
|
||||
ApplyPatch disable-hid-battery.patch
|
||||
|
||||
|
|
@ -1492,9 +1483,6 @@ ApplyPatch atl1c_net_next_update-3.3.patch
|
|||
#rhbz 795176
|
||||
ApplyPatch rtl818x-fix-sleeping-function-called-from-invalid-context.patch
|
||||
|
||||
#rhbz 822120
|
||||
ApplyPatch rtlwifi-fix-for-race-condition-when-firmware-is-cach.patch
|
||||
|
||||
#rhbz 822825 822821 CVE-2012-2372
|
||||
ApplyPatch mm-pmd_read_atomic-fix-32bit-PAE-pmd-walk-vs-pmd_populate-SMP-race-condition.patch
|
||||
|
||||
|
|
@ -2239,6 +2227,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Mon Jun 04 2012 Josh Boyer <jwboyer@redhat.com> 3.3.8-1
|
||||
- Linux v3.3.8
|
||||
|
||||
* Mon Jun 04 2012 Dave Jones <davej@redhat.com>
|
||||
- Disable 32bit NX emulation.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
From: Lin Ming <ming.m.lin@xxxxxxxxx>
|
||||
Date: Wed, 18 Apr 2012 09:13:41 +0800
|
||||
Subject: [PATCH] libata: forbid port runtime pm by default
|
||||
|
||||
Forbid port runtime pm by default because it has known hotplug issue.
|
||||
User can allow it by, for example
|
||||
|
||||
echo auto > /sys/devices/pci0000:00/0000:00:1f.2/ata2/power/control
|
||||
|
||||
Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx>
|
||||
---
|
||||
drivers/ata/libata-transport.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
--- linux-3.3.noarch.orig/drivers/ata/libata-transport.c
|
||||
+++ linux-3.3.noarch/drivers/ata/libata-transport.c
|
||||
@@ -294,6 +294,7 @@ int ata_tport_add(struct device *parent,
|
||||
device_enable_async_suspend(dev);
|
||||
pm_runtime_set_active(dev);
|
||||
pm_runtime_enable(dev);
|
||||
+ pm_runtime_forbid(dev);
|
||||
|
||||
transport_add_device(dev);
|
||||
transport_configure_device(dev);
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
From 574e02abaf816b582685805f0c1150ca9f1f18ee Mon Sep 17 00:00:00 2001
|
||||
From: Larry Finger <Larry.Finger@lwfinger.net>
|
||||
Date: Fri, 4 May 2012 08:27:43 -0500
|
||||
Subject: [PATCH] rtlwifi: fix for race condition when firmware is cached
|
||||
|
||||
In commit b0302ab, the rtlwifi family of drivers was converted to use
|
||||
asynchronous firmware loading. Unfortumately, the implementation was
|
||||
racy, and the ieee80211 routines could be started before rtl_init_core()
|
||||
was called to setup the data.
|
||||
|
||||
This patch fixes the bug noted in https://bugzilla.kernel.org/show_bug.cgi?id=43187.
|
||||
|
||||
Reported-by: Joshua Roys <Joshua.Roys@gtri.gatech.edu>
|
||||
Tested-by: Neptune Ning <frostyplanet@gmail.com>
|
||||
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
||||
Cc: Stable <stable@vger.kernel.org> [3.3]
|
||||
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
||||
---
|
||||
drivers/net/wireless/rtlwifi/pci.c | 16 ++++++++--------
|
||||
drivers/net/wireless/rtlwifi/usb.c | 10 +++++-----
|
||||
2 files changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
|
||||
index b588ca8..03c400e 100644
|
||||
--- a/drivers/net/wireless/rtlwifi/pci.c
|
||||
+++ b/drivers/net/wireless/rtlwifi/pci.c
|
||||
@@ -1865,14 +1865,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
|
||||
/*like read eeprom and so on */
|
||||
rtlpriv->cfg->ops->read_eeprom_info(hw);
|
||||
|
||||
- if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
|
||||
- RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
- ("Can't init_sw_vars.\n"));
|
||||
- goto fail3;
|
||||
- }
|
||||
-
|
||||
- rtlpriv->cfg->ops->init_sw_leds(hw);
|
||||
-
|
||||
/*aspm */
|
||||
rtl_pci_init_aspm(hw);
|
||||
|
||||
@@ -1892,6 +1884,14 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
|
||||
goto fail3;
|
||||
}
|
||||
|
||||
+ if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
|
||||
+ RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
+ ("Can't init_sw_vars.\n"));
|
||||
+ goto fail3;
|
||||
+ }
|
||||
+
|
||||
+ rtlpriv->cfg->ops->init_sw_leds(hw);
|
||||
+
|
||||
err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);
|
||||
if (err) {
|
||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
|
||||
index 049e207..20b53ae 100644
|
||||
--- a/drivers/net/wireless/rtlwifi/usb.c
|
||||
+++ b/drivers/net/wireless/rtlwifi/usb.c
|
||||
@@ -970,12 +970,6 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
|
||||
rtlpriv->cfg->ops->read_chip_version(hw);
|
||||
/*like read eeprom and so on */
|
||||
rtlpriv->cfg->ops->read_eeprom_info(hw);
|
||||
- if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
|
||||
- RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
- ("Can't init_sw_vars.\n"));
|
||||
- goto error_out;
|
||||
- }
|
||||
- rtlpriv->cfg->ops->init_sw_leds(hw);
|
||||
err = _rtl_usb_init(hw);
|
||||
err = _rtl_usb_init_sw(hw);
|
||||
/* Init mac80211 sw */
|
||||
@@ -985,6 +979,12 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
|
||||
("Can't allocate sw for mac80211.\n"));
|
||||
goto error_out;
|
||||
}
|
||||
+ if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
|
||||
+ RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
+ ("Can't init_sw_vars.\n"));
|
||||
+ goto error_out;
|
||||
+ }
|
||||
+ rtlpriv->cfg->ops->init_sw_leds(hw);
|
||||
|
||||
return 0;
|
||||
error_out:
|
||||
Loading…
Reference in New Issue