diff --git a/Makefile b/Makefile old mode 100755 new mode 100644 index bd5806fce..e2a8fc2e6 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 79 +SUBLEVEL = 78 EXTRAVERSION = NAME = Shuffling Zombie Juror @@ -346,7 +346,7 @@ endif export COMPILER endif -# Look for make include files relative to root of kernel src7879 +# Look for make include files relative to root of kernel src MAKEFLAGS += --include-dir=$(srctree) # We need some generic definitions (do not try to remake the file). @@ -653,10 +653,6 @@ else KBUILD_CFLAGS += -O2 endif -KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) \ - $(call cc-disable-warning,unused-variable,) \ - $(call cc-disable-warning,unused-function) - # Tell gcc to never replace conditional load with a non-conditional one KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0) @@ -821,7 +817,7 @@ include $(srctree)/scripts/Makefile.extrawarn #Disable the whole of the following block to disable LKM AUTH ifeq ($(CONFIG_TIMA_LKMAUTH),y) ifeq ($(CONFIG_TIMA),y) - KBUILD_CFLAGS += -DTIMA_LKM_AUTH_ENABLED -Idrivers/gud/gud-exynos7880/MobiCoreDriver/mci/ + KBUILD_CFLAGS += -DTIMA_LKM_AUTH_ENABLED -Idrivers/gud/gud-exynos7870/MobiCoreDriver/mci/ KBUILD_AFLAGS += -DTIMA_LKM_AUTH_ENABLED endif endif diff --git a/alphabet/zip/A520x/META-INF/com/google/android/aroma/splash.png b/alphabet/zip/A520x/META-INF/com/google/android/aroma/splash.png old mode 100644 new mode 100755 diff --git a/alphabet/zip/A720x/META-INF/com/google/android/aroma-config b/alphabet/zip/A720x/META-INF/com/google/android/aroma-config index 1650f5238..13fd7e695 100644 --- a/alphabet/zip/A720x/META-INF/com/google/android/aroma-config +++ b/alphabet/zip/A720x/META-INF/com/google/android/aroma-config @@ -303,13 +303,11 @@ if (prop("alphabetkernel-restore.prop","install")=="0") then "", "scheduler-internal.prop", "scheduler-internal", "Select your IO Scheduler (Internal) (stock=cfq)", "", "group", - "bfq", "bfq", "", "select", "cfq", "cfq", "", "select.selected", "deadline", "deadline", "", "select", "fifo", "fifo", "", "select", "fiops", "fiops", "", "select", "noop", "noop", "", "select", - "row", "row", "", "select", "sio", "sio", "", "select", "sioplus", "sioplus", "", "select", "tripndroid", "tripndroid", "", "select", diff --git a/arch/arm64/configs/Alphabet_Kernel_a5y17lte_defconfig b/arch/arm64/configs/Alphabet_Kernel_a5y17lte_defconfig index 5b8d91d7b..9a49cca30 100644 --- a/arch/arm64/configs/Alphabet_Kernel_a5y17lte_defconfig +++ b/arch/arm64/configs/Alphabet_Kernel_a5y17lte_defconfig @@ -302,6 +302,7 @@ CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_TRIPNDROID is not set # CONFIG_DEFAULT_VR is not set # CONFIG_DEFAULT_ZEN is not set +# CONFIG_DEFAULT_ROW is not set CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y @@ -3459,7 +3460,7 @@ CONFIG_ASHMEM=y CONFIG_ANDROID_TIMED_OUTPUT=y CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y -# CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES is not set +CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y CONFIG_SEC_TIMEOUT_LOW_MEMORY_KILLER=y CONFIG_ANDROID_INTF_ALARM_DEV=y CONFIG_SYNC=y diff --git a/arch/arm64/configs/Alphabet_Kernel_a7y17lte_defconfig b/arch/arm64/configs/Alphabet_Kernel_a7y17lte_defconfig index 1f5da2949..61a9b89de 100755 --- a/arch/arm64/configs/Alphabet_Kernel_a7y17lte_defconfig +++ b/arch/arm64/configs/Alphabet_Kernel_a7y17lte_defconfig @@ -3459,7 +3459,7 @@ CONFIG_ASHMEM=y CONFIG_ANDROID_TIMED_OUTPUT=y CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y -# CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES is not set +CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y CONFIG_SEC_TIMEOUT_LOW_MEMORY_KILLER=y CONFIG_ANDROID_INTF_ALARM_DEV=y CONFIG_SYNC=y diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 613a6f5c1..92b608418 100755 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -15,6 +15,7 @@ #include #include #include +#include #ifdef CONFIG_SEC_PM_DEBUG #include #endif diff --git a/drivers/battery/sec_battery.c b/drivers/battery/sec_battery.c index 94ab9550d..7c8a17026 100755 --- a/drivers/battery/sec_battery.c +++ b/drivers/battery/sec_battery.c @@ -13,6 +13,10 @@ #ifdef CONFIG_CCIC_NOTIFIER #include #endif /* CONFIG_CCIC_NOTIFIER */ +#include + +static int wl_polling = 10; +module_param(wl_polling, int, 0644); bool sleep_mode = false; @@ -1046,7 +1050,7 @@ static bool sec_bat_ovp_uvlo_result( battery->health_check_count = DEFAULT_HEALTH_CHECK_COUNT; /* Take the wakelock during 10 seconds when over-voltage status is detected */ - wake_lock_timeout(&battery->vbus_wake_lock, HZ * 10); + wake_lock_timeout(&battery->vbus_wake_lock, HZ * wl_polling); break; } power_supply_changed(&battery->psy_bat); @@ -2555,7 +2559,7 @@ static void sec_bat_do_fullcharged( * activated wake lock in a few seconds */ if (battery->pdata->polling_type == SEC_BATTERY_MONITOR_ALARM) - wake_lock_timeout(&battery->vbus_wake_lock, HZ * 10); + wake_lock_timeout(&battery->vbus_wake_lock, HZ * wl_polling); } static bool sec_bat_fullcharged_check( @@ -3287,7 +3291,7 @@ static void sec_bat_fw_update_work(struct sec_battery_info *battery, int mode) dev_info(battery->dev, "%s \n", __func__); - wake_lock_timeout(&battery->vbus_wake_lock, HZ * 10); + wake_lock_timeout(&battery->vbus_wake_lock, HZ * wl_polling); switch (mode) { case SEC_WIRELESS_RX_SDCARD_MODE: @@ -3693,7 +3697,7 @@ static void sec_bat_cable_work(struct work_struct *work) * if cable is connected and disconnected, * activated wake lock in a few seconds */ - wake_lock_timeout(&battery->vbus_wake_lock, HZ * 10); + wake_lock_timeout(&battery->vbus_wake_lock, HZ * wl_polling); if (battery->cable_type == POWER_SUPPLY_TYPE_BATTERY || ((battery->pdata->cable_check_type & diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 23c5c4cb7..7ae379055 100755 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2729,7 +2729,6 @@ int mmc_pm_notify(struct notifier_block *notify_block, switch (mode) { case PM_HIBERNATION_PREPARE: case PM_SUSPEND_PREPARE: - case PM_RESTORE_PREPARE: spin_lock_irqsave(&host->lock, flags); if (mmc_bus_needs_resume(host)) { spin_unlock_irqrestore(&host->lock, flags); diff --git a/drivers/nfc/sec_nfc.c b/drivers/nfc/sec_nfc.c index 4a385800f..66612d7a0 100755 --- a/drivers/nfc/sec_nfc.c +++ b/drivers/nfc/sec_nfc.c @@ -67,6 +67,11 @@ struct sec_nfc_i2c_info {}; #include #include +#include + +static int wl_nfc = 2; +module_param(wl_nfc, int, 0644); + #define SEC_NFC_GET_INFO(dev) i2c_get_clientdata(to_i2c_client(dev)) enum sec_nfc_irq { SEC_NFC_NONE, @@ -140,7 +145,7 @@ static irqreturn_t sec_nfc_irq_thread_fn(int irq, void *dev_id) mutex_unlock(&info->i2c_info.read_mutex); wake_up_interruptible(&info->i2c_info.read_wait); - wake_lock_timeout(&info->nfc_wake_lock, 2*HZ); + wake_lock_timeout(&info->nfc_wake_lock, wl_nfc*HZ); return IRQ_HANDLED; } diff --git a/script.sh b/script.sh index c8190d7c2..5f9ab312e 100755 --- a/script.sh +++ b/script.sh @@ -12,4 +12,4 @@ make clean && make mrproper echo "Stock DEFCON" make Alphabet_Kernel_a7y17lte_defconfig #make Alphabet_Kernel_a5y17lte_defconfig -make -j3 \ No newline at end of file +make -j3 diff --git a/security/selinux_m/hooks.c b/security/selinux_m/hooks.c index cd1c05a10..80521e896 100755 --- a/security/selinux_m/hooks.c +++ b/security/selinux_m/hooks.c @@ -410,7 +410,6 @@ static int selinux_is_sblabel_mnt(struct super_block *sb) return sbsec->behavior == SECURITY_FS_USE_XATTR || sbsec->behavior == SECURITY_FS_USE_TRANS || sbsec->behavior == SECURITY_FS_USE_TASK || - sbsec->behavior == SECURITY_FS_USE_NATIVE || /* Special handling. Genfs but also in-core setxattr handler */ !strcmp(sb->s_type->name, "sysfs") || !strcmp(sb->s_type->name, "pstore") ||