Index: mkfs.jffs2.c =================================================================== RCS file: /usr/local/cvs/linux/apps/utils/mtdutils/mkfs.jffs2.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mkfs.jffs2.c 17 Oct 2006 11:40:40 -0000 1.2 +++ mkfs.jffs2.c 6 Dec 2007 07:46:47 -0000 1.3 @@ -672,9 +672,9 @@ 0xff, 0xff, 0xff, 0xff, 0xff }; -/* We default to 4096, per x86. When building a fs for - * 64-bit arches and whatnot, use the --pagesize=SIZE option */ -int page_size = 4096; +/* We set this at start of main() using sysconf(), -1 means we don't know */ +/* When building an fs for non-native systems, use --pagesize=SIZE option */ +int page_size = -1; #include "compr.h" @@ -787,6 +787,10 @@ struct stat *statbuf; unsigned int totcomp = 0; + page_size = sysconf(_SC_PAGESIZE); + if (page_size < 0) /* System doesn't know so ... */ + page_size = 4096; /* ... we make an educated guess */ + statbuf = &(e->sb); if (statbuf->st_size >= JFFS2_MAX_FILE_SIZE) { error_msg("Skipping file \"%s\" too large.", e->path);