mini-os: don't include lib.h from mm.h

This breaks the include cycle hypervisor.h -> hypercall-x86_32.h -> mm.h
-> lib.h -> gntmap.h -> os.h -> hypervisor.h.

Signed-off-by: Thomas Leonard <talex5@gmail.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/vtpmmgr/disk_tpm.c b/vtpmmgr/disk_tpm.c
index a9f455255a350e8a6ee5ceaa3b539a60fad5d1bb..d650fbca09d4fe2081e6ca075ee52f0bc98034de 100644 (file)
--- a/vtpmmgr/disk_tpm.c
+++ b/vtpmmgr/disk_tpm.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <mini-os/byteorder.h>
+#include <mini-os/lib.h>
 #include <polarssl/aes.h>
 #include <polarssl/sha1.h>
 

diff --git a/vtpmmgr/vtpm_cmd_handler.c b/vtpmmgr/vtpm_cmd_handler.c
index 8a42790a62ed50c01fd0b44b2552eb69ebfb9b2c..13ead93237c59abeed504dcf4a35d072b7dfc126 100644 (file)
--- a/vtpmmgr/vtpm_cmd_handler.c
+++ b/vtpmmgr/vtpm_cmd_handler.c
@@ -38,6 +38,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <mini-os/console.h>
+#include <mini-os/lib.h>
 #include <polarssl/sha1.h>
 #include <polarssl/sha2.h>