From 731d588d6286faccf664cea298f58a0955255781 Mon Sep 17 00:00:00 2001 From: Reiqu Date: Tue, 24 Jan 2017 13:36:22 +0000 Subject: [PATCH 1/5] adjustements for mer Change-Id: I43930edc9172d2becbfcb999c2939f1f2f78f7d1 --- .../configs/cyanogenmod_oneplus3_defconfig | 33 ++++++++++++++++++- kernel/configs/tiny.config | 1 + 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/cyanogenmod_oneplus3_defconfig b/arch/arm64/configs/cyanogenmod_oneplus3_defconfig index 3f40d5c8ed2e..0ddf74f195db 100644 --- a/arch/arm64/configs/cyanogenmod_oneplus3_defconfig +++ b/arch/arm64/configs/cyanogenmod_oneplus3_defconfig @@ -276,7 +276,7 @@ CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y CONFIG_NETDEVICES=y CONFIG_BONDING=y -CONFIG_DUMMY=y +CONFIG_DUMMY=n CONFIG_TUN=y CONFIG_RNDIS_IPA=y CONFIG_PPP=y @@ -705,3 +705,34 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_CRYPTO_CRC32_ARM64=y CONFIG_QMI_ENCDEC=y +#Anpassungen !!!!!! SINCE HERE CUSTOM FOR ONEPLUS 3 !!!!!!! +CONFIG_NETPRIO_CGROUP=y +CONFIG_BT_HCIUART_H4=y +CONFIG_CGROUP_DEVICE=y +CONFIG_DEVTMPFS=y +CONFIG_FHANDLE=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_SYSVIPC=y +CONFIG_FANOTIFY=y +CONFIG_AUTOFS4_FS=y +CONFIG_BT_HCIUART=y +CONFIG_BLK_CGROUP=y +CONFIG_NETFILTER_NETLINK_ACCT=y +CONFIG_SCHED_DEBUG=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y +CONFIG_HOTPLUG=y +CONFIG_LBDAF=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_NETFILTER_XT_MATCH_NFACCT=y +CONFIG_NET_CLS_CGROUP=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_RTC_DRV_CMOS=y +CONFIG_CGROUP_PERF=y +CONFIG_VT=y +#Tests +CONFIG_FW_LOADER_USER_HELPER=n +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_IKCONFIG_PROC=y +#Selinux +CONFIG_SECURITY_SELINUX_BOOTPARAM=y diff --git a/kernel/configs/tiny.config b/kernel/configs/tiny.config index c2de56ab0fce..68be5f7f8ecf 100644 --- a/kernel/configs/tiny.config +++ b/kernel/configs/tiny.config @@ -2,3 +2,4 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_KERNEL_XZ=y CONFIG_OPTIMIZE_INLINING=y CONFIG_SLOB=y + From 6eab5fdbc823163b7883f352e61d824a5ae6c609 Mon Sep 17 00:00:00 2001 From: Reiqu Date: Sun, 29 Jan 2017 21:13:07 +0000 Subject: [PATCH 2/5] Removing errors Change-Id: I4a3b4d84924ac4fb9c3a5f500658e1b9206fab8e --- arch/arm64/Kconfig | 6 ++++++ arch/arm64/configs/cyanogenmod_oneplus3_defconfig | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 67e90f86a2b6..313b7389e4f4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -323,6 +323,12 @@ source "drivers/pci/hotplug/Kconfig" endmenu menu "Kernel Features" +config CGGROUPS + default y +config LBDAF + default y +config WATCHDOG_NOWAYOUT + default y menu "ARM errata workarounds via the alternatives framework" diff --git a/arch/arm64/configs/cyanogenmod_oneplus3_defconfig b/arch/arm64/configs/cyanogenmod_oneplus3_defconfig index 0ddf74f195db..35cc90bbfc91 100644 --- a/arch/arm64/configs/cyanogenmod_oneplus3_defconfig +++ b/arch/arm64/configs/cyanogenmod_oneplus3_defconfig @@ -243,7 +243,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_RFKILL=y CONFIG_IPC_ROUTER=y CONFIG_IPC_ROUTER_SECURITY=y -CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=n CONFIG_DMA_CMA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y @@ -736,3 +736,15 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_IKCONFIG_PROC=y #Selinux CONFIG_SECURITY_SELINUX_BOOTPARAM=y +#TEST 2 +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_SCHED=y +CONFIG_BLK_CGROUP=y +CONFIG_NET_CLS_CGROUP=y +CONFIG_NETPRIO_CGROUP=y From 0dd33ec0b2fa5ac27adde0b3184a8069939c0f62 Mon Sep 17 00:00:00 2001 From: Nokius Date: Mon, 20 Feb 2017 16:09:55 +0000 Subject: [PATCH 3/5] fix oom Change-Id: Ibeed42aded89015ef9fe2ed82292768c23eefd68 --- fs/proc/base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index d0747bebd325..077550b2bd70 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2818,8 +2818,8 @@ static const struct pid_entry tgid_base_stuff[] = { ONE("cgroup", S_IRUGO, proc_cgroup_show), #endif ONE("oom_score", S_IRUGO, proc_oom_score), - REG("oom_adj", S_IRUSR, proc_oom_adj_operations), - REG("oom_score_adj", S_IRUSR, proc_oom_score_adj_operations), + REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations), + REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), REG("sessionid", S_IRUGO, proc_sessionid_operations), @@ -3203,8 +3203,8 @@ static const struct pid_entry tid_base_stuff[] = { ONE("cgroup", S_IRUGO, proc_cgroup_show), #endif ONE("oom_score", S_IRUGO, proc_oom_score), - REG("oom_adj", S_IRUSR, proc_oom_adj_operations), - REG("oom_score_adj", S_IRUSR, proc_oom_score_adj_operations), + REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations), + REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), REG("sessionid", S_IRUGO, proc_sessionid_operations), From 58ffe559e5eb6fd72590838f959f90fa25acc2ea Mon Sep 17 00:00:00 2001 From: Nokius Date: Mon, 20 Feb 2017 16:33:17 +0000 Subject: [PATCH 4/5] [defconfig] add porter findings Change-Id: I28cce59024bc8b129db40ac3394173c711bc41a1 --- arch/arm64/configs/cyanogenmod_oneplus3_defconfig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/cyanogenmod_oneplus3_defconfig b/arch/arm64/configs/cyanogenmod_oneplus3_defconfig index 35cc90bbfc91..9da1ee4dbf8c 100644 --- a/arch/arm64/configs/cyanogenmod_oneplus3_defconfig +++ b/arch/arm64/configs/cyanogenmod_oneplus3_defconfig @@ -321,7 +321,7 @@ CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y CONFIG_TRI_STATE_KEY=y CONFIG_FINGERPRINT_FPC1022=y -# CONFIG_VT is not set +CONFIG_VT=y # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVMEM is not set # CONFIG_DEVKMEM is not set @@ -545,6 +545,7 @@ CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ASHMEM=y +CONFIG_ANDROID_LOW_MEMORY_KILLER=n CONFIG_ANDROID_TIMED_GPIO=y CONFIG_SW_SYNC_USER=y CONFIG_ION=y @@ -666,7 +667,7 @@ CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_PANIC_TIMEOUT=5 CONFIG_PANIC_ON_RECURSIVE_FAULT=y -# CONFIG_SCHED_DEBUG is not set +CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set @@ -729,13 +730,14 @@ CONFIG_NET_CLS_CGROUP=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_RTC_DRV_CMOS=y CONFIG_CGROUP_PERF=y -CONFIG_VT=y #Tests CONFIG_FW_LOADER_USER_HELPER=n CONFIG_DEVTMPFS_MOUNT=y CONFIG_IKCONFIG_PROC=y #Selinux CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_SELINUX_DISABLE=y #TEST 2 CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y @@ -748,3 +750,4 @@ CONFIG_CGROUP_SCHED=y CONFIG_BLK_CGROUP=y CONFIG_NET_CLS_CGROUP=y CONFIG_NETPRIO_CGROUP=y +CONFIG_ANDROID_PARANOID_NETWORK=n From 16d8fa21c4b3e6f240d9262e022620cf4939f3c0 Mon Sep 17 00:00:00 2001 From: Adeen Shukla Date: Sat, 3 Jun 2017 07:46:37 +0000 Subject: [PATCH 5/5] Enable android paranoid network Change-Id: I74515dd9b1757140ab6a5b7ce433817e262586c5 --- arch/arm64/configs/cyanogenmod_oneplus3_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/cyanogenmod_oneplus3_defconfig b/arch/arm64/configs/cyanogenmod_oneplus3_defconfig index 9da1ee4dbf8c..5f3af3d5c15b 100644 --- a/arch/arm64/configs/cyanogenmod_oneplus3_defconfig +++ b/arch/arm64/configs/cyanogenmod_oneplus3_defconfig @@ -750,4 +750,4 @@ CONFIG_CGROUP_SCHED=y CONFIG_BLK_CGROUP=y CONFIG_NET_CLS_CGROUP=y CONFIG_NETPRIO_CGROUP=y -CONFIG_ANDROID_PARANOID_NETWORK=n +CONFIG_ANDROID_PARANOID_NETWORK=y