From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 12 May 2016 01:27:18 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
X-Git-Tag: firefly_0821_release~176^2~404
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=334ca3ed18ded942e0220719f70b80eb20fa48ec;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
---

334ca3ed18ded942e0220719f70b80eb20fa48ec
diff --cc arch/arm64/Makefile
index 285b32fa41c1,304dcc3da06f..14c74a66c58e
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -27,8 -31,8 +31,9 @@@ $(warning LSE atomics not supported by 
  endif
  
  KBUILD_CFLAGS	+= -mgeneral-regs-only $(lseinstr)
 +KBUILD_CFLAGS	+= -fno-pic
  KBUILD_CFLAGS	+= $(call cc-option, -mpc-relative-literal-loads)
+ KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables
  KBUILD_AFLAGS	+= $(lseinstr)
  
  ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)
diff --cc mm/memcontrol.c
index 7535ef32a75b,6ba4dd988e2e..d1f6dc5a715d
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -5267,8 -5259,7 +5268,9 @@@ struct cgroup_subsys memory_cgrp_subsy
  	.css_reset = mem_cgroup_css_reset,
  	.can_attach = mem_cgroup_can_attach,
  	.cancel_attach = mem_cgroup_cancel_attach,
 +	.attach = mem_cgroup_move_task,
 +	.allow_attach = mem_cgroup_allow_attach,
+ 	.post_attach = mem_cgroup_move_task,
  	.bind = mem_cgroup_bind,
  	.dfl_cftypes = memory_files,
  	.legacy_cftypes = mem_cgroup_legacy_files,