From: Greg Kroah-Hartman Date: Tue, 24 Jun 2014 14:24:19 +0000 (-0400) Subject: 3.4-stable patches X-Git-Tag: v3.4.95~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f33bef1933ac74e35a58f673a40e7170e692a2d;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: alsa-hda-realtek-add-support-of-alc891-codec.patch --- diff --git a/queue-3.4/alsa-hda-realtek-add-support-of-alc891-codec.patch b/queue-3.4/alsa-hda-realtek-add-support-of-alc891-codec.patch new file mode 100644 index 00000000000..0217211a46c --- /dev/null +++ b/queue-3.4/alsa-hda-realtek-add-support-of-alc891-codec.patch @@ -0,0 +1,29 @@ +From b6c5fbad16aa5026f508093a8d651c25e1cb6179 Mon Sep 17 00:00:00 2001 +From: Kailang Yang +Date: Thu, 5 Jun 2014 11:13:44 +0800 +Subject: ALSA: hda/realtek - Add support of ALC891 codec + +From: Kailang Yang + +commit b6c5fbad16aa5026f508093a8d651c25e1cb6179 upstream. + +New codec support for ALC891. + +Signed-off-by: Kailang Yang +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -7062,6 +7062,7 @@ static const struct hda_codec_preset snd + { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 }, + { .id = 0x10ec0671, .name = "ALC671", .patch = patch_alc662 }, + { .id = 0x10ec0680, .name = "ALC680", .patch = patch_alc680 }, ++ { .id = 0x10ec0867, .name = "ALC891", .patch = patch_alc882 }, + { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 }, + { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 }, + { .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc882 }, diff --git a/queue-3.4/nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch b/queue-3.4/nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch index f6acc5f4ca8..c12c4d4c2fc 100644 --- a/queue-3.4/nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch +++ b/queue-3.4/nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch @@ -22,19 +22,21 @@ Signed-off-by: Thomas Gleixner Cc: Rui Xiang Signed-off-by: Greg Kroah-Hartman -diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c -index a12df5abde0b..ea20f7d1ac2c 100644 +--- + kernel/time/tick-sched.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c -@@ -711,8 +711,10 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts) - return false; +@@ -296,8 +296,10 @@ static void tick_nohz_stop_sched_tick(st + tick_do_timer_cpu = TICK_DO_TIMER_NONE; } - if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE)) + if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE)) { + ts->sleep_length = (ktime_t) { .tv64 = NSEC_PER_SEC/HZ }; - return false; + return; + } if (need_resched()) - return false; + return; diff --git a/queue-3.4/series b/queue-3.4/series index 4c5a2dfdec1..00441bad12c 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -15,3 +15,4 @@ usb-cdc-acm-fix-shutdown-and-suspend-race.patch usb-cdc-acm-fix-i-o-after-failed-open.patch usb-cdc-acm-fix-runtime-pm-imbalance-at-shutdown.patch nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch +alsa-hda-realtek-add-support-of-alc891-codec.patch