Subject: [PATCH] [FEAT VS1804] zipl/libc: include 's390.h'
From: Marc Hartmayer <mhartmay@linux.ibm.com>

Summary:     genprotimg: Introduce new tool for the creation of PV images
Description: genprotimg takes a kernel, host-key documents, optionally an
             initrd, optionally a file with the kernel command line, and it
             generates a single, loadable image file. The image consists of a
             concatenation of a plain text boot loader, the encrypted
             components for kernel, initrd, and cmdline, and the
             integrity-protected PV header, containing metadata necessary for
             running the guest in PV mode. It's possible to use this image file
             as a kernel for zIPL or for a direct kernel boot using QEMU.
Upstream-ID: b0f82d22f9f60a0a8db1976751aa5a875e7c5f80
Problem-ID:  VS1804

Upstream-Description:

             zipl/libc: include 's390.h'

             Include 'boot/s390.h' in 'libc.c' as `PAGE_SIZE` is used there and
             move the 'libc.h' include directive to the top.

             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>


Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
---
 zipl/boot/libc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/zipl/boot/libc.c
+++ b/zipl/boot/libc.c
@@ -9,12 +9,14 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include "libc.h"
+
 #include <stdarg.h>
 
 #include "lib/zt_common.h"
+#include "boot/s390.h"
 
 #include "error.h"
-#include "libc.h"
 #include "sclp.h"
 
 extern char __heap_start[];