diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 11:43:24 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 11:43:24 +0000 |
| commit | 407b0127c53b039bf05bd072e7f34f83d7d49e52 (patch) | |
| tree | 2c65308388f5a7948a91f0c0cfbfd84963d0be85 /target/linux/generic-2.6 | |
| parent | 6f1b4b4e437f4a26894df683f78753ce3f6820f5 (diff) | |
| download | upstream-407b0127c53b039bf05bd072e7f34f83d7d49e52.tar.gz upstream-407b0127c53b039bf05bd072e7f34f83d7d49e52.tar.bz2 upstream-407b0127c53b039bf05bd072e7f34f83d7d49e52.zip | |
generic-2.6/2.6.28: show machine name in /proc/cpuinfo if CONFIG_MIPS_MACHINE is enabled
SVN-Revision: 14438
Diffstat (limited to 'target/linux/generic-2.6')
| -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 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", |