Linux 3.3.5
- Add patch to rate limit NFSv4 message (rhbz 732748)
This commit is contained in:
parent
b4b239926d
commit
851e38799e
|
@ -0,0 +1,37 @@
|
|||
From 34d91cfbc163c6e2a136a27c96918fc35de06341 Mon Sep 17 00:00:00 2001
|
||||
From: William Dauchy <wdauchy@gmail.com>
|
||||
Date: Wed, 14 Mar 2012 12:32:04 +0100
|
||||
Subject: [PATCH] NFSv4: Rate limit the state manager for lock reclaim warning
|
||||
messages
|
||||
|
||||
Adding rate limit on `Lock reclaim failed` messages since it could fill
|
||||
up system logs
|
||||
Signed-off-by: William Dauchy <wdauchy@gmail.com>
|
||||
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
|
||||
|
||||
Conflicts:
|
||||
|
||||
fs/nfs/nfs4state.c
|
||||
---
|
||||
fs/nfs/nfs4state.c | 5 +++--
|
||||
1 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
|
||||
index bacb271..3676b5c 100644
|
||||
--- a/fs/nfs/nfs4state.c
|
||||
+++ b/fs/nfs/nfs4state.c
|
||||
@@ -1247,8 +1247,9 @@ restart:
|
||||
spin_lock(&state->state_lock);
|
||||
list_for_each_entry(lock, &state->lock_states, ls_locks) {
|
||||
if (!(lock->ls_flags & NFS_LOCK_INITIALIZED))
|
||||
- printk("%s: Lock reclaim failed!\n",
|
||||
- __func__);
|
||||
+ pr_warn_ratelimited("NFS: "
|
||||
+ "%s: Lock reclaim "
|
||||
+ "failed!\n", __func__);
|
||||
}
|
||||
spin_unlock(&state->state_lock);
|
||||
nfs4_put_open_state(state);
|
||||
--
|
||||
1.7.7.6
|
||||
|
|
@ -190,6 +190,11 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
|
|||
# CONFIG_MACH_EUKREA_CPUIMX35SD is not set
|
||||
CONFIG_ARM_ERRATA_720789=y
|
||||
CONFIG_ARM_ERRATA_751472=y
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
CONFIG_ARM_ERRATA_326103=y
|
||||
CONFIG_OMAP4_ERRATA_I688=y
|
||||
>>>>>>> 99667a9... Linux 3.3.5
|
||||
# CONFIG_FB_MX3 is not set
|
||||
# CONFIG_MX3_IPU is not set
|
||||
# CONFIG_MX3_IPU_IRQS is not set
|
||||
|
|
|
@ -1,198 +0,0 @@
|
|||
Hi Rafael,
|
||||
|
||||
One more version. Heeding Per's suggestion to optimise when
|
||||
CONFIG_HIGHMEM is not configured.
|
||||
|
||||
---------------------------------------
|
||||
Hibernation/thaw fixes/improvements:
|
||||
|
||||
1. Calculate the number of required free pages based on non-high memory
|
||||
pages only, because that is where the buffers will come from.
|
||||
|
||||
2. Do not allocate memory for buffers from emergency pools, unless
|
||||
absolutely required. Do not warn about and do not retry non-essential
|
||||
failed allocations.
|
||||
|
||||
3. Do not check the amount of free pages left on every single page
|
||||
write, but wait until one map is completely populated and then check.
|
||||
|
||||
4. Set maximum number of pages for read buffering consistently, instead
|
||||
of inadvertently depending on the size of the sector type.
|
||||
|
||||
5. Fix copyright line, which I missed when I submitted the hibernation
|
||||
threading patch.
|
||||
|
||||
6. Dispense with bit shifting arithmetic to improve readability.
|
||||
|
||||
Signed-off-by: Bojan Smojver <bojan@rexursive.com>
|
||||
Signed-off-by: Per Olofsson <pelle@debian.org>
|
||||
---
|
||||
kernel/power/swap.c | 76 +++++++++++++++++++++++++++++++++++++++------------
|
||||
1 files changed, 58 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
|
||||
index 8742fd0..8a1c293 100644
|
||||
--- a/kernel/power/swap.c
|
||||
+++ b/kernel/power/swap.c
|
||||
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* Copyright (C) 1998,2001-2005 Pavel Machek <pavel@ucw.cz>
|
||||
* Copyright (C) 2006 Rafael J. Wysocki <rjw@sisk.pl>
|
||||
- * Copyright (C) 2010 Bojan Smojver <bojan@rexursive.com>
|
||||
+ * Copyright (C) 2010-2012 Bojan Smojver <bojan@rexursive.com>
|
||||
*
|
||||
* This file is released under the GPLv2.
|
||||
*
|
||||
@@ -51,6 +51,36 @@
|
||||
|
||||
#define MAP_PAGE_ENTRIES (PAGE_SIZE / sizeof(sector_t) - 1)
|
||||
|
||||
+/*
|
||||
+ * Number of free pages that are not high.
|
||||
+ */
|
||||
+#ifdef CONFIG_HIGHMEM
|
||||
+static unsigned long low_free_pages(void)
|
||||
+{
|
||||
+ struct zone *zone;
|
||||
+ unsigned long free = 0;
|
||||
+
|
||||
+ for_each_populated_zone(zone)
|
||||
+ if (!is_highmem(zone))
|
||||
+ free += zone_page_state(zone, NR_FREE_PAGES);
|
||||
+ return free;
|
||||
+}
|
||||
+#else
|
||||
+static inline unsigned long low_free_pages(void)
|
||||
+{
|
||||
+ return nr_free_pages();
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
+ * Number of pages required to be kept free while writing the image. Always
|
||||
+ * half of all available low pages before the writing starts.
|
||||
+ */
|
||||
+static inline unsigned long reqd_free_pages(void)
|
||||
+{
|
||||
+ return low_free_pages() / 2;
|
||||
+}
|
||||
+
|
||||
struct swap_map_page {
|
||||
sector_t entries[MAP_PAGE_ENTRIES];
|
||||
sector_t next_swap;
|
||||
@@ -72,7 +102,7 @@ struct swap_map_handle {
|
||||
sector_t cur_swap;
|
||||
sector_t first_sector;
|
||||
unsigned int k;
|
||||
- unsigned long nr_free_pages, written;
|
||||
+ unsigned long reqd_free_pages;
|
||||
u32 crc32;
|
||||
};
|
||||
|
||||
@@ -265,14 +295,17 @@ static int write_page(void *buf, sector_t offset, struct bio **bio_chain)
|
||||
return -ENOSPC;
|
||||
|
||||
if (bio_chain) {
|
||||
- src = (void *)__get_free_page(__GFP_WAIT | __GFP_HIGH);
|
||||
+ src = (void *)__get_free_page(__GFP_WAIT | __GFP_NOWARN |
|
||||
+ __GFP_NORETRY);
|
||||
if (src) {
|
||||
copy_page(src, buf);
|
||||
} else {
|
||||
ret = hib_wait_on_bio_chain(bio_chain); /* Free pages */
|
||||
if (ret)
|
||||
return ret;
|
||||
- src = (void *)__get_free_page(__GFP_WAIT | __GFP_HIGH);
|
||||
+ src = (void *)__get_free_page(__GFP_WAIT |
|
||||
+ __GFP_NOWARN |
|
||||
+ __GFP_NORETRY);
|
||||
if (src) {
|
||||
copy_page(src, buf);
|
||||
} else {
|
||||
@@ -316,8 +349,7 @@ static int get_swap_writer(struct swap_map_handle *handle)
|
||||
goto err_rel;
|
||||
}
|
||||
handle->k = 0;
|
||||
- handle->nr_free_pages = nr_free_pages() >> 1;
|
||||
- handle->written = 0;
|
||||
+ handle->reqd_free_pages = reqd_free_pages();
|
||||
handle->first_sector = handle->cur_swap;
|
||||
return 0;
|
||||
err_rel:
|
||||
@@ -351,12 +383,17 @@ static int swap_write_page(struct swap_map_handle *handle, void *buf,
|
||||
clear_page(handle->cur);
|
||||
handle->cur_swap = offset;
|
||||
handle->k = 0;
|
||||
- }
|
||||
- if (bio_chain && ++handle->written > handle->nr_free_pages) {
|
||||
- error = hib_wait_on_bio_chain(bio_chain);
|
||||
- if (error)
|
||||
- goto out;
|
||||
- handle->written = 0;
|
||||
+
|
||||
+ if (bio_chain && low_free_pages() <= handle->reqd_free_pages) {
|
||||
+ error = hib_wait_on_bio_chain(bio_chain);
|
||||
+ if (error)
|
||||
+ goto out;
|
||||
+ /*
|
||||
+ * Recalculate the number of required free pages, to
|
||||
+ * make sure we never take more than half.
|
||||
+ */
|
||||
+ handle->reqd_free_pages = reqd_free_pages();
|
||||
+ }
|
||||
}
|
||||
out:
|
||||
return error;
|
||||
@@ -404,7 +441,7 @@ static int swap_writer_finish(struct swap_map_handle *handle,
|
||||
#define LZO_THREADS 3
|
||||
|
||||
/* Maximum number of pages for read buffering. */
|
||||
-#define LZO_READ_PAGES (MAP_PAGE_ENTRIES * 8)
|
||||
+#define LZO_READ_PAGES 8192
|
||||
|
||||
|
||||
/**
|
||||
@@ -615,10 +652,10 @@ static int save_image_lzo(struct swap_map_handle *handle,
|
||||
}
|
||||
|
||||
/*
|
||||
- * Adjust number of free pages after all allocations have been done.
|
||||
- * We don't want to run out of pages when writing.
|
||||
+ * Adjust the number of required free pages after all allocations have
|
||||
+ * been done. We don't want to run out of pages when writing.
|
||||
*/
|
||||
- handle->nr_free_pages = nr_free_pages() >> 1;
|
||||
+ handle->reqd_free_pages = reqd_free_pages();
|
||||
|
||||
/*
|
||||
* Start the CRC32 thread.
|
||||
@@ -1129,14 +1166,17 @@ static int load_image_lzo(struct swap_map_handle *handle,
|
||||
|
||||
/*
|
||||
* Adjust number of pages for read buffering, in case we are short.
|
||||
+ * Never take more than half of all available low pages.
|
||||
*/
|
||||
- read_pages = (nr_free_pages() - snapshot_get_image_size()) >> 1;
|
||||
+ read_pages = (low_free_pages() - snapshot_get_image_size()) / 2;
|
||||
read_pages = clamp_val(read_pages, LZO_CMP_PAGES, LZO_READ_PAGES);
|
||||
|
||||
for (i = 0; i < read_pages; i++) {
|
||||
page[i] = (void *)__get_free_page(i < LZO_CMP_PAGES ?
|
||||
__GFP_WAIT | __GFP_HIGH :
|
||||
- __GFP_WAIT);
|
||||
+ __GFP_WAIT | __GFP_NOWARN |
|
||||
+ __GFP_NORETRY);
|
||||
+
|
||||
if (!page[i]) {
|
||||
if (i < LZO_CMP_PAGES) {
|
||||
ring_size = i;
|
||||
---------------------------------------
|
||||
|
||||
--
|
||||
Bojan
|
||||
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
Please read the FAQ at http://www.tux.org/lkml/
|
|
@ -1,38 +0,0 @@
|
|||
From 899c612d74d4a242158a4db20367388d6299c028 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
||||
Date: Fri, 20 Apr 2012 22:34:49 -0700
|
||||
Subject: [PATCH] Input: synaptics - fix regression with "image sensor"
|
||||
trackpads
|
||||
|
||||
commit 7968a5dd492ccc38345013e534ad4c8d6eb60ed1
|
||||
Input: synaptics - add support for Relative mode
|
||||
|
||||
Accidentally broke support for advanced gestures (multitouch)
|
||||
on some trackpads such as the one in my ThinkPad X220 by
|
||||
incorretly changing the condition for enabling them. This
|
||||
restores it.
|
||||
|
||||
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
||||
CC: stable@kernel.org [3.3]
|
||||
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
|
||||
---
|
||||
drivers/input/mouse/synaptics.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
|
||||
index 8081a0a..a4b14a4 100644
|
||||
--- a/drivers/input/mouse/synaptics.c
|
||||
+++ b/drivers/input/mouse/synaptics.c
|
||||
@@ -274,7 +274,8 @@ static int synaptics_set_advanced_gesture_mode(struct psmouse *psmouse)
|
||||
static unsigned char param = 0xc8;
|
||||
struct synaptics_data *priv = psmouse->private;
|
||||
|
||||
- if (!SYN_CAP_ADV_GESTURE(priv->ext_cap_0c))
|
||||
+ if (!(SYN_CAP_ADV_GESTURE(priv->ext_cap_0c) ||
|
||||
+ SYN_CAP_IMAGE_SENSOR(priv->ext_cap_0c)))
|
||||
return 0;
|
||||
|
||||
if (psmouse_sliced_command(psmouse, SYN_QUE_MODEL))
|
||||
--
|
||||
1.7.10
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
Driver incorrectly validates command completion: instead of waiting
|
||||
for a command to be acknowledged it continues execution. Most of the
|
||||
time driver gets acknowledge of the command completion in a tasklet
|
||||
before it executes the next one. But sometimes it sends the next
|
||||
command before it gets acknowledge for the previous one. In such a
|
||||
case one of the following error messages appear in the log:
|
||||
|
||||
Failed to send SYSTEM_CONFIG: Already sending a command.
|
||||
Failed to send ASSOCIATE: Already sending a command.
|
||||
Failed to send TX_POWER: Already sending a command.
|
||||
|
||||
After that you need to reload the driver to get it working again.
|
||||
|
||||
This bug occurs during roammaping (reported by Sam Varshavchik)
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=738508
|
||||
and machine booting (reported by Tom Gundersen and Mads Kiilerich)
|
||||
https://bugs.archlinux.org/task/28097
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=802106
|
||||
|
||||
This patch doesn't fix the delay issue during firmware load.
|
||||
But at least device now works as usual after boot.
|
||||
|
||||
Cc: stable@kernel.org
|
||||
Signed-off-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
|
||||
---
|
||||
drivers/net/wireless/ipw2x00/ipw2200.c | 13 ++++++++++++-
|
||||
1 files changed, 12 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
|
||||
index 4130802..8cbafa5 100644
|
||||
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
|
||||
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
|
||||
@@ -2192,6 +2192,7 @@ static int __ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
|
||||
{
|
||||
int rc = 0;
|
||||
unsigned long flags;
|
||||
+ unsigned long now, end;
|
||||
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
if (priv->status & STATUS_HCMD_ACTIVE) {
|
||||
@@ -2233,10 +2234,20 @@ static int __ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
|
||||
}
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
+ now = jiffies;
|
||||
+ end = now + HOST_COMPLETE_TIMEOUT;
|
||||
+again:
|
||||
rc = wait_event_interruptible_timeout(priv->wait_command_queue,
|
||||
!(priv->
|
||||
status & STATUS_HCMD_ACTIVE),
|
||||
- HOST_COMPLETE_TIMEOUT);
|
||||
+ end - now);
|
||||
+ if (rc < 0) {
|
||||
+ now = jiffies;
|
||||
+ if (time_before(now, end))
|
||||
+ goto again;
|
||||
+ rc = 0;
|
||||
+ }
|
||||
+
|
||||
if (rc == 0) {
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
if (priv->status & STATUS_HCMD_ACTIVE) {
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
|
@ -1,66 +0,0 @@
|
|||
ctx->vif is dereferenced in different part of iwlwifi code, so do not
|
||||
nullify it.
|
||||
|
||||
This should address at least one of the possible reasons of WARNING at
|
||||
iwlagn_mac_remove_interface, and perhaps some random crashes when
|
||||
firmware reset is performed.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl-agn.c | 3 ---
|
||||
drivers/net/wireless/iwlwifi/iwl-mac80211.c | 10 +++++++++-
|
||||
2 files changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
--- linux-3.3.noarch.orig/drivers/net/wireless/iwlwifi/iwl-agn.c
|
||||
+++ linux-3.3.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c
|
||||
@@ -1403,7 +1403,6 @@ static void iwl_bg_run_time_calib_work(s
|
||||
|
||||
void iwlagn_prepare_restart(struct iwl_priv *priv)
|
||||
{
|
||||
- struct iwl_rxon_context *ctx;
|
||||
bool bt_full_concurrent;
|
||||
u8 bt_ci_compliance;
|
||||
u8 bt_load;
|
||||
@@ -1412,8 +1411,6 @@ void iwlagn_prepare_restart(struct iwl_p
|
||||
|
||||
lockdep_assert_held(&priv->shrd->mutex);
|
||||
|
||||
- for_each_context(priv, ctx)
|
||||
- ctx->vif = NULL;
|
||||
priv->is_open = 0;
|
||||
|
||||
/*
|
||||
--- linux-3.3.noarch.orig/drivers/net/wireless/iwlwifi/iwl-mac80211.c
|
||||
+++ linux-3.3.noarch/drivers/net/wireless/iwlwifi/iwl-mac80211.c
|
||||
@@ -1226,6 +1226,7 @@ static int iwlagn_mac_add_interface(stru
|
||||
struct iwl_rxon_context *tmp, *ctx = NULL;
|
||||
int err;
|
||||
enum nl80211_iftype viftype = ieee80211_vif_type_p2p(vif);
|
||||
+ bool reset = false;
|
||||
|
||||
IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n",
|
||||
viftype, vif->addr);
|
||||
@@ -1247,6 +1248,13 @@ static int iwlagn_mac_add_interface(stru
|
||||
tmp->interface_modes | tmp->exclusive_interface_modes;
|
||||
|
||||
if (tmp->vif) {
|
||||
+ /* On reset we need to add the same interface again */
|
||||
+ if (tmp->vif == vif) {
|
||||
+ reset = true;
|
||||
+ ctx = tmp;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
/* check if this busy context is exclusive */
|
||||
if (tmp->exclusive_interface_modes &
|
||||
BIT(tmp->vif->type)) {
|
||||
@@ -1273,7 +1281,7 @@ static int iwlagn_mac_add_interface(stru
|
||||
ctx->vif = vif;
|
||||
|
||||
err = iwl_setup_interface(priv, ctx);
|
||||
- if (!err)
|
||||
+ if (!err || reset)
|
||||
goto out;
|
||||
|
||||
ctx->vif = NULL;
|
40
kernel.spec
40
kernel.spec
|
@ -42,7 +42,7 @@ Summary: The Linux kernel
|
|||
# When changing real_sublevel below, reset this by hand to 1
|
||||
# (or to 0 and then use rpmdev-bumpspec).
|
||||
#
|
||||
%global baserelease 3
|
||||
%global baserelease 1
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# real_sublevel is the 3.x kernel version we're starting with
|
||||
|
@ -51,7 +51,7 @@ Summary: The Linux kernel
|
|||
%define fake_sublevel %(echo $((40 + %{real_sublevel})))
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 4
|
||||
%define stable_update 5
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
@ -640,6 +640,7 @@ Patch3500: jbd-jbd2-validate-sb-s_first-in-journal_get_superblo.patch
|
|||
Patch4000: NFSv4-Reduce-the-footprint-of-the-idmapper.patch
|
||||
Patch4001: NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch
|
||||
Patch4107: NFSv4-Minor-cleanups-for-nfs4_handle_exception-and-n.patch
|
||||
Patch4115: NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch
|
||||
|
||||
# patches headed upstream
|
||||
|
||||
|
@ -649,9 +650,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
|
|||
|
||||
Patch13003: efi-dont-map-boot-services-on-32bit.patch
|
||||
|
||||
Patch14000: hibernate-freeze-filesystems.patch
|
||||
Patch14001: hibernate-watermark.patch
|
||||
|
||||
Patch14010: lis3-improve-handling-of-null-rate.patch
|
||||
|
||||
Patch15000: bluetooth-use-after-free.patch
|
||||
|
@ -685,9 +683,6 @@ Patch21300: unhandled-irqs-switch-to-polling.patch
|
|||
#rhbz 804957 CVE-2012-1568
|
||||
Patch21306: shlib_base_randomize.patch
|
||||
|
||||
#rhbz 770476
|
||||
Patch21371: iwlwifi-do-not-nulify-ctx-vif-on-reset.patch
|
||||
|
||||
#rhbz 807632
|
||||
Patch21385: libata-forbid-port-runtime-pm-by-default.patch
|
||||
|
||||
|
@ -697,9 +692,6 @@ Patch21520: KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch
|
|||
#rhbz 808559
|
||||
Patch21530: ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch
|
||||
|
||||
Patch21700: x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
|
||||
Patch21701: x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
|
||||
|
||||
#rhbz 806295
|
||||
Patch21710: disable-hid-battery.patch
|
||||
|
||||
|
@ -708,11 +700,6 @@ Patch22000: weird-root-dentry-name-debug.patch
|
|||
#rhbz 814278 814289 CVE-2012-2119
|
||||
Patch22007: macvtap-zerocopy-validate-vector-length.patch
|
||||
|
||||
Patch22011: input-synaptics-fix-regression-with-image-sensor-trackpads.patch
|
||||
|
||||
#rhbz 783708
|
||||
Patch22012: ipw2200-Fix-race-condition-in-the-command-completion-acknowledge.patch
|
||||
|
||||
#rhbz 817298
|
||||
Patch22013: ipw2x00-add-supported-cipher-suites-to-wiphy-initialization.patch
|
||||
|
||||
|
@ -1173,6 +1160,7 @@ ApplyPatch jbd-jbd2-validate-sb-s_first-in-journal_get_superblo.patch
|
|||
ApplyPatch NFSv4-Reduce-the-footprint-of-the-idmapper.patch
|
||||
ApplyPatch NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch
|
||||
ApplyPatch NFSv4-Minor-cleanups-for-nfs4_handle_exception-and-n.patch
|
||||
ApplyPatch NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch
|
||||
|
||||
# USB
|
||||
|
||||
|
@ -1269,10 +1257,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
|
|||
|
||||
ApplyPatch efi-dont-map-boot-services-on-32bit.patch
|
||||
|
||||
# FIXME
|
||||
#ApplyPatch hibernate-freeze-filesystems.patch
|
||||
ApplyPatch hibernate-watermark.patch
|
||||
|
||||
ApplyPatch lis3-improve-handling-of-null-rate.patch
|
||||
|
||||
ApplyPatch bluetooth-use-after-free.patch
|
||||
|
@ -1304,27 +1288,15 @@ ApplyPatch weird-root-dentry-name-debug.patch
|
|||
#rhbz 808207 CVE-2012-1601
|
||||
ApplyPatch KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch
|
||||
|
||||
#rhbz 770476
|
||||
ApplyPatch iwlwifi-do-not-nulify-ctx-vif-on-reset.patch
|
||||
|
||||
#rhbz 807632
|
||||
ApplyPatch libata-forbid-port-runtime-pm-by-default.patch
|
||||
|
||||
#rhbz 797559
|
||||
ApplyPatch x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
|
||||
ApplyPatch x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
|
||||
|
||||
#rhbz 806295
|
||||
ApplyPatch disable-hid-battery.patch
|
||||
|
||||
#rhbz 814278 814289 CVE-2012-2119
|
||||
ApplyPatch macvtap-zerocopy-validate-vector-length.patch
|
||||
|
||||
ApplyPatch input-synaptics-fix-regression-with-image-sensor-trackpads.patch
|
||||
|
||||
#rhbz 783708
|
||||
ApplyPatch ipw2200-Fix-race-condition-in-the-command-completion-acknowledge.patch
|
||||
|
||||
#rhbz 817298
|
||||
ApplyPatch ipw2x00-add-supported-cipher-suites-to-wiphy-initialization.patch
|
||||
|
||||
|
@ -1983,6 +1955,10 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Mon May 07 2012 Josh Boyer <jwboyer@redhat.com> 2.6.43.5-1
|
||||
- Linux 3.3.5
|
||||
- Add patch to rate limit NFSv4 message (rhbz 732748)
|
||||
|
||||
* Fri May 04 2012 Josh Boyer <jwboyer@redhat.com>
|
||||
- unfiltered netdev rio_ioctl access by users (rhbz 818820)
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1,2 +1,2 @@
|
|||
7133f5a2086a7d7ef97abac610c094f5 linux-3.3.tar.xz
|
||||
9c4cc16f10b645fbb90f6c05ad388883 patch-3.3.4.xz
|
||||
d346edca5d3de7052f49996b01cef401 patch-3.3.5.xz
|
||||
|
|
|
@ -1,163 +0,0 @@
|
|||
Path: news.gmane.org!not-for-mail
|
||||
From: Borislav Petkov <borislav.petkov@amd.com>
|
||||
Newsgroups: gmane.linux.kernel
|
||||
Subject: [PATCH 2/2] x86, microcode: Ensure that module is only loaded for
|
||||
Date: Thu, 12 Apr 2012 18:34:22 +0200
|
||||
Lines: 80
|
||||
Approved: news@gmane.org
|
||||
Message-ID: <20120412163422.GM24549@aftab>
|
||||
References: <20120411163849.GE4794@alberich.amd.com>
|
||||
<20120411200601.GC12288@kroah.com>
|
||||
<20120411201053.GF18114@aftab>
|
||||
<20120412162351.GJ24549@aftab>
|
||||
NNTP-Posting-Host: plane.gmane.org
|
||||
Mime-Version: 1.0
|
||||
Content-Type: text/plain; charset="us-ascii"
|
||||
X-Trace: dough.gmane.org 1334248500 15307 80.91.229.3 (12 Apr 2012 16:35:00 GMT)
|
||||
X-Complaints-To: usenet@dough.gmane.org
|
||||
NNTP-Posting-Date: Thu, 12 Apr 2012 16:35:00 +0000 (UTC)
|
||||
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>,
|
||||
Kay Sievers <kay.sievers@vrfy.org>,
|
||||
Dave Jones <davej@redhat.com>, <linux-kernel@vger.kernel.org>
|
||||
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Original-X-From: linux-kernel-owner@vger.kernel.org Thu Apr 12 18:34:59 2012
|
||||
Return-path: <linux-kernel-owner@vger.kernel.org>
|
||||
Envelope-to: glk-linux-kernel-3@plane.gmane.org
|
||||
Original-Received: from vger.kernel.org ([209.132.180.67])
|
||||
by plane.gmane.org with esmtp (Exim 4.69)
|
||||
(envelope-from <linux-kernel-owner@vger.kernel.org>)
|
||||
id 1SIMz4-0008MV-3g
|
||||
for glk-linux-kernel-3@plane.gmane.org; Thu, 12 Apr 2012 18:34:58 +0200
|
||||
Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||
id S965760Ab2DLQep (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
|
||||
Thu, 12 Apr 2012 12:34:45 -0400
|
||||
Original-Received: from db3ehsobe002.messaging.microsoft.com ([213.199.154.140]:56919
|
||||
"EHLO db3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK)
|
||||
by vger.kernel.org with ESMTP id S965553Ab2DLQen (ORCPT
|
||||
<rfc822;linux-kernel@vger.kernel.org>);
|
||||
Thu, 12 Apr 2012 12:34:43 -0400
|
||||
Original-Received: from mail2-db3-R.bigfish.com (10.3.81.239) by
|
||||
DB3EHSOBE005.bigfish.com (10.3.84.25) with Microsoft SMTP Server id
|
||||
14.1.225.23; Thu, 12 Apr 2012 16:34:41 +0000
|
||||
Original-Received: from mail2-db3 (localhost [127.0.0.1]) by mail2-db3-R.bigfish.com
|
||||
(Postfix) with ESMTP id E4EF14404B4; Thu, 12 Apr 2012 16:34:41 +0000 (UTC)
|
||||
X-SpamScore: 0
|
||||
X-BigFish: VPS0(zzzz1202hzz8275bh8275dhz2dh668h839h944hd25hd2bh)
|
||||
X-Forefront-Antispam-Report: CIP:163.181.249.108;KIP:(null);UIP:(null);IPV:NLI;H:ausb3twp01.amd.com;RD:none;EFVD:NLI
|
||||
Original-Received: from mail2-db3 (localhost.localdomain [127.0.0.1]) by mail2-db3
|
||||
(MessageSwitch) id 1334248479906480_3860; Thu, 12 Apr 2012 16:34:39 +0000
|
||||
(UTC)
|
||||
Original-Received: from DB3EHSMHS005.bigfish.com (unknown [10.3.81.241]) by
|
||||
mail2-db3.bigfish.com (Postfix) with ESMTP id CEB76400A4; Thu, 12 Apr 2012
|
||||
16:34:39 +0000 (UTC)
|
||||
Original-Received: from ausb3twp01.amd.com (163.181.249.108) by
|
||||
DB3EHSMHS005.bigfish.com (10.3.87.105) with Microsoft SMTP Server id
|
||||
14.1.225.23; Thu, 12 Apr 2012 16:34:38 +0000
|
||||
X-WSS-ID: 0M2DKPO-01-CNU-02
|
||||
X-M-MSG:
|
||||
Original-Received: from sausexedgep02.amd.com (sausexedgep02-ext.amd.com
|
||||
[163.181.249.73]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No
|
||||
client certificate requested) by ausb3twp01.amd.com (Axway MailGate 3.8.1)
|
||||
with ESMTP id 2C1D81028100; Thu, 12 Apr 2012 11:34:36 -0500 (CDT)
|
||||
Original-Received: from SAUSEXDAG02.amd.com (163.181.55.2) by sausexedgep02.amd.com
|
||||
(163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.192.1; Thu, 12 Apr
|
||||
2012 11:34:51 -0500
|
||||
Original-Received: from storexhtp01.amd.com (172.24.4.3) by sausexdag02.amd.com
|
||||
(163.181.55.2) with Microsoft SMTP Server (TLS) id 14.1.323.3; Thu, 12 Apr
|
||||
2012 11:34:36 -0500
|
||||
Original-Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com
|
||||
(172.24.4.3) with Microsoft SMTP Server id 8.3.213.0; Thu, 12 Apr 2012
|
||||
12:34:35 -0400
|
||||
Original-Received: from aftab (aftab.osrc.amd.com [165.204.15.109]) by gwo.osrc.amd.com
|
||||
(Postfix) with ESMTP id D8E4C49C58B; Thu, 12 Apr 2012 17:34:33 +0100 (BST)
|
||||
Content-Disposition: inline
|
||||
In-Reply-To: <20120412162351.GJ24549@aftab>
|
||||
User-Agent: Mutt/1.5.21 (2010-09-15)
|
||||
X-OriginatorOrg: amd.com
|
||||
Original-Sender: linux-kernel-owner@vger.kernel.org
|
||||
Precedence: bulk
|
||||
List-ID: <linux-kernel.vger.kernel.org>
|
||||
X-Mailing-List: linux-kernel@vger.kernel.org
|
||||
Xref: news.gmane.org gmane.linux.kernel:1281050
|
||||
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1281050>
|
||||
|
||||
From: Andreas Herrmann <andreas.herrmann3@amd.com>
|
||||
Date: Thu, 12 Apr 2012 16:51:57 +0200
|
||||
Subject: [PATCH 2/2] x86, microcode: Ensure that module is only loaded for supported AMD CPUs
|
||||
|
||||
Exit early when there's no support for a particular CPU family. Also,
|
||||
fixup the "no support for this CPU vendor" to be issued only when the
|
||||
driver is attempted to be loaded on an unsupported vendor.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
|
||||
Cc: Borislav Petkov <borislav.petkov@amd.com>
|
||||
[Boris: added a commit msg because Andreas is lazy]
|
||||
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
|
||||
---
|
||||
arch/x86/kernel/microcode_amd.c | 12 +++++++-----
|
||||
arch/x86/kernel/microcode_core.c | 6 +++---
|
||||
2 files changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
|
||||
index 73465aa..8a2ce8f 100644
|
||||
--- a/arch/x86/kernel/microcode_amd.c
|
||||
+++ b/arch/x86/kernel/microcode_amd.c
|
||||
@@ -82,11 +82,6 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
|
||||
{
|
||||
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
||||
|
||||
- if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) {
|
||||
- pr_warning("CPU%d: family %d not supported\n", cpu, c->x86);
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
csig->rev = c->microcode;
|
||||
pr_info("CPU%d: patch_level=0x%08x\n", cpu, csig->rev);
|
||||
|
||||
@@ -380,6 +375,13 @@ static struct microcode_ops microcode_amd_ops = {
|
||||
|
||||
struct microcode_ops * __init init_amd_microcode(void)
|
||||
{
|
||||
+ struct cpuinfo_x86 *c = &cpu_data(0);
|
||||
+
|
||||
+ if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) {
|
||||
+ pr_warning("AMD CPU family 0x%x not supported\n", c->x86);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
patch = (void *)get_zeroed_page(GFP_KERNEL);
|
||||
if (!patch)
|
||||
return NULL;
|
||||
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
|
||||
index d389e74..c9bda6d 100644
|
||||
--- a/arch/x86/kernel/microcode_core.c
|
||||
+++ b/arch/x86/kernel/microcode_core.c
|
||||
@@ -526,11 +526,11 @@ static int __init microcode_init(void)
|
||||
microcode_ops = init_intel_microcode();
|
||||
else if (c->x86_vendor == X86_VENDOR_AMD)
|
||||
microcode_ops = init_amd_microcode();
|
||||
-
|
||||
- if (!microcode_ops) {
|
||||
+ else
|
||||
pr_err("no support for this CPU vendor\n");
|
||||
+
|
||||
+ if (!microcode_ops)
|
||||
return -ENODEV;
|
||||
- }
|
||||
|
||||
microcode_pdev = platform_device_register_simple("microcode", -1,
|
||||
NULL, 0);
|
||||
--
|
||||
1.7.8.4
|
||||
|
||||
--
|
||||
Regards/Gruss,
|
||||
Boris.
|
||||
|
||||
Advanced Micro Devices GmbH
|
||||
Einsteinring 24, 85609 Dornach
|
||||
GM: Alberto Bozzo
|
||||
Reg: Dornach, Landkreis Muenchen
|
||||
HRB Nr. 43632 WEEE Registernr: 129 19551
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
Path: news.gmane.org!not-for-mail
|
||||
From: Borislav Petkov <borislav.petkov@amd.com>
|
||||
Newsgroups: gmane.linux.kernel
|
||||
Subject: [PATCH 1/2] x86, microcode: Fix sysfs warning during module unload
|
||||
Date: Thu, 12 Apr 2012 18:30:38 +0200
|
||||
Lines: 83
|
||||
Approved: news@gmane.org
|
||||
Message-ID: <20120412163038.GL24549@aftab>
|
||||
References: <20120411163849.GE4794@alberich.amd.com>
|
||||
<20120411200601.GC12288@kroah.com>
|
||||
<20120411201053.GF18114@aftab>
|
||||
<20120412162351.GJ24549@aftab>
|
||||
NNTP-Posting-Host: plane.gmane.org
|
||||
Mime-Version: 1.0
|
||||
Content-Type: text/plain; charset="us-ascii"
|
||||
X-Trace: dough.gmane.org 1334248312 13759 80.91.229.3 (12 Apr 2012 16:31:52 GMT)
|
||||
X-Complaints-To: usenet@dough.gmane.org
|
||||
NNTP-Posting-Date: Thu, 12 Apr 2012 16:31:52 +0000 (UTC)
|
||||
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>,
|
||||
Kay Sievers <kay.sievers@vrfy.org>,
|
||||
Dave Jones <davej@redhat.com>, <linux-kernel@vger.kernel.org>
|
||||
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Original-X-From: linux-kernel-owner@vger.kernel.org Thu Apr 12 18:31:50 2012
|
||||
Return-path: <linux-kernel-owner@vger.kernel.org>
|
||||
Envelope-to: glk-linux-kernel-3@plane.gmane.org
|
||||
Original-Received: from vger.kernel.org ([209.132.180.67])
|
||||
by plane.gmane.org with esmtp (Exim 4.69)
|
||||
(envelope-from <linux-kernel-owner@vger.kernel.org>)
|
||||
id 1SIMw1-0005nm-KE
|
||||
for glk-linux-kernel-3@plane.gmane.org; Thu, 12 Apr 2012 18:31:49 +0200
|
||||
Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||
id S934534Ab2DLQbF (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
|
||||
Thu, 12 Apr 2012 12:31:05 -0400
|
||||
Original-Received: from db3ehsobe004.messaging.microsoft.com ([213.199.154.142]:35401
|
||||
"EHLO db3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK)
|
||||
by vger.kernel.org with ESMTP id S934436Ab2DLQbD (ORCPT
|
||||
<rfc822;linux-kernel@vger.kernel.org>);
|
||||
Thu, 12 Apr 2012 12:31:03 -0400
|
||||
Original-Received: from mail117-db3-R.bigfish.com (10.3.81.240) by
|
||||
DB3EHSOBE002.bigfish.com (10.3.84.22) with Microsoft SMTP Server id
|
||||
14.1.225.23; Thu, 12 Apr 2012 16:31:00 +0000
|
||||
Original-Received: from mail117-db3 (localhost [127.0.0.1]) by
|
||||
mail117-db3-R.bigfish.com (Postfix) with ESMTP id BAA93180481; Thu, 12 Apr
|
||||
2012 16:31:00 +0000 (UTC)
|
||||
X-SpamScore: 1
|
||||
X-BigFish: VPS1(zzzz1202hzz8275eh8275bh8275dha1495iz2dh668h839h944hd25hd2bh)
|
||||
X-Forefront-Antispam-Report: CIP:163.181.249.109;KIP:(null);UIP:(null);IPV:NLI;H:ausb3twp02.amd.com;RD:none;EFVD:NLI
|
||||
Original-Received: from mail117-db3 (localhost.localdomain [127.0.0.1]) by mail117-db3
|
||||
(MessageSwitch) id 133424825930391_28243; Thu, 12 Apr 2012 16:30:59 +0000
|
||||
(UTC)
|
||||
Original-Received: from DB3EHSMHS006.bigfish.com (unknown [10.3.81.226]) by
|
||||
mail117-db3.bigfish.com (Postfix) with ESMTP id ED7022E004F; Thu, 12 Apr 2012
|
||||
16:30:58 +0000 (UTC)
|
||||
Original-Received: from ausb3twp02.amd.com (163.181.249.109) by
|
||||
DB3EHSMHS006.bigfish.com (10.3.87.106) with Microsoft SMTP Server id
|
||||
14.1.225.23; Thu, 12 Apr 2012 16:30:57 +0000
|
||||
X-WSS-ID: 0M2DKJG-02-0NU-02
|
||||
X-M-MSG:
|
||||
Original-Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com
|
||||
[163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No
|
||||
client certificate requested) by ausb3twp02.amd.com (Axway MailGate 3.8.1)
|
||||
with ESMTP id 21D3FC814C; Thu, 12 Apr 2012 11:30:50 -0500 (CDT)
|
||||
Original-Received: from SAUSEXDAG01.amd.com (163.181.55.1) by sausexedgep01.amd.com
|
||||
(163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.192.1; Thu, 12 Apr
|
||||
2012 11:31:09 -0500
|
||||
Original-Received: from storexhtp02.amd.com (172.24.4.4) by sausexdag01.amd.com
|
||||
(163.181.55.1) with Microsoft SMTP Server (TLS) id 14.1.323.3; Thu, 12 Apr
|
||||
2012 11:30:54 -0500
|
||||
Original-Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp02.amd.com
|
||||
(172.24.4.4) with Microsoft SMTP Server id 8.3.213.0; Thu, 12 Apr 2012
|
||||
12:30:51 -0400
|
||||
Original-Received: from aftab (aftab.osrc.amd.com [165.204.15.109]) by gwo.osrc.amd.com
|
||||
(Postfix) with ESMTP id 0D00D49C58B; Thu, 12 Apr 2012 17:30:50 +0100 (BST)
|
||||
Content-Disposition: inline
|
||||
In-Reply-To: <20120412162351.GJ24549@aftab>
|
||||
User-Agent: Mutt/1.5.21 (2010-09-15)
|
||||
X-OriginatorOrg: amd.com
|
||||
Original-Sender: linux-kernel-owner@vger.kernel.org
|
||||
Precedence: bulk
|
||||
List-ID: <linux-kernel.vger.kernel.org>
|
||||
X-Mailing-List: linux-kernel@vger.kernel.org
|
||||
Xref: news.gmane.org gmane.linux.kernel:1281049
|
||||
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1281049>
|
||||
|
||||
From: Andreas Herrmann <andreas.herrmann3@amd.com>
|
||||
Date: Thu, 12 Apr 2012 16:48:01 +0200
|
||||
Subject: [PATCH 1/2] x86, microcode: Fix sysfs warning during module unload on unsupported CPUs
|
||||
|
||||
Loading microcode driver on an unsupported CPU and subsequently
|
||||
unloading the driver causes
|
||||
|
||||
WARNING: at fs/sysfs/group.c:138 mc_device_remove+0x5f/0x70 [microcode]()
|
||||
Hardware name: 01972NG
|
||||
sysfs group ffffffffa00013d0 not found for kobject 'cpu0'
|
||||
Modules linked in: snd_hda_codec_hdmi snd_hda_codec_conexant snd_hda_intel btusb snd_hda_codec bluetooth thinkpad_acpi rfkill microcode(-) [last unloaded: cfg80211]
|
||||
Pid: 4560, comm: modprobe Not tainted 3.4.0-rc2-00002-g258f742 #5
|
||||
Call Trace:
|
||||
[<ffffffff8103113b>] ? warn_slowpath_common+0x7b/0xc0
|
||||
[<ffffffff81031235>] ? warn_slowpath_fmt+0x45/0x50
|
||||
[<ffffffff81120e74>] ? sysfs_remove_group+0x34/0x120
|
||||
[<ffffffffa00000ef>] ? mc_device_remove+0x5f/0x70 [microcode]
|
||||
[<ffffffff81331eb9>] ? subsys_interface_unregister+0x69/0xa0
|
||||
[<ffffffff81563526>] ? mutex_lock+0x16/0x40
|
||||
[<ffffffffa0000c3e>] ? microcode_exit+0x50/0x92 [microcode]
|
||||
[<ffffffff8107051d>] ? sys_delete_module+0x16d/0x260
|
||||
[<ffffffff810a0065>] ? wait_iff_congested+0x45/0x110
|
||||
[<ffffffff815656af>] ? page_fault+0x1f/0x30
|
||||
[<ffffffff81565ba2>] ? system_call_fastpath+0x16/0x1b
|
||||
|
||||
on recent kernels.
|
||||
|
||||
This is due to
|
||||
|
||||
commit 8a25a2fd126c621f44f3aeaef80d51f00fc11639
|
||||
(cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular
|
||||
subsystem)
|
||||
|
||||
which renders
|
||||
|
||||
commit 6c53cbfced048c421e4f72cb2183465f68fbc5e7
|
||||
(x86, microcode: Correct sysdev_add error path)
|
||||
|
||||
useless.
|
||||
|
||||
See http://marc.info/?l=linux-kernel&m=133416246406478
|
||||
|
||||
Avoid above warning by restoring the old driver behaviour before
|
||||
commit 6c53cbfced048c421e4f72cb2183465f68fbc5e7 (x86, microcode:
|
||||
Correct sysdev_add error path)
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
|
||||
Cc: Borislav Petkov <borislav.petkov@amd.com>
|
||||
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
|
||||
---
|
||||
arch/x86/kernel/microcode_core.c | 4 +---
|
||||
1 files changed, 1 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
|
||||
index 87a0f86..d389e74 100644
|
||||
--- a/arch/x86/kernel/microcode_core.c
|
||||
+++ b/arch/x86/kernel/microcode_core.c
|
||||
@@ -419,10 +419,8 @@ static int mc_device_add(struct device *dev, struct subsys_interface *sif)
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
- if (microcode_init_cpu(cpu) == UCODE_ERROR) {
|
||||
- sysfs_remove_group(&dev->kobj, &mc_attr_group);
|
||||
+ if (microcode_init_cpu(cpu) == UCODE_ERROR)
|
||||
return -EINVAL;
|
||||
- }
|
||||
|
||||
return err;
|
||||
}
|
||||
--
|
||||
1.7.8.4
|
||||
|
||||
--
|
||||
Regards/Gruss,
|
||||
Boris.
|
||||
|
||||
Advanced Micro Devices GmbH
|
||||
Einsteinring 24, 85609 Dornach
|
||||
GM: Alberto Bozzo
|
||||
Reg: Dornach, Landkreis Muenchen
|
||||
HRB Nr. 43632 WEEE Registernr: 129 19551
|
||||
|
Loading…
Reference in New Issue