diff options
| -rw-r--r-- | disk-utils/Makefile.am | 5 | ||||
| -rw-r--r-- | disk-utils/mkswap.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index 7fed9d8b8..ef9ceab41 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -1,6 +1,9 @@ include $(top_srcdir)/config/include-Makefile.am -utils_common = ../lib/linux_version.c ../lib/blkdev.c +utils_common = ../lib/blkdev.c +if LINUX +utils_common += ../lib/linux_version.c +endif dist_man_MANS = blockdev.8 isosize.8 mkfs.8 mkswap.8 \ fsck.minix.8 mkfs.minix.8 mkfs.bfs.8 diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 3f58f9c30..8bf358ed3 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -607,9 +607,12 @@ main(int argc, char ** argv) { version = 1; else /* use version 1 as default, if possible */ +#ifdef __linux__ if (get_linux_version() < KERNEL_VERSION(2,1,117)) version = 0; - else if (pagesize < 2048) + else +#endif + if (pagesize < 2048) version = 0; else version = 1; @@ -629,10 +632,12 @@ main(int argc, char ** argv) { if (version == 0) maxpages = V0_MAX_PAGES; +#ifdef __linux__ else if (get_linux_version() >= KERNEL_VERSION(2,3,4)) maxpages = PAGES; else if (get_linux_version() >= KERNEL_VERSION(2,2,1)) maxpages = V1_MAX_PAGES; +#endif else maxpages = V1_OLD_MAX_PAGES; |