Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9236b4dd authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: get rid of CONFIG_SCHED_MC and CONFIG_SCHED_BOOK



Use CONFIG_TOPOLOGY which selects CONFIG_SCHED_* all over the place to
reduce the random usage of the previous config options.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c095a949
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -389,9 +389,6 @@ config HOTPLUG_CPU
	  can be controlled through /sys/devices/system/cpu/cpu#.
	  can be controlled through /sys/devices/system/cpu/cpu#.
	  Say N if you want to disable CPU hotplug.
	  Say N if you want to disable CPU hotplug.


config SCHED_SMT
	def_bool n

# Some NUMA nodes have memory ranges that span
# Some NUMA nodes have memory ranges that span
# other nodes.	Even though a pfn is valid and
# other nodes.	Even though a pfn is valid and
# between a node's start and end pfns, it may not
# between a node's start and end pfns, it may not
@@ -462,6 +459,9 @@ config EMU_SIZE


endmenu
endmenu


config SCHED_SMT
	def_bool n

config SCHED_MC
config SCHED_MC
	def_bool n
	def_bool n


+3 −3
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@
struct sysinfo_15_1_x;
struct sysinfo_15_1_x;
struct cpu;
struct cpu;


#ifdef CONFIG_SCHED_BOOK
#ifdef CONFIG_SCHED_TOPOLOGY


struct cpu_topology_s390 {
struct cpu_topology_s390 {
	unsigned short thread_id;
	unsigned short thread_id;
@@ -40,13 +40,13 @@ void store_topology(struct sysinfo_15_1_x *info);
void topology_expect_change(void);
void topology_expect_change(void);
const struct cpumask *cpu_coregroup_mask(int cpu);
const struct cpumask *cpu_coregroup_mask(int cpu);


#else /* CONFIG_SCHED_BOOK */
#else /* CONFIG_SCHED_TOPOLOGY */


static inline void topology_schedule_update(void) { }
static inline void topology_schedule_update(void) { }
static inline int topology_cpu_init(struct cpu *cpu) { return 0; }
static inline int topology_cpu_init(struct cpu *cpu) { return 0; }
static inline void topology_expect_change(void) { }
static inline void topology_expect_change(void) { }


#endif /* CONFIG_SCHED_BOOK */
#endif /* CONFIG_SCHED_TOPOLOGY */


#define POLARIZATION_UNKNOWN	(-1)
#define POLARIZATION_UNKNOWN	(-1)
#define POLARIZATION_HRZ	(0)
#define POLARIZATION_HRZ	(0)
+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ extra-y += head.o head64.o vmlinux.lds


obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o
obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o
obj-$(CONFIG_SMP)		+= smp.o
obj-$(CONFIG_SMP)		+= smp.o
obj-$(CONFIG_SCHED_BOOK)	+= topology.o
obj-$(CONFIG_SCHED_TOPOLOGY)	+= topology.o
obj-$(CONFIG_HIBERNATION)	+= suspend.o swsusp.o
obj-$(CONFIG_HIBERNATION)	+= suspend.o swsusp.o
obj-$(CONFIG_AUDIT)		+= audit.o
obj-$(CONFIG_AUDIT)		+= audit.o
compat-obj-$(CONFIG_AUDIT)	+= compat_audit.o
compat-obj-$(CONFIG_AUDIT)	+= compat_audit.o
+1 −1
Original line number Original line Diff line number Diff line
@@ -122,7 +122,7 @@ static void stsi_15_1_x(struct seq_file *m, struct sysinfo_15_1_x *info)
	for (i = 0; i < TOPOLOGY_NR_MAG; i++)
	for (i = 0; i < TOPOLOGY_NR_MAG; i++)
		seq_printf(m, " %d", info->mag[i]);
		seq_printf(m, " %d", info->mag[i]);
	seq_putc(m, '\n');
	seq_putc(m, '\n');
#ifdef CONFIG_SCHED_MC
#ifdef CONFIG_SCHED_TOPOLOGY
	store_topology(info);
	store_topology(info);
	seq_printf(m, "CPU Topology SW:     ");
	seq_printf(m, "CPU Topology SW:     ");
	for (i = 0; i < TOPOLOGY_NR_MAG; i++)
	for (i = 0; i < TOPOLOGY_NR_MAG; i++)