diff options
-rw-r--r-- | mount/swap_constants.h | 15 | ||||
-rw-r--r-- | mount/swapon.c | 13 |
2 files changed, 12 insertions, 16 deletions
diff --git a/mount/swap_constants.h b/mount/swap_constants.h deleted file mode 100644 index c7e8b4c7e..000000000 --- a/mount/swap_constants.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * It is too painful to get these out of <linux/swap.h> - * (which again requires <asm/page.h> etc). - * These exist since Linux 1.3.2. - */ - -#ifndef SWAP_FLAG_PREFER -#define SWAP_FLAG_PREFER 0x8000 /* set if swap priority specified */ -#endif -#ifndef SWAP_FLAG_PRIO_MASK -#define SWAP_FLAG_PRIO_MASK 0x7fff -#endif -#ifndef SWAP_FLAG_PRIO_SHIFT -#define SWAP_FLAG_PRIO_SHIFT 0 -#endif diff --git a/mount/swapon.c b/mount/swapon.c index d70c37922..e37d8a251 100644 --- a/mount/swapon.c +++ b/mount/swapon.c @@ -17,7 +17,6 @@ #include "bitops.h" #include "blkdev.h" -#include "swap_constants.h" #include "nls.h" #include "fsprobe.h" #include "pathnames.h" @@ -37,6 +36,18 @@ # define SWAP_FLAG_DISCARD 0x10000 /* discard swap cluster after use */ #endif +#ifndef SWAP_FLAG_PREFER +# define SWAP_FLAG_PREFER 0x8000 /* set if swap priority specified */ +#endif + +#ifndef SWAP_FLAG_PRIO_MASK +# define SWAP_FLAG_PRIO_MASK 0x7fff +#endif + +#ifndef SWAP_FLAG_PRIO_SHIFT +# define SWAP_FLAG_PRIO_SHIFT 0 +#endif + #ifndef SWAPON_HAS_TWO_ARGS /* libc is insane, let's call the kernel */ # include <sys/syscall.h> |