Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc836220 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

parents 0afaf7f4 bfa7d082

fs_mgr/fs_mgr.c

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
#include <libgen.h>

#include <time.h>

#include <sys/swap.h>

/* XXX These need to be obtained from kernel headers. See b/9336527 */

#define SWAP_FLAG_PREFER        0x8000

#define SWAP_FLAG_PRIO_MASK     0x7fff

#define SWAP_FLAG_PRIO_SHIFT    0

#define SWAP_FLAG_DISCARD       0x10000



#include <linux/loop.h>

#include <private/android_filesystem_config.h>

toolbox/swapon.c

+0 −6
Original line number Diff line number Diff line
@@ -5,12 +5,6 @@ 
#include <asm/page.h>

#include <sys/swap.h>



/* XXX These need to be obtained from kernel headers. See b/9336527 */

#define SWAP_FLAG_PREFER        0x8000

#define SWAP_FLAG_PRIO_MASK     0x7fff

#define SWAP_FLAG_PRIO_SHIFT    0

#define SWAP_FLAG_DISCARD       0x10000



void usage(char *name)

{

    fprintf(stderr, "Usage: %s [-p prio] <filename>\n"