From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 16 Jul 2015 23:25:36 +0000 (+0000)
Subject: swapon.c: move fallback definitions of swap options to xlat/
X-Git-Tag: v4.11~430
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63bae232d25719b80bd99cd2e105770ad00f7a98;p=strace

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 4006d962..08b1f77f 100644
--- 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 d217d20b..8800e301 100644
--- 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