projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'rk_develop-3.10' into rk_develop-3.10-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
setup.c
diff --git
a/arch/arm/kernel/setup.c
b/arch/arm/kernel/setup.c
index 29beb8c76560ff3e706f0770877257501efb690c..e0ae7b52f4f0d8aa95dc04e65b0df7b4994b24e7 100644
(file)
--- a/
arch/arm/kernel/setup.c
+++ b/
arch/arm/kernel/setup.c
@@
-925,6
+925,10
@@
static int c_show(struct seq_file *m, void *v)
int i, j;
u32 cpuid;
+#ifdef CONFIG_ARCH_ROCKCHIP
+ seq_printf(m, "Processor\t: %s rev %d (%s)\n",
+ cpu_name, read_cpuid_id() & 15, elf_platform);
+#endif
for_each_online_cpu(i) {
/*
* glibc reads /proc/cpuinfo to determine the number of