diff options
| author | Rodolfo kix Garcia <kix@kix.es> | 2012-02-12 23:43:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-12 23:43:05 +0100 |
| commit | bf324ec457c6333e8ce313cb91c49dab18c864a0 (patch) | |
| tree | 928edede4e3492ab9743312c36c656e90dd8f732 | |
| parent | b8ab436980ae466fc9d756bd29284888d8d0cabc (diff) | |
| download | suspend-utils-bf324ec457c6333e8ce313cb91c49dab18c864a0.tar.gz | |
s2disk: Use kernel suspend_ioctls.h file
This patch removes the suspend_ioctls.h file and the source now uses
the corresponding kernel header file.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | suspend_ioctls.h | 32 | ||||
| -rw-r--r-- | swsusp.h | 2 |
3 files changed, 2 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index 0881a0d..4529810 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,7 +90,7 @@ common_s2disk_libs+=\ endif libsuspend_common_a_SOURCES=\ - swsusp.h suspend_ioctls.h \ + swsusp.h \ vt.h vt.c \ config_parser.h config_parser.c \ md5.h md5.c \ diff --git a/suspend_ioctls.h b/suspend_ioctls.h deleted file mode 100644 index 2c6faec..0000000 --- a/suspend_ioctls.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef _LINUX_SUSPEND_IOCTLS_H -#define _LINUX_SUSPEND_IOCTLS_H - -/* - * This structure is used to pass the values needed for the identification - * of the resume swap area from a user space to the kernel via the - * SNAPSHOT_SET_SWAP_AREA ioctl - */ -struct resume_swap_area { - loff_t offset; - u_int32_t dev; -} __attribute__((packed)); - -#define SNAPSHOT_IOC_MAGIC '3' -#define SNAPSHOT_FREEZE _IO(SNAPSHOT_IOC_MAGIC, 1) -#define SNAPSHOT_UNFREEZE _IO(SNAPSHOT_IOC_MAGIC, 2) -#define SNAPSHOT_ATOMIC_RESTORE _IO(SNAPSHOT_IOC_MAGIC, 4) -#define SNAPSHOT_FREE _IO(SNAPSHOT_IOC_MAGIC, 5) -#define SNAPSHOT_FREE_SWAP_PAGES _IO(SNAPSHOT_IOC_MAGIC, 9) -#define SNAPSHOT_S2RAM _IO(SNAPSHOT_IOC_MAGIC, 11) -#define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, \ - struct resume_swap_area) -#define SNAPSHOT_GET_IMAGE_SIZE _IOR(SNAPSHOT_IOC_MAGIC, 14, loff_t) -#define SNAPSHOT_PLATFORM_SUPPORT _IO(SNAPSHOT_IOC_MAGIC, 15) -#define SNAPSHOT_POWER_OFF _IO(SNAPSHOT_IOC_MAGIC, 16) -#define SNAPSHOT_CREATE_IMAGE _IOW(SNAPSHOT_IOC_MAGIC, 17, int) -#define SNAPSHOT_PREF_IMAGE_SIZE _IO(SNAPSHOT_IOC_MAGIC, 18) -#define SNAPSHOT_AVAIL_SWAP_SIZE _IOR(SNAPSHOT_IOC_MAGIC, 19, loff_t) -#define SNAPSHOT_ALLOC_SWAP_PAGE _IOR(SNAPSHOT_IOC_MAGIC, 20, loff_t) -#define SNAPSHOT_IOC_MAXNR 20 - -#endif /* _LINUX_SUSPEND_IOCTLS_H */ @@ -11,8 +11,8 @@ #include <stdint.h> #include <linux/fs.h> +#include <linux/suspend_ioctls.h> -#include "suspend_ioctls.h" #include "encrypt.h" #define LINUX_REBOOT_MAGIC1 0xfee1dead |