Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc3f3783 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge dce57d81 on remote branch 

Change-Id: Ie530df131ba141460eec1fe4bf1413737dd25431
parents 560a64ff dce57d81

drivers/staging/android/lowmemorykiller.c

+1 −1
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc) 
		}



		task_lock(selected);

		get_task_struct(selected);

		send_sig(SIGKILL, selected, 0);

		/*

		 * FIXME: lowmemorykiller shouldn't abuse global OOM killer
@@ -713,7 +714,6 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc) 
		lowmem_deathpending_timeout = jiffies + HZ;

		rem += selected_tasksize;

		rcu_read_unlock();

		get_task_struct(selected);

		/* give the system time to free up the memory */

		msleep_interruptible(20);

		trace_almk_shrink(selected_tasksize, ret,

sound/soc/msm/msm8998.c

+9 −0
Original line number Diff line number Diff line
@@ -6260,6 +6260,15 @@ static int msm8998_tdm_snd_hw_params(struct snd_pcm_substream *substream, 
				slot_width, slots, tdm_interface);

	pr_debug("%s: slot_mask :%x\n", __func__, slot_mask);



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		/* over write slot-mask if configured for full slots */

		if ((slots == 32) && (slot_width == 16))

			slot_mask = 0xffffffff;

		else if ((slots == 16) && (slot_width == 32))

			slot_mask = 0xffff;

		pr_debug("%s:slot_mask :%x slots %d slot_width %d\n", __func__,

					slot_mask, slots, slot_width);

	}

	if (!slot_mask) {

		pr_err("%s: invalid slot_mask 0x%x\n",

			__func__, slot_mask);

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+4 −0
Original line number Diff line number Diff line
@@ -1571,6 +1571,10 @@ int msm_pcm_routing_reg_phy_stream(int fedai_id, int perf_mode, 
	/* re-enable EQ if active */

	msm_qti_pp_send_eq_values(fedai_id);

	for (i = 0; i < MSM_BACKEND_DAI_MAX; i++) {









		if (test_bit(fedai_id, &msm_bedais[i].fe_sessions[0]))









			msm_bedais[i].passthr_mode[fedai_id] = LEGACY_PCM;

















		if (!is_be_dai_extproc(i) &&









		   (afe_get_port_type(msm_bedais[i].port_id) == port_type) &&









		   (msm_bedais[i].active) &&