--- /dev/null
+From b6c5fbad16aa5026f508093a8d651c25e1cb6179 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Thu, 5 Jun 2014 11:13:44 +0800
+Subject: ALSA: hda/realtek - Add support of ALC891 codec
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit b6c5fbad16aa5026f508093a8d651c25e1cb6179 upstream.
+
+New codec support for ALC891.
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 },
Cc: Rui Xiang <rui.xiang@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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;