diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | arch/um/defconfig | 4 | ||||
| -rw-r--r-- | include/mach/mtk_rtc.h | 2 | ||||
| -rw-r--r-- | kernel/time/alarmtimer.c | 2 |
4 files changed, 16 insertions, 2 deletions
@@ -369,6 +369,7 @@ LINUXINCLUDE := \ KBUILD_CPPFLAGS := -D__KERNEL__ +ifdef CONFIG_ARM64 KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common \ -Werror-implicit-function-declaration \ @@ -378,6 +379,15 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -mtune=cortex-a53 \ -march=armv8-a \ -std=gnu89 +else +KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ + -fno-strict-aliasing -fno-common \ + -Werror-implicit-function-declaration \ + -Wno-format-security \ + -fno-delete-null-pointer-checks \ + -Werror=format -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast \ + -std=gnu89 +endif KBUILD_AFLAGS_KERNEL := KBUILD_CFLAGS_KERNEL := diff --git a/arch/um/defconfig b/arch/um/defconfig index 08107a795..9c68339c6 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig @@ -162,7 +162,7 @@ CONFIG_CGROUP_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y # CONFIG_CFS_BANDWIDTH is not set -# CONFIG_RT_GROUP_SCHED is not set +CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_CHECKPOINT_RESTORE is not set @@ -859,7 +859,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_LOCKUP_DETECTOR is not set # CONFIG_HARDLOCKUP_DETECTOR is not set # CONFIG_DETECT_HUNG_TASK is not set -CONFIG_SCHED_DEBUG=y +# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set diff --git a/include/mach/mtk_rtc.h b/include/mach/mtk_rtc.h index 555b47265..828c065fe 100644 --- a/include/mach/mtk_rtc.h +++ b/include/mach/mtk_rtc.h @@ -3,7 +3,9 @@ #include <linux/ioctl.h> #include <linux/rtc.h> +#ifdef CONFIG_ARM64 #include <mach/mt_typedefs.h> +#endif typedef enum { RTC_GPIO_USER_WIFI = 8, diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 834b01d28..f54a6597e 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -159,7 +159,9 @@ void alarm_set_power_on(struct timespec new_pwron_time, bool logo) now = rtc_tm_to_ktime(alm.time); rtc_timer_start(alarm_rtc_dev, &rtctimer, now, ktime_set(0, 0)); */ +#ifdef CONFIG_ARM64 rtc_timer_cancel(alarm_rtc_dev, &rtctimer); +#endif rtc_set_alarm(alarm_rtc_dev, &alm); rtc_set_alarm_poweron(alarm_rtc_dev, &alm); } |