From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753228AbbLUXye (ORCPT ); Mon, 21 Dec 2015 18:54:34 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33106 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366AbbLUXsK (ORCPT ); Mon, 21 Dec 2015 18:48:10 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 65/83] um: switch to get_free_page() Date: Mon, 21 Dec 2015 23:47:38 +0000 Message-Id: <1450741676-5865-65-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/x86/um/ldt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/um/ldt.c b/arch/x86/um/ldt.c index 60b4314..a3c5104 100644 --- a/arch/x86/um/ldt.c +++ b/arch/x86/um/ldt.c @@ -297,7 +297,7 @@ long init_new_ldt(struct mm_context *new_mm, struct mm_context *from_mm) struct user_desc desc; short * num_p; int i; - long page, err=0; + long err=0; void *addr = NULL; @@ -336,13 +336,12 @@ long init_new_ldt(struct mm_context *new_mm, struct mm_context *from_mm) else { i = from_mm->arch.ldt.entry_count / LDT_ENTRIES_PER_PAGE; while (i-->0) { - page = __get_free_page(GFP_KERNEL|__GFP_ZERO); + void *page = get_free_page(GFP_KERNEL|__GFP_ZERO); if (!page) { err = -ENOMEM; break; } - new_mm->arch.ldt.u.pages[i] = - (struct ldt_entry *) page; + new_mm->arch.ldt.u.pages[i] = page; memcpy(new_mm->arch.ldt.u.pages[i], from_mm->arch.ldt.u.pages[i], PAGE_SIZE); } -- 2.1.4