From f454c6825f5087cf671d0dfbe96f7f3d148569d6 Mon Sep 17 00:00:00 2001
From: Marc Hartmayer <mhartmay@linux.ibm.com>
Date: Mon, 9 Dec 2019 16:43:14 +0100
Subject: [PATCH] zipl: remove libc.h include in s390.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows the use of s390.h in combination with other libc
implementations than our minimal libc, e.g. with glibc.

Reviewed-by: Philipp Rudo <prudo@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 zipl/boot/s390.h        | 1 -
 zipl/boot/sclp.c        | 1 +
 zipl/boot/sclp_stage3.c | 1 +
 zipl/boot/stage2dump.c  | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/zipl/boot/s390.h b/zipl/boot/s390.h
index ec7c321c..886233b9 100644
--- a/zipl/boot/s390.h
+++ b/zipl/boot/s390.h
@@ -12,7 +12,6 @@
 #define S390_H
 
 #include "lib/zt_common.h"
-#include "libc.h"
 #include "boot/sigp.h"
 
 
diff --git a/zipl/boot/sclp.c b/zipl/boot/sclp.c
index 04006b25..817b87a1 100644
--- a/zipl/boot/sclp.c
+++ b/zipl/boot/sclp.c
@@ -9,6 +9,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include "libc.h"
 #include "error.h"
 #include "s390.h"
 #include "sclp.h"
diff --git a/zipl/boot/sclp_stage3.c b/zipl/boot/sclp_stage3.c
index 2b216de1..9acb6700 100644
--- a/zipl/boot/sclp_stage3.c
+++ b/zipl/boot/sclp_stage3.c
@@ -9,6 +9,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include "libc.h"
 #include "sclp.h"
 #include "sclp_stage3.h"
 
diff --git a/zipl/boot/stage2dump.c b/zipl/boot/stage2dump.c
index effed413..9ba5d485 100644
--- a/zipl/boot/stage2dump.c
+++ b/zipl/boot/stage2dump.c
@@ -13,6 +13,7 @@
 
 #include "lib/zt_common.h"
 
+#include "libc.h"
 #include "error.h"
 #include "sclp.h"
 #include "stage2dump.h"