Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

[deliverable/linux.git] / arch / sparc / kernel / cpumap.c

diff --git a/arch/sparc/kernel/cpumap.c b/arch/sparc/kernel/cpumap.c
index de1c844dfabc02569cfe71c91b3e52a9ea705ef4..e69ec0e3f15527705b3ce28fc89ff5c0341f03fb 100644 (file)
--- a/arch/sparc/kernel/cpumap.c
+++ b/arch/sparc/kernel/cpumap.c
@@ -326,6 +326,8 @@ static int iterate_cpu(struct cpuinfo_tree *t, unsigned int root_index)
        case SUN4V_CHIP_NIAGARA3:
        case SUN4V_CHIP_NIAGARA4:
        case SUN4V_CHIP_NIAGARA5:
+       case SUN4V_CHIP_SPARC_M6:
+       case SUN4V_CHIP_SPARC_M7:
        case SUN4V_CHIP_SPARC64X:
                rover_inc_table = niagara_iterate_method;
                break;