diff options
| author |   Avi Kivity <avi@redhat.com> | 2008-11-13 15:52:40 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-11-13 15:52:40 +0200 |
| commit | 156f167ff4bcef2b7de690265a83e301ce411785 (patch) | |
| tree | 5c37ed475e83db1cae71959392e50b0301b337e6 /osdep.c | |
| parent | kvm: external module: fix hrtimer compat with 2.6.26 (diff) | |
| parent | Fix brown-paper-bag bugs from live-migration patch (Charles Duffy) (diff) | |
| download | qemu-kvm-156f167ff4bcef2b7de690265a83e301ce411785.tar.gz qemu-kvm-156f167ff4bcef2b7de690265a83e301ce411785.tar.bz2 qemu-kvm-156f167ff4bcef2b7de690265a83e301ce411785.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/osdep.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'osdep.c')
| -rw-r--r-- | osdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -201,7 +201,7 @@ void *qemu_vmalloc(size_t size) return valloc(size); #else #ifndef __ia64__ - return memalign(4096, size); + return memalign(getpagesize(), size); #else return memalign(65536, size); #endif |