swapon.c: move fallback definitions of swap options to xlat/

* swapon.c: Move definitions of SWAP_FLAG_* flags ...
* xlat/swap_flags.in: ... here.

diff --git a/swapon.c b/swapon.c
index 4006d9629b5132a471b4faae0d4cb7185e4d1f6c..08b1f77f8302c46aa3705e01f987a00251b5ae21 100644 (file)
--- a/swapon.c
+++ b/swapon.c
@@ -2,19 +2,6 @@
 
 #include <sys/swap.h>
 
-#ifndef SWAP_FLAG_PREFER
-# define SWAP_FLAG_PREFER 0x8000
-#endif
-#ifndef SWAP_FLAG_DISCARD
-# define SWAP_FLAG_DISCARD 0x10000
-#endif
-#ifndef SWAP_FLAG_DISCARD_ONCE
-# define SWAP_FLAG_DISCARD_ONCE 0x20000
-#endif
-#ifndef SWAP_FLAG_DISCARD_PAGES
-# define SWAP_FLAG_DISCARD_PAGES 0x40000
-#endif
-
 #include "xlat/swap_flags.h"
 
 SYS_FUNC(swapon)

diff --git a/xlat/swap_flags.in b/xlat/swap_flags.in
index d217d20b2d54684b7fac55bdede59882b4165c5a..8800e3015f86c6cf49cdb59e87f1c313d6de00cd 100644 (file)
--- a/xlat/swap_flags.in
+++ b/xlat/swap_flags.in
@@ -1,4 +1,4 @@
-SWAP_FLAG_PREFER
-SWAP_FLAG_DISCARD
-SWAP_FLAG_DISCARD_ONCE
-SWAP_FLAG_DISCARD_PAGES
+SWAP_FLAG_PREFER 0x8000
+SWAP_FLAG_DISCARD 0x10000
+SWAP_FLAG_DISCARD_ONCE 0x20000
+SWAP_FLAG_DISCARD_PAGES 0x40000