Commit dbd70fb4 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

[S390] cpu topology support for s390. 



Add s390 backend so we can give the scheduler some hints about the
cpu topology.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 7b758389

arch/s390/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
# see Documentation/kbuild/kconfig-language.txt.

#



config SCHED_MC

	def_bool y

	depends on SMP



config MMU

	def_bool y

arch/s390/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
# Linux kernel version: 2.6.25-rc4

# Wed Mar  5 11:22:59 2008

#

CONFIG_SCHED_MC=y

CONFIG_MMU=y

CONFIG_ZONE_DMA=y

CONFIG_LOCKDEP_SUPPORT=y

arch/s390/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o) 
extra-y				+= head.o init_task.o vmlinux.lds



obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_SMP)		+= smp.o topology.o



obj-$(CONFIG_AUDIT)		+= audit.o

compat-obj-$(CONFIG_AUDIT)	+= compat_audit.o

arch/s390/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/pfn.h>

#include <linux/ctype.h>

#include <linux/reboot.h>

#include <linux/topology.h>



#include <asm/ipl.h>

#include <asm/uaccess.h>
@@ -830,6 +831,7 @@ setup_arch(char **cmdline_p) 


        cpu_init();

        __cpu_logical_map[0] = S390_lowcore.cpu_data.cpu_addr;

	s390_init_cpu_topology();



	/*

	 * Setup capabilities (ELF_HWCAP & ELF_PLATFORM).

arch/s390/kernel/smp.c

+1 −3
Original line number Diff line number Diff line
@@ -67,9 +67,7 @@ enum s390_cpu_state { 
	CPU_STATE_CONFIGURED,

};



#ifdef CONFIG_HOTPLUG_CPU

static DEFINE_MUTEX(smp_cpu_state_mutex);

#endif

DEFINE_MUTEX(smp_cpu_state_mutex);

static int smp_cpu_state[NR_CPUS];



static DEFINE_PER_CPU(struct cpu, cpu_devices);