summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorBaoJun Luo <baojun.luo@samsung.com>2017-06-27 02:10:44 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-06-27 02:10:44 +0200
commiteba74c294467d55c697e2199c37dfaf8126fe396 (patch)
treed3efc42f8429f70c86799c3c09ef5e0c163af601 /kernel
parent49368a47f6dc1b256e3b83813da5c9b0731fe268 (diff)
downloadlinux-eba74c294467d55c697e2199c37dfaf8126fe396.tar.bz2
PM / hibernate: Drop redundant parameter of swsusp_alloc()
The first parameter of swsusp_alloc is not used, so drop it. Signed-off-by: BaoJun Luo <baojun.luo@samsung.com> [ rjw: Subject & changelog ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/snapshot.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 71730d672290..b7708e319941 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1929,8 +1929,7 @@ static inline unsigned int alloc_highmem_pages(struct memory_bitmap *bm,
* also be located in the high memory, because of the way in which
* copy_data_pages() works.
*/
-static int swsusp_alloc(struct memory_bitmap *orig_bm,
- struct memory_bitmap *copy_bm,
+static int swsusp_alloc(struct memory_bitmap *copy_bm,
unsigned int nr_pages, unsigned int nr_highmem)
{
if (nr_highmem > 0) {
@@ -1976,7 +1975,7 @@ asmlinkage __visible int swsusp_save(void)
return -ENOMEM;
}
- if (swsusp_alloc(&orig_bm, &copy_bm, nr_pages, nr_highmem)) {
+ if (swsusp_alloc(&copy_bm, nr_pages, nr_highmem)) {
printk(KERN_ERR "PM: Memory allocation failed\n");
return -ENOMEM;
}