leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PM / hibernate: Drop redundant parameter of swsusp_alloc()

Browse Source 
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>
This commit is contained in:
BaoJun Luo
2017-06-27 02:10:44 +02:00
committed by Rafael J. Wysocki
parent 49368a47f6
commit eba74c2944
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/power/snapshot.c
View File

@@ -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 * also be located in the high memory, because of the way in which
* copy_data_pages() works. * copy_data_pages() works.
*/ */
static int swsusp_alloc(struct memory_bitmap *orig_bm, static int swsusp_alloc(struct memory_bitmap *copy_bm,
struct memory_bitmap *copy_bm,
unsigned int nr_pages, unsigned int nr_highmem) unsigned int nr_pages, unsigned int nr_highmem)
{ {
if (nr_highmem > 0) { if (nr_highmem > 0) {
@@ -1976,7 +1975,7 @@ asmlinkage __visible int swsusp_save(void)
return -ENOMEM; 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"); printk(KERN_ERR "PM: Memory allocation failed\n");
return -ENOMEM; return -ENOMEM;
} }