From dc2d219a86108c38c902755e6b4ed05b931c19c0 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Thu, 3 Oct 2013 17:22:07 +0200 Subject: [PATCH] libminixfs: statically allocate iovec . initial 'fix' for assert() firing on iovec size on ARM. likely due to alloc_contig() allocating unusually mapped memory in STATICINIT. Change-Id: I3d8dc635b1cf2666e55b0393feae74cc25b8fed4 --- lib/libminixfs/cache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/libminixfs/cache.c b/lib/libminixfs/cache.c index 2ff548faa..0bf7e27f7 100644 --- a/lib/libminixfs/cache.c +++ b/lib/libminixfs/cache.c @@ -616,12 +616,10 @@ void lmfs_rw_scattered( int gap; register int i; register iovec_t *iop; - static iovec_t *iovec = NULL; + static iovec_t iovec[NR_IOREQS]; u64_t pos; int iov_per_block; - STATICINIT(iovec, NR_IOREQS); - assert(dev != NO_DEV); assert(!(fs_block_size % PAGE_SIZE)); assert(fs_block_size > 0);