aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYang Zhong <yang.zhong@intel.com>2017-03-30 18:20:50 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2017-03-30 10:33:34 +0200
commitea7d0e304775e81c07269e22b4412d328c3fb2fa (patch)
tree569ee92e1bae2c2786e20cce007e0bd5ce69a7c3 /include
parentfd8d084d31c83419500b17b4909b0ed6e8144acd (diff)
downloadqboot-ea7d0e304775e81c07269e22b4412d328c3fb2fa.zip
qboot-ea7d0e304775e81c07269e22b4412d328c3fb2fa.tar.gz
qboot-ea7d0e304775e81c07269e22b4412d328c3fb2fa.tar.bz2
qboot: modified the malloc for fseg and high momory.
The fseg and high memory malloc all use the up align mode in do_alloc(),which will result in qboot hang issue.The high memory use the down align mode and fseg memory use the up align mode. With those changes,the qemu can boot up the image with qboot. Signed-off-by: Yang Zhong <yang.zhong@intel.com> Message-Id: <1490869250-4357-1-git-send-email-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/string.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/include/string.h b/include/string.h
index c939cd0..d1bb037 100644
--- a/include/string.h
+++ b/include/string.h
@@ -23,7 +23,16 @@ static inline void *memcpy(void *dest, const void *src, size_t n)
return __builtin_memcpy(dest, src, n);
}
-void *malloc(int n);
-void *malloc_fseg(int n);
+void *malloc_align(int n, int align);
+void *malloc_fseg_align(int n, int align);
+static inline void *malloc(int n)
+{
+ return malloc_align(n, 16);
+}
+
+static inline void *malloc_fseg(int n)
+{
+ return malloc_fseg_align(n, 16);
+}
#endif