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

Commit 59fc7046 authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

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

Change-Id: I8c5ec371d8b612f6880b2428893bec89d7da71f6
parents b8fa4a3e 4a8b645c

Documentation/cgroups/cgroups.txt

+0 −9
Original line number Diff line number Diff line
@@ -578,15 +578,6 @@ is completely unused; @cgrp->parent is still valid. (Note - can also 
be called for a newly-created cgroup if an error occurs after this

subsystem's create() method has been called for the new cgroup).



int allow_attach(struct cgroup *cgrp, struct cgroup_taskset *tset)

(cgroup_mutex held by caller)



Called prior to moving a task into a cgroup; if the subsystem

returns an error, this will abort the attach operation.  Used

to extend the permission checks - if all subsystems in a cgroup

return 0, the attach will be allowed to proceed, even if the

default permission check (root or same user) fails.



int can_attach(struct cgroup *cgrp, struct cgroup_taskset *tset)

(cgroup_mutex held by caller)

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ config RANDOMIZE_BASE 


config RANDOMIZE_MODULE_REGION_FULL

	bool "Randomize the module region independently from the core kernel"

	depends on RANDOMIZE_BASE

	depends on RANDOMIZE_BASE && !DYNAMIC_FTRACE

	default y

	help

	  Randomizes the location of the module region without considering the

arch/arm64/include/asm/module.h

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define __ASM_MODULE_H



#include <asm-generic/module.h>

#include <asm/memory.h>



#define MODULE_ARCH_VERMAGIC	"aarch64"
@@ -32,6 +33,10 @@ u64 module_emit_plt_entry(struct module *mod, const Elf64_Rela *rela, 
			  Elf64_Sym *sym);



#ifdef CONFIG_RANDOMIZE_BASE

#ifdef CONFIG_MODVERSIONS

#define ARCH_RELOCATES_KCRCTAB

#define reloc_start 		(kimage_vaddr - KIMAGE_VADDR)

#endif

extern u64 module_alloc_base;

#else

#define module_alloc_base	((u64)_etext - MODULES_VSIZE)

include/linux/cgroup-defs.h

+0 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ struct cgroup_subsys { 
	void (*css_reset)(struct cgroup_subsys_state *css);

	void (*css_e_css_changed)(struct cgroup_subsys_state *css);



	int (*allow_attach)(struct cgroup_taskset *tset);

	int (*can_attach)(struct cgroup_taskset *tset);

	void (*cancel_attach)(struct cgroup_taskset *tset);

	void (*attach)(struct cgroup_taskset *tset);

include/linux/cgroup.h

+0 −14
Original line number Diff line number Diff line
@@ -528,16 +528,6 @@ static inline void pr_cont_cgroup_path(struct cgroup *cgrp) 
	pr_cont_kernfs_path(cgrp->kn);

}



/*

 * Default Android check for whether the current process is allowed to move a

 * task across cgroups, either because CAP_SYS_NICE is set or because the uid

 * of the calling process is the same as the moved task or because we are

 * running as root.

 * Returns 0 if this is allowed, or -EACCES otherwise.

 */

int subsys_cgroup_allow_attach(struct cgroup_taskset *tset);





#else /* !CONFIG_CGROUPS */



struct cgroup_subsys_state;
@@ -562,10 +552,6 @@ static inline void cgroup_free(struct task_struct *p) {} 
static inline int cgroup_init_early(void) { return 0; }

static inline int cgroup_init(void) { return 0; }



static inline int subsys_cgroup_allow_attach(void *tset)

{

	return -EINVAL;

}

#endif /* !CONFIG_CGROUPS */



#endif /* _LINUX_CGROUP_H */