diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
commit | fafd883f671dfc1c2f62009179920f27abc784a1 (patch) | |
tree | 0eccb0baf343cad79a54e352598921db9ca17620 /arch/microblaze/kernel/cpu/cpuinfo.c | |
parent | 92519bbc8af612975410def52bd462ca9af85cdb (diff) | |
parent | d8b11a0cbd1c66ce283eb9dabe0498dfa6483f32 (diff) |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes before applying new patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/microblaze/kernel/cpu/cpuinfo.c')
-rw-r--r-- | arch/microblaze/kernel/cpu/cpuinfo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c index 410398f6db55..c9203b1007aa 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo.c +++ b/arch/microblaze/kernel/cpu/cpuinfo.c @@ -39,6 +39,8 @@ const struct cpu_ver_key cpu_ver_lookup[] = { {"8.30.a", 0x17}, {"8.40.a", 0x18}, {"8.40.b", 0x19}, + {"9.0", 0x1b}, + {"9.1", 0x1d}, {NULL, 0}, }; |