s390/sclp: move early printk code to drivers

Move the early sclp printk code to the drivers folder where also the
rest of the sclp code can be found. This way it is possible to use the
sclp private header files for further cleanups.

Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile
index 6bd2c90..f7e4c83 100644 (file)
--- a/arch/s390/boot/compressed/Makefile
+++ b/arch/s390/boot/compressed/Makefile
@@ -19,7 +19,8 @@ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
 GCOV_PROFILE := n
 UBSAN_SANITIZE := n
 
-OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o als.o)
+OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o ebcdic.o als.o)
+OBJECTS += $(objtree)/drivers/s390/char/sclp_early_core.o
 OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o
 
 LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index edbc62e..060ce54 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -10,31 +10,25 @@ CFLAGS_REMOVE_ftrace.o      = $(CC_FLAGS_FTRACE)
 # Do not trace early setup code
 CFLAGS_REMOVE_als.o    = $(CC_FLAGS_FTRACE)
 CFLAGS_REMOVE_early.o  = $(CC_FLAGS_FTRACE)
-CFLAGS_REMOVE_sclp.o   = $(CC_FLAGS_FTRACE)
 
 endif
 
 GCOV_PROFILE_als.o     := n
 GCOV_PROFILE_early.o   := n
-GCOV_PROFILE_sclp.o    := n
 
 KCOV_INSTRUMENT_als.o  := n
 KCOV_INSTRUMENT_early.o        := n
-KCOV_INSTRUMENT_sclp.o := n
 
 UBSAN_SANITIZE_als.o   := n
 UBSAN_SANITIZE_early.o := n
-UBSAN_SANITIZE_sclp.o  := n
 
 #
-# Use -march=z900 for sclp.c and als.c to be able to print an error
+# Use -march=z900 for als.c to be able to print an error
 # message if the kernel is started on a machine which is too old
 #
 ifneq ($(CC_FLAGS_MARCH),-march=z900)
 CFLAGS_REMOVE_als.o    += $(CC_FLAGS_MARCH)
 CFLAGS_als.o           += -march=z900
-CFLAGS_REMOVE_sclp.o   += $(CC_FLAGS_MARCH)
-CFLAGS_sclp.o          += -march=z900
 AFLAGS_REMOVE_head.o   += $(CC_FLAGS_MARCH)
 AFLAGS_head.o          += -march=z900
 endif
@@ -61,7 +55,7 @@ CFLAGS_sysinfo.o      += -w
 
 obj-y  := traps.o time.o process.o base.o early.o setup.o idle.o vtime.o
 obj-y  += processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
-obj-y  += debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o als.o
+obj-y  += debug.o irq.o ipl.o dis.o diag.o vdso.o als.o
 obj-y  += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o
 obj-y  += runtime_instr.o cache.o fpu.o dumpstack.o
 obj-y  += entry.o reipl.o relocate_kernel.o

diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 41e28b2..0c443e2 100644 (file)
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -2,9 +2,23 @@
 # S/390 character devices
 #
 
+ifdef CONFIG_FUNCTION_TRACER
+# Do not trace early setup code
+CFLAGS_REMOVE_sclp_early_core.o        = $(CC_FLAGS_FTRACE)
+endif
+
+GCOV_PROFILE_sclp_early_core.o         := n
+KCOV_INSTRUMENT_sclp_early_core.o      := n
+UBSAN_SANITIZE_sclp_early_core.o       := n
+
+ifneq ($(CC_FLAGS_MARCH),-march=z900)
+CFLAGS_REMOVE_sclp_early_core.o        += $(CC_FLAGS_MARCH)
+CFLAGS_sclp_early_core.o               += -march=z900
+endif
+
 obj-y += ctrlchar.o keyboard.o defkeymap.o sclp.o sclp_rw.o sclp_quiesce.o \
         sclp_cmd.o sclp_config.o sclp_cpi_sys.o sclp_ocf.o sclp_ctl.o \
-        sclp_early.o
+        sclp_early.o sclp_early_core.o
 
 obj-$(CONFIG_TN3270) += raw3270.o
 obj-$(CONFIG_TN3270_CONSOLE) += con3270.o

diff --git a/arch/s390/kernel/sclp.c b/drivers/s390/char/sclp_early_core.c
similarity index 100%
rename from arch/s390/kernel/sclp.c
rename to drivers/s390/char/sclp_early_core.c