aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaoJun Luo <baojun.luo@samsung.com>2017-06-26 20:10:44 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-06-26 20:10:44 -0400
commiteba74c294467d55c697e2199c37dfaf8126fe396 (patch)
treed3efc42f8429f70c86799c3c09ef5e0c163af601
parent49368a47f6dc1b256e3b83813da5c9b0731fe268 (diff)
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>
-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,
1929 * also be located in the high memory, because of the way in which 1929 * also be located in the high memory, because of the way in which
1930 * copy_data_pages() works. 1930 * copy_data_pages() works.
1931 */ 1931 */
1932static int swsusp_alloc(struct memory_bitmap *orig_bm, 1932static int swsusp_alloc(struct memory_bitmap *copy_bm,
1933 struct memory_bitmap *copy_bm,
1934 unsigned int nr_pages, unsigned int nr_highmem) 1933 unsigned int nr_pages, unsigned int nr_highmem)
1935{ 1934{
1936 if (nr_highmem > 0) { 1935 if (nr_highmem > 0) {
@@ -1976,7 +1975,7 @@ asmlinkage __visible int swsusp_save(void)
1976 return -ENOMEM; 1975 return -ENOMEM;
1977 } 1976 }
1978 1977
1979 if (swsusp_alloc(&orig_bm, &copy_bm, nr_pages, nr_highmem)) { 1978 if (swsusp_alloc(&copy_bm, nr_pages, nr_highmem)) {
1980 printk(KERN_ERR "PM: Memory allocation failed\n"); 1979 printk(KERN_ERR "PM: Memory allocation failed\n");
1981 return -ENOMEM; 1980 return -ENOMEM;
1982 } 1981 }