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

Commit a979feb9 authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge remote-tracking branch 'common/android-4.4' into android-4.4.y

parents f8c11676 b6be9b7b

android/configs/android-recommended.cfg

+1 −0
Original line number Diff line number Diff line 
#  KEEP ALPHABETICALLY SORTED

# CONFIG_AIO is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_LEGACY_PTYS is not set

kernel/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -2686,7 +2686,7 @@ static int cgroup_procs_write_permission(struct task_struct *task, 
	if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) &&

	    !uid_eq(cred->euid, tcred->uid) &&

	    !uid_eq(cred->euid, tcred->suid) &&

	    !ns_capable(tcred->user_ns, CAP_SYS_NICE))

	    !ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))

		ret = -EACCES;



	if (!ret && cgroup_on_dfl(dst_cgrp)) {

kernel/cpu.c

+9 −2
Original line number Diff line number Diff line
@@ -185,10 +185,17 @@ void cpu_hotplug_disable(void) 
}

EXPORT_SYMBOL_GPL(cpu_hotplug_disable);



static void __cpu_hotplug_enable(void)

{

	if (WARN_ONCE(!cpu_hotplug_disabled, "Unbalanced cpu hotplug enable\n"))

		return;

	cpu_hotplug_disabled--;

}



void cpu_hotplug_enable(void)

{

	cpu_maps_update_begin();

	WARN_ON(--cpu_hotplug_disabled < 0);

	__cpu_hotplug_enable();

	cpu_maps_update_done();

}

EXPORT_SYMBOL_GPL(cpu_hotplug_enable);
@@ -631,7 +638,7 @@ void enable_nonboot_cpus(void) 


	/* Allow everyone to use the CPU hotplug again */

	cpu_maps_update_begin();

	WARN_ON(--cpu_hotplug_disabled < 0);

	__cpu_hotplug_enable();

	if (cpumask_empty(frozen_cpus))

		goto out;