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

Commit 96f73749 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

Hibernation: Mark SNAPSHOT_SET_SWAP_FILE ioctl as deprecated (rev. 2) 



Mark the SNAPSHOT_SET_SWAP_FILE ioctl belonging to the hibernation userland
interface as deprecated.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent eb57c1cf

Documentation/power/userland-swsusp.txt

+2 −12
Original line number Original line Diff line number Diff line
@@ -67,23 +67,13 @@ SNAPSHOT_GET_SWAP_PAGE - allocate a swap page from the resume partition 
SNAPSHOT_FREE_SWAP_PAGES - free all swap pages allocated with

SNAPSHOT_FREE_SWAP_PAGES - free all swap pages allocated with

	SNAPSHOT_GET_SWAP_PAGE

	SNAPSHOT_GET_SWAP_PAGE





SNAPSHOT_SET_SWAP_FILE - set the resume partition (the last ioctl() argument

	should specify the device's major and minor numbers in the old

	two-byte format, as returned by the stat() function in the .st_rdev

	member of the stat structure)



SNAPSHOT_SET_SWAP_AREA - set the resume partition and the offset (in <PAGE_SIZE>

SNAPSHOT_SET_SWAP_AREA - set the resume partition and the offset (in <PAGE_SIZE>

	units) from the beginning of the partition at which the swap header is

	units) from the beginning of the partition at which the swap header is

	located (the last ioctl() argument should point to a struct

	located (the last ioctl() argument should point to a struct

	resume_swap_area, as defined in kernel/power/power.h, containing the

	resume_swap_area, as defined in kernel/power/power.h, containing the

	resume device specification, as for the SNAPSHOT_SET_SWAP_FILE ioctl(),

	resume device specification and the offset); for swap partitions the

	and the offset); for swap partitions the offset is always 0, but it is

	offset is always 0, but it is different from zero for swap files (see

	different to zero for swap files (please see

	Documentation/swsusp-and-swap-files.txt for details).

	Documentation/swsusp-and-swap-files.txt for details).

	The SNAPSHOT_SET_SWAP_AREA ioctl() is considered as a replacement for

	SNAPSHOT_SET_SWAP_FILE which is regarded as obsolete.   It is

	recommended to always use this call, because the code to set the resume

	partition may be removed from future kernels





SNAPSHOT_PLATFORM_SUPPORT - enable/disable the hibernation platform support,

SNAPSHOT_PLATFORM_SUPPORT - enable/disable the hibernation platform support,

	depending on the argument value (enable, if the argument is nonzero)

	depending on the argument value (enable, if the argument is nonzero)

kernel/power/power.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -154,7 +154,6 @@ struct resume_swap_area { 
#define SNAPSHOT_AVAIL_SWAP		_IOR(SNAPSHOT_IOC_MAGIC, 7, void *)

#define SNAPSHOT_AVAIL_SWAP		_IOR(SNAPSHOT_IOC_MAGIC, 7, void *)

#define SNAPSHOT_GET_SWAP_PAGE		_IOR(SNAPSHOT_IOC_MAGIC, 8, void *)

#define SNAPSHOT_GET_SWAP_PAGE		_IOR(SNAPSHOT_IOC_MAGIC, 8, void *)

#define SNAPSHOT_FREE_SWAP_PAGES	_IO(SNAPSHOT_IOC_MAGIC, 9)

#define SNAPSHOT_FREE_SWAP_PAGES	_IO(SNAPSHOT_IOC_MAGIC, 9)

#define SNAPSHOT_SET_SWAP_FILE		_IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)

#define SNAPSHOT_S2RAM			_IO(SNAPSHOT_IOC_MAGIC, 11)

#define SNAPSHOT_S2RAM			_IO(SNAPSHOT_IOC_MAGIC, 11)

#define SNAPSHOT_SET_SWAP_AREA		_IOW(SNAPSHOT_IOC_MAGIC, 13, \

#define SNAPSHOT_SET_SWAP_AREA		_IOW(SNAPSHOT_IOC_MAGIC, 13, \

							struct resume_swap_area)

							struct resume_swap_area)

kernel/power/user.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -29,10 +29,11 @@ 
#include "power.h"

#include "power.h"





/*

/*

 * NOTE: The SNAPSHOT_PMOPS ioctl is obsolete and will be removed in the

 * NOTE: The SNAPSHOT_SET_SWAP_FILE and SNAPSHOT_PMOPS ioctls are obsolete and

 * future.  It is only preserved here for compatibility with existing userland

 * will be removed in the future.  They are only preserved here for

 * utilities.

 * compatibility with existing userland utilities.

 */

 */

#define SNAPSHOT_SET_SWAP_FILE	_IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)

#define SNAPSHOT_PMOPS		_IOW(SNAPSHOT_IOC_MAGIC, 12, unsigned int)

#define SNAPSHOT_PMOPS		_IOW(SNAPSHOT_IOC_MAGIC, 12, unsigned int)





#define PMOPS_PREPARE	1

#define PMOPS_PREPARE	1
@@ -260,7 +261,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, 
		free_all_swap_pages(data->swap);

		free_all_swap_pages(data->swap);

		break;

		break;





	case SNAPSHOT_SET_SWAP_FILE:

	case SNAPSHOT_SET_SWAP_FILE: /* This ioctl is deprecated */

		if (!swsusp_swap_in_use()) {

		if (!swsusp_swap_in_use()) {

			/*

			/*

			 * User space encodes device types as two-byte values,

			 * User space encodes device types as two-byte values,