From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752677AbbLUXst (ORCPT ); Mon, 21 Dec 2015 18:48:49 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33134 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752404AbbLUXsM (ORCPT ); Mon, 21 Dec 2015 18:48:12 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 79/83] s390: turn suspend_zero_pages into a pointer Date: Mon, 21 Dec 2015 23:47:52 +0000 Message-Id: <1450741676-5865-79-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20151221234615.GW20997@ZenIV.linux.org.uk> References: <20151221234615.GW20997@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro Signed-off-by: Al Viro --- 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 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