From 6a24d4666f4308e7e7f00bbe7e047dae5499a13d Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar@linux.ibm.com>
Date: Wed, 21 Jul 2021 16:47:20 +0200
Subject: [PATCH] s390/boot: move EP_OFFSET and EP_STRING to head.S

Both macros are used only in decompressor's head.S, unnecessary to put
them in a global header used in many places like setup.h is.

Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
---
 arch/s390/boot/head.S         | 3 +++
 arch/s390/include/asm/setup.h | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/s390/boot/head.S b/arch/s390/boot/head.S
index 759f77c6af451..63a139a2f503f 100644
--- a/arch/s390/boot/head.S
+++ b/arch/s390/boot/head.S
@@ -31,6 +31,9 @@
 
 #define ARCH_OFFSET	4
 
+#define EP_OFFSET	0x10008
+#define EP_STRING	"S390EP"
+
 __HEAD
 
 #define IPL_BS	0x730
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 9c11028a2d0b2..b5bf743801d42 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -10,8 +10,6 @@
 #include <uapi/asm/setup.h>
 #include <linux/build_bug.h>
 
-#define EP_OFFSET		0x10008
-#define EP_STRING		"S390EP"
 #define PARMAREA		0x10400
 #define HEAD_END		0x11000
 
-- 
2.30.2