diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-02-08 11:43:24 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-02-08 11:43:24 +0000 |
commit | 90a81e9d0b2d35b7293091318729118974f66004 (patch) | |
tree | 8063f7f7abf114ced819cdd2500abfeed26b03d3 | |
parent | 5ae9d019829980d9398cdb9d4af5eb06923f9bdc (diff) |
[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
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.28/020-mips_multi_machine_support.patch | 24 |
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 4e783ff8c..af5511061 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", |