aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-03-27 16:37:00 +0000
committerJon Medhurst <tixy@linaro.org>2015-05-29 09:29:01 +0100
commit6fc41aed294d4e67f4732d4b9c073fed18409985 (patch)
tree68d1ca064f04a9a6842341cfc7a6e88e87db3b59
parentfcc281e389644f27a65b7fc2aece827fb610cfcf (diff)
arm64: Add Hardware entry back to /proc/cpuinfo
Commit 72684eae7b0a ("arm64: Fix up /proc/cpuinfo") removed the Hardware entry from /proc/cpuinfo, however, Android parses /proc/cpuinfo to get the name of the hardware and uses this name to find the correct init files. As a consequence, Android won't boot without it. Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--arch/arm64/kernel/setup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 3d0b5a285061..2812c5a5540a 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -557,7 +557,9 @@ static int c_show(struct seq_file *m, void *v)
seq_printf(m, "CPU revision\t: %d\n\n", (midr & 0xf));
}
- return 0;
+ seq_printf(m, "Hardware\t: %s\n", machine_name);
+
+ return 0;
}
static void *c_start(struct seq_file *m, loff_t *pos)