am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."

* commit '16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd':
  SWAP_FLAG_* constants are now in <sys/swap.h>.
This commit is contained in:
Elliott Hughes 2014-01-08 02:48:40 +00:00 committed by Android Git Automerger
commit ebf1b66c81
2 changed files with 0 additions and 11 deletions

View file

@ -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>

View file

@ -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"