From bb8a553a6a0fc7454b91df2d1d2554231ed8c3d0 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Wed, 23 Nov 2016 15:37:55 -0500 Subject: [PATCH 1/3] fix cpuinfo patch from 4.7.x to 4.9.x --- .../add_proc_cpuinfo_entries_for_v4.9.x.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch diff --git a/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch b/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch new file mode 100644 index 0000000000..5e040e79fc --- /dev/null +++ b/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch @@ -0,0 +1,14 @@ +diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c +index b3d5b3e..7ca7dde 100644 +--- a/arch/arm64/kernel/cpuinfo.c ++++ b/arch/arm64/kernel/cpuinfo.c +@@ -118,6 +118,8 @@ static int c_show(struct seq_file *m, void *v) + * "processor". Give glibc what it expects. + */ + seq_printf(m, "processor\t: %d\n", i); ++ seq_printf(m, "Processor\t: AArch64 Processor rev %d (aarch64)\n", MIDR_REVISION(midr)); ++ seq_printf(m, "Hardware\t: sun50iw1p1\n"); + if (compat) + seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", + MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); + From 0ca97562ff08fb668737a18a9c1b9a2992654f55 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Wed, 23 Nov 2016 16:15:29 -0500 Subject: [PATCH 2/3] fix formatting in add_proc_cpuinfo_entries_for_v4.9.x.patch --- .../add_proc_cpuinfo_entries_for_v4.9.x.patch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch b/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch index 5e040e79fc..49338fb4bb 100644 --- a/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch +++ b/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.9.x.patch @@ -1,14 +1,13 @@ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index b3d5b3e..7ca7dde 100644 +index b3d5b3e..9520280 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -118,6 +118,8 @@ static int c_show(struct seq_file *m, void *v) - * "processor". Give glibc what it expects. - */ - seq_printf(m, "processor\t: %d\n", i); -+ seq_printf(m, "Processor\t: AArch64 Processor rev %d (aarch64)\n", MIDR_REVISION(midr)); -+ seq_printf(m, "Hardware\t: sun50iw1p1\n"); - if (compat) - seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", - MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); - + * "processor". Give glibc what it expects. + */ + seq_printf(m, "processor\t: %d\n", i); ++ seq_printf(m, "Processor\t: AArch64 Processor rev %d (aarch64)\n", MIDR_REVISION(midr)); ++ seq_printf(m, "Hardware\t: sun50iw1p1\n"); + if (compat) + seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", + MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); From de252ff7cd2c971f567319a08879bea924d7e357 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Wed, 23 Nov 2016 16:16:28 -0500 Subject: [PATCH 3/3] delete old add_proc_cpuinfo_entries_for_v4.7.x.patch.disabled --- ...d_proc_cpuinfo_entries_for_v4.7.x.patch.disabled | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.7.x.patch.disabled diff --git a/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.7.x.patch.disabled b/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.7.x.patch.disabled deleted file mode 100644 index 5c28e12adb..0000000000 --- a/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.7.x.patch.disabled +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 3808470..c929fc2 100644 ---- a/arch/arm64/kernel/cpuinfo.c -+++ b/arch/arm64/kernel/cpuinfo.c -@@ -115,6 +115,8 @@ static int c_show(struct seq_file *m, void *v) - * "processor". Give glibc what it expects. - */ - seq_printf(m, "processor\t: %d\n", i); -+ seq_printf(m, "Processor : AArch64 Processor rev %d (aarch64)\n", MIDR_REVISION(midr)); -+ seq_printf(m, "Hardware : sun50iw1p1\n"); - - seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", - loops_per_jiffy / (500000UL/HZ),