diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 464d0e429ff9..f54e732e6d97 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -634,7 +634,7 @@ static void debugfs_fair_server_init(void)
 }
 
 #ifdef CONFIG_FAIR_GROUP_SCHED
-static int cgroup_mode = 1;
+static int cgroup_mode = 2;
 
 /* See __sched_cgroup_mode_update(). */
 static const char *cgroup_mode_str[] = {
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 4a204eb4f9e6..1608c01c36fb 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4915,7 +4915,7 @@ static long calc_up_shares(struct cfs_rq *cfs_rq)
 	return READ_ONCE(tg->shares);
 }
 
-DEFINE_STATIC_CALL(calc_group_shares, calc_smp_shares);
+DEFINE_STATIC_CALL(calc_group_shares, calc_concur_shares);
 
 void __sched_cgroup_mode_update(int mode)
 {
@@ -4925,10 +4925,10 @@ void __sched_cgroup_mode_update(int mode)
 		func = &calc_up_shares;
 		break;
 	case 1:
-	default:
 		func = &calc_smp_shares;
 		break;
 	case 2:
+	default:
 		func = &calc_concur_shares;
 		break;
 	case 3: