diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 51ca7b0e7b..ca46586b72 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -31,7 +31,7 @@ PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and PKG_LONGDESC="This package contains a precompiled kernel image and the modules." case "$LINUX" in hardkernel) - PKG_VERSION="b8b59bb" + PKG_VERSION="365fa20" PKG_URL="https://github.com/hardkernel/linux/archive/$PKG_VERSION.tar.gz" ;; amlogic-3.10) diff --git a/projects/Odroid_C2/linux/linux.aarch64.conf b/projects/Odroid_C2/linux/linux.aarch64.conf index 23878e6648..766bab9eec 100644 --- a/projects/Odroid_C2/linux/linux.aarch64.conf +++ b/projects/Odroid_C2/linux/linux.aarch64.conf @@ -77,7 +77,10 @@ CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_TASKSTATS is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y # # RCU Subsystem diff --git a/projects/Odroid_C2/patches/linux/linux-003-no_dev_console.patch b/projects/Odroid_C2/patches/linux/linux-003-no_dev_console.patch index df35a7ab9a..da6340f875 100644 --- a/projects/Odroid_C2/patches/linux/linux-003-no_dev_console.patch +++ b/projects/Odroid_C2/patches/linux/linux-003-no_dev_console.patch @@ -1,8 +1,7 @@ -diff --git a/init/main.c b/init/main.c -index 9484f4b..db55edd 100644 ---- a/init/main.c -+++ b/init/main.c -@@ -880,8 +880,14 @@ static noinline void __init kernel_init_freeable(void) +diff -Naur a/init/main.c b/init/main.c +--- a/init/main.c 2016-08-22 17:01:25.000000000 +0200 ++++ b/init/main.c 2016-08-22 17:09:48.000000000 +0200 +@@ -915,8 +915,14 @@ do_basic_setup(); /* Open the /dev/console on the rootfs, this should never fail */