xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 880ee18ab14477b669a6b95707721322bfe086c1
parent 1e8035be535781e2b317881ab421ac33c7de0299
Author: Austin Clements <amdragon@mit.edu>
Date:   Tue, 31 Aug 2010 15:11:10 -0400

mkfs must be compiled 32-bit.  Fix mkfs warnings

Diffstat:
MMakefile | 2+-
Mmkfs.c | 4++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile @@ -127,7 +127,7 @@ _forktest: forktest.o $(ULIB) $(OBJDUMP) -S _forktest > forktest.asm mkfs: mkfs.c fs.h - gcc -Wall -o mkfs mkfs.c + gcc -m32 -Werror -Wall -o mkfs mkfs.c UPROGS=\ _cat\ diff --git a/mkfs.c b/mkfs.c @@ -82,7 +82,7 @@ main(int argc, char *argv[]) usedblocks = ninodes / IPB + 3 + bitblocks; freeblock = usedblocks; - printf("used %d (bit %d ninode %lu) free %u total %d\n", usedblocks, + printf("used %d (bit %d ninode %u) free %u total %d\n", usedblocks, bitblocks, ninodes/IPB + 1, freeblock, nblocks+usedblocks); assert(nblocks + usedblocks == size); @@ -230,7 +230,7 @@ balloc(int used) for(i = 0; i < used; i++) { buf[i/8] = buf[i/8] | (0x1 << (i%8)); } - printf("balloc: write bitmap block at sector %lu\n", ninodes/IPB + 3); + printf("balloc: write bitmap block at sector %u\n", ninodes/IPB + 3); wsect(ninodes / IPB + 3, buf); }