aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-08 11:43:24 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-08 11:43:24 +0000
commit5af578a54c1e7e0b9cc1407d4c8ff742a93ff5cb (patch)
tree8063f7f7abf114ced819cdd2500abfeed26b03d3 /target
parent8fc1736f90a27450a1412738f78c0522c985afda (diff)
downloadupstream-5af578a54c1e7e0b9cc1407d4c8ff742a93ff5cb.tar.gz
upstream-5af578a54c1e7e0b9cc1407d4c8ff742a93ff5cb.tar.bz2
upstream-5af578a54c1e7e0b9cc1407d4c8ff742a93ff5cb.zip
[kernel] generic-2.6/2.6.28: show machine name in /proc/cpuinfo if CONFIG_MIPS_MACHINE is enabled
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14438 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/020-mips_multi_machine_support.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.28/020-mips_multi_machine_support.patch
index 4e783ff8c1..af55110617 100644
--- a/target/linux/generic-2.6/patches-2.6.28/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/020-mips_multi_machine_support.patch
@@ -131,3 +131,27 @@
config NO_IOPORT
def_bool n
+--- a/arch/mips/kernel/proc.c
++++ b/arch/mips/kernel/proc.c
+@@ -14,6 +14,7 @@
+ #include <asm/cpu-features.h>
+ #include <asm/mipsregs.h>
+ #include <asm/processor.h>
++#include <asm/mips_machine.h>
+
+ unsigned int vced_count, vcei_count;
+
+@@ -33,8 +34,12 @@ static int show_cpuinfo(struct seq_file
+ /*
+ * For the first processor also print the system type
+ */
+- if (n == 0)
++ if (n == 0) {
+ seq_printf(m, "system type\t\t: %s\n", get_system_type());
++#ifdef CONFIG_MIPS_MACHINE
++ seq_printf(m, "machine\t\t\t: %s\n", mips_machine_name);
++#endif
++ }
+
+ seq_printf(m, "processor\t\t: %ld\n", n);
+ sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",