From: Al Viro <[email protected]>
Signed-off-by: Al Viro <[email protected]>
---
arch/s390/kernel/entry.h | 2 +-
arch/s390/kernel/suspend.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index b7019ab..612b35c 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -7,7 +7,7 @@
#include <asm/idle.h>
extern void *restart_stack;
-extern unsigned long suspend_zero_pages;
+extern void *suspend_zero_pages;
void system_call(void);
void pgm_check_handler(void);
diff --git a/arch/s390/kernel/suspend.c b/arch/s390/kernel/suspend.c
index c40bdca..4ce1cc3 100644
--- a/arch/s390/kernel/suspend.c
+++ b/arch/s390/kernel/suspend.c
@@ -41,7 +41,7 @@ struct page_key_data {
static struct page_key_data *page_key_data;
static struct page_key_data *page_key_rp, *page_key_wp;
static unsigned long page_key_rx, page_key_wx;
-unsigned long suspend_zero_pages;
+void *suspend_zero_pages;
/*
* For each page in the hibernation image one additional byte is
@@ -163,13 +163,13 @@ static int suspend_pm_cb(struct notifier_block *nb,
unsigned long action,
switch (action) {
case PM_SUSPEND_PREPARE:
case PM_HIBERNATION_PREPARE:
- suspend_zero_pages = __get_free_pages(GFP_KERNEL, LC_ORDER);
+ suspend_zero_pages = get_free_pages(GFP_KERNEL, LC_ORDER);
if (!suspend_zero_pages)
return NOTIFY_BAD;
break;
case PM_POST_SUSPEND:
case PM_POST_HIBERNATION:
- free_pages((void *)suspend_zero_pages, LC_ORDER);
+ free_pages(suspend_zero_pages, LC_ORDER);
break;
default:
return NOTIFY_DONE;
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
