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

Commit 3ac2d19f authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.9.106 (8b94b87f) into msm-4.9 



* refs/heads/tmp-8b94b87f:
  Revert "ANDROID: sched/walt: Fix compilation issue for x86_64"
  Linux 4.9.106
  objtool: Enclose contents of unreachable() macro in a block
  x86/xen: Add unwind hint annotations to xen_setup_gdt
  objtool: header file sync-up
  perf/tools: header file sync up
  objtool, x86: Add several functions and files to the objtool whitelist
  objtool: Fix "noreturn" detection for recursive sibling calls
  objtool: Detect RIP-relative switch table references, part 2
  objtool: Detect RIP-relative switch table references
  objtool: Support GCC 8 switch tables
  objtool: Support GCC 8's cold subfunctions
  objtool: sync up with the 4.14.47 version of objtool
  tools include: Include missing headers for fls() and types in linux/log2.h
  tools include: Drop ARRAY_SIZE() definition from linux/hashtable.h
  tools include: Move ARRAY_SIZE() to linux/kernel.h
  tools include: Adopt __same_type() and __must_be_array() from the kernel
  tools include: Introduce linux/bug.h, from the kernel sources
  tools include uapi: Grab copies of stat.h and fcntl.h
  perf tools: Move headers check into bash script
  perf tools: Force fixdep compilation at the start of the build
  tools include: Adopt kernel's refcount.h
  tools include: Add UINT_MAX def to kernel.h
  tools include: Introduce atomic_cmpxchg_{relaxed,release}()
  tools include: Adopt __compiletime_error
  radix tree test suite: Remove types.h
  tools include: Introduce linux/compiler-gcc.h
  tools: enable endian checks for all sparse builds
  tools: add more bitmap functions
  tools lib: Add for_each_clear_bit macro
  objtool: Move checking code to check.c
  objtool: Improve detection of BUG() and other dead ends
  ANDROID: add extra free kbytes tunable
  Revert "ANDROID: check dir value of xfrm_userpolicy_id"
  ANDROID: x86_64_cuttlefish_defconfig: Enable F2FS
  ANDROID: Update x86_64_cuttlefish_defconfig
  ANDROID: sched/walt: Fix compilation issue for x86_64
  Revert "pinctrl: msm: Use dynamic GPIO numbering"
  FROMLIST: f2fs: early updates queued for v4.18-rc1

Conflicts:
	mm/page_alloc.c

Change-Id: I727f564b322df146539af2ab318a68900e2ce12b
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 40834dd0 2d51c1e9

Documentation/ABI/testing/sysfs-fs-f2fs

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ Date: February 2015 
Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

		 Controls the trimming rate in batch mode.

		 <deprecated>



What:		/sys/fs/f2fs/<disk>/cp_interval

Date:		October 2015

Documentation/filesystems/f2fs.txt

+9 −7
Original line number Diff line number Diff line
@@ -179,13 +179,15 @@ whint_mode=%s Control which write hints are passed down to block 
                       passes down hints with its policy.

alloc_mode=%s          Adjust block allocation policy, which supports "reuse"

                       and "default".

fsync_mode=%s          Control the policy of fsync. Currently supports "posix"

                       and "strict". In "posix" mode, which is default, fsync

                       will follow POSIX semantics and does a light operation

                       to improve the filesystem performance. In "strict" mode,

                       fsync will be heavy and behaves in line with xfs, ext4

                       and btrfs, where xfstest generic/342 will pass, but the

                       performance will regress.

fsync_mode=%s          Control the policy of fsync. Currently supports "posix",

                       "strict", and "nobarrier". In "posix" mode, which is

                       default, fsync will follow POSIX semantics and does a

                       light operation to improve the filesystem performance.

                       In "strict" mode, fsync will be heavy and behaves in line

                       with xfs, ext4 and btrfs, where xfstest generic/342 will

                       pass, but the performance will regress. "nobarrier" is

                       based on "posix", but doesn't issue flush command for

                       non-atomic files likewise "nobarrier" mount option.

test_dummy_encryption  Enable dummy encryption, which provides a fake fscrypt

                       context. The fake fscrypt context is used by xfstests.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 105

SUBLEVEL = 106

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/configs/x86_64_cuttlefish_defconfig

+13 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ CONFIG_TASK_IO_ACCOUNTING=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_DEBUG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y
@@ -60,6 +61,7 @@ CONFIG_RANDOMIZE_BASE=y 
CONFIG_PHYSICAL_ALIGN=0x1000000

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttyS0 reboot=p nopti"

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set
@@ -92,8 +94,8 @@ CONFIG_IP_MROUTE=y 
CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

CONFIG_INET_DIAG_DESTROY=y

CONFIG_TCP_CONG_ADVANCED=y
@@ -108,6 +110,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETLABEL=y

CONFIG_NETFILTER=y
@@ -137,6 +140,7 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=y 
CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

CONFIG_NETFILTER_XT_MATCH_BPF=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -311,11 +315,11 @@ CONFIG_MEDIA_SUPPORT=y 
CONFIG_DRM=y

# CONFIG_DRM_FBDEV_EMULATION is not set

CONFIG_DRM_VIRTIO_GPU=y

CONFIG_FB=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_HIDRAW=y

CONFIG_UHID=y

# CONFIG_HID_GENERIC is not set

CONFIG_HID_A4TECH=y

CONFIG_HID_ACRUX=y

CONFIG_HID_ACRUX_FF=y
@@ -379,6 +383,8 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_DUMMY_HCD=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y
@@ -403,6 +409,9 @@ CONFIG_EXT4_FS=y 
CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -436,11 +445,11 @@ CONFIG_DEBUG_MEMORY_INIT=y 
CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_PANIC_TIMEOUT=5

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_ENABLE_DEFAULT_TRACERS=y

CONFIG_UPROBE_EVENT=y

CONFIG_IO_DELAY_NONE=y

CONFIG_DEBUG_BOOT_PARAMS=y

CONFIG_OPTIMIZE_INLINING=y
@@ -452,3 +461,4 @@ CONFIG_HARDENED_USERCOPY=y 
CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_SHA512=y

arch/x86/crypto/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Arch-specific CryptoAPI modules.

#



OBJECT_FILES_NON_STANDARD := y



avx_supported := $(call as-instr,vpxor %xmm0$(comma)%xmm0$(comma)%xmm0,yes,no)

avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

				$(comma)4)$(comma)%ymm2,yes,no)