aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/power.h1
-rw-r--r--kernel/power/user.c9
2 files changed, 5 insertions, 5 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 6ca85fd4975f..8837ea334e33 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -154,7 +154,6 @@ struct resume_swap_area {
154#define SNAPSHOT_AVAIL_SWAP _IOR(SNAPSHOT_IOC_MAGIC, 7, void *) 154#define SNAPSHOT_AVAIL_SWAP _IOR(SNAPSHOT_IOC_MAGIC, 7, void *)
155#define SNAPSHOT_GET_SWAP_PAGE _IOR(SNAPSHOT_IOC_MAGIC, 8, void *) 155#define SNAPSHOT_GET_SWAP_PAGE _IOR(SNAPSHOT_IOC_MAGIC, 8, void *)
156#define SNAPSHOT_FREE_SWAP_PAGES _IO(SNAPSHOT_IOC_MAGIC, 9) 156#define SNAPSHOT_FREE_SWAP_PAGES _IO(SNAPSHOT_IOC_MAGIC, 9)
157#define SNAPSHOT_SET_SWAP_FILE _IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)
158#define SNAPSHOT_S2RAM _IO(SNAPSHOT_IOC_MAGIC, 11) 157#define SNAPSHOT_S2RAM _IO(SNAPSHOT_IOC_MAGIC, 11)
159#define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, \ 158#define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, \
160 struct resume_swap_area) 159 struct resume_swap_area)
diff --git a/kernel/power/user.c b/kernel/power/user.c
index de3fb433ae39..5e866e078550 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -29,10 +29,11 @@
29#include "power.h" 29#include "power.h"
30 30
31/* 31/*
32 * NOTE: The SNAPSHOT_PMOPS ioctl is obsolete and will be removed in the 32 * NOTE: The SNAPSHOT_SET_SWAP_FILE and SNAPSHOT_PMOPS ioctls are obsolete and
33 * future. It is only preserved here for compatibility with existing userland 33 * will be removed in the future. They are only preserved here for
34 * utilities. 34 * compatibility with existing userland utilities.
35 */ 35 */
36#define SNAPSHOT_SET_SWAP_FILE _IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)
36#define SNAPSHOT_PMOPS _IOW(SNAPSHOT_IOC_MAGIC, 12, unsigned int) 37#define SNAPSHOT_PMOPS _IOW(SNAPSHOT_IOC_MAGIC, 12, unsigned int)
37 38
38#define PMOPS_PREPARE 1 39#define PMOPS_PREPARE 1
@@ -260,7 +261,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
260 free_all_swap_pages(data->swap); 261 free_all_swap_pages(data->swap);
261 break; 262 break;
262 263
263 case SNAPSHOT_SET_SWAP_FILE: 264 case SNAPSHOT_SET_SWAP_FILE: /* This ioctl is deprecated */
264 if (!swsusp_swap_in_use()) { 265 if (!swsusp_swap_in_use()) {
265 /* 266 /*
266 * User space encodes device types as two-byte values, 267 * User space encodes device types as two-byte values,