summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorKarel Zak2006-12-07 00:27:06 +0100
committerKarel Zak2006-12-07 00:27:06 +0100
commitca3ea756e73daf33ba26a820723a3b7b2ddbe8de (patch)
tree1286219104498dd98486293681d5edeebec02feb /disk-utils
parentImported from util-linux-2.13-pre3 tarball. (diff)
downloadkernel-qcow2-util-linux-ca3ea756e73daf33ba26a820723a3b7b2ddbe8de.tar.gz
kernel-qcow2-util-linux-ca3ea756e73daf33ba26a820723a3b7b2ddbe8de.tar.xz
kernel-qcow2-util-linux-ca3ea756e73daf33ba26a820723a3b7b2ddbe8de.zip
Imported from util-linux-2.13-pre4 tarball.
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/Makefile.in2
-rw-r--r--disk-utils/mkswap.87
2 files changed, 7 insertions, 2 deletions
diff --git a/disk-utils/Makefile.in b/disk-utils/Makefile.in
index 102f3e5a3..5fcbf155c 100644
--- a/disk-utils/Makefile.in
+++ b/disk-utils/Makefile.in
@@ -216,6 +216,8 @@ LIBS = @LIBS@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+M68K_FALSE = @M68K_FALSE@
+M68K_TRUE = @M68K_TRUE@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index 3463acc2a..52af99c41 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -76,9 +76,12 @@ while the bad blocks, if any, can simply be listed. Nobody wants
to use a swap space with hundreds of bad blocks. (I would not even
use a swap space with 1 bad block.)
In the new style swap area this is precisely what is done.
-The maximum useful size of a swap area now depends on the architecture.
+
+The maximum useful size of a swap area depends on the architecture and
+the kernel version.
It is roughly 2GiB on i386, PPC, m68k, ARM, 1GiB on sparc, 512MiB on mips,
-128GiB on alpha and 3TiB on sparc64.
+128GiB on alpha and 3TiB on sparc64. For kernels after 2.3.3 there is no
+such limitation.
Note that before 2.1.117 the kernel allocated one byte for each page,
while it now allocates two bytes, so that taking a swap area of 2 GiB