From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CE29C43381 for ; Fri, 8 Mar 2019 13:00:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 224E0214D8 for ; Fri, 8 Mar 2019 13:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552050032; bh=B9gVWUwjvz80qsWL0alg0V8aF4yWDkdeH9sO8NLItAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IeXA/3vupPAR/QZfuTkeUjfVVPhm3GoaUSS9zsqM9X8NlR2fni+spXMABZk+rVD03 SIzy1ZYFRIQzZqs/FLn1CSFK9rabsTjYteCdg6OJGTZ0DuKJe3AnWYYAsxgO8X9D+o rkqbsT8rVLGqmJam5ZYSzeLcQD9IYMNhzZIySw2E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728309AbfCHNA3 (ORCPT ); Fri, 8 Mar 2019 08:00:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:37310 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726639AbfCHNAV (ORCPT ); Fri, 8 Mar 2019 08:00:21 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B3AF920449; Fri, 8 Mar 2019 13:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552050020; bh=B9gVWUwjvz80qsWL0alg0V8aF4yWDkdeH9sO8NLItAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vzcQT0m4uTfn6BBWU1HpONGJO/Va20RmBYmBuXEhZBmwBq4EbpyoRti1uBNAcCwb4 Lg1aNOXbGVBC75F9sKBhstNqloDGCsCLiwIyO++/tUkj7BIvjPibAuUgHCW9OFOlIk k1J1xHEpqVEzkJre6m6zosdNJzoTTT33NVC1XVus= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Xiang , Paul Burton , linux-mips@vger.kernel.org Subject: [PATCH 4.19 58/68] MIPS: irq: Allocate accurate order pages for irq stack Date: Fri, 8 Mar 2019 13:50:28 +0100 Message-Id: <20190308124913.454357495@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190308124910.696595153@linuxfoundation.org> References: <20190308124910.696595153@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Liu Xiang commit 72faa7a773ca59336f3c889e878de81445c5a85c upstream. The irq_pages is the number of pages for irq stack, but not the order which is needed by __get_free_pages(). We can use get_order() to calculate the accurate order. Signed-off-by: Liu Xiang Signed-off-by: Paul Burton Fixes: fe8bd18ffea5 ("MIPS: Introduce irq_stack") Cc: linux-mips@vger.kernel.org Cc: stable@vger.kernel.org # v4.11+ Signed-off-by: Greg Kroah-Hartman --- arch/mips/kernel/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -52,6 +52,7 @@ asmlinkage void spurious_interrupt(void) void __init init_IRQ(void) { int i; + unsigned int order = get_order(IRQ_STACK_SIZE); for (i = 0; i < NR_IRQS; i++) irq_set_noprobe(i); @@ -62,8 +63,7 @@ void __init init_IRQ(void) arch_init_irq(); for_each_possible_cpu(i) { - int irq_pages = IRQ_STACK_SIZE / PAGE_SIZE; - void *s = (void *)__get_free_pages(GFP_KERNEL, irq_pages); + void *s = (void *)__get_free_pages(GFP_KERNEL, order); irq_stack[i] = s; pr_debug("CPU%d IRQ stack at 0x%p - 0x%p\n", i,