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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 9C045C10F05 for ; Mon, 1 Apr 2019 17:38:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 698A320830 for ; Mon, 1 Apr 2019 17:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140320; bh=WtQiQSehLpYhfeDd2wUCc/vgTowyxSaJ5xX6rd/BBMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zfn9j9skmxCS6i6YGX2VIAs/huZykh/kNO5VVWpqoVzwJkdZac4h4hkA8SLPa1pyb T3HP6Fu2HnLUpY1FFmFtuox/7/xjlMx9Z7Fa4jqR8cVeBw4/cEVOjRQKIPPlMHfoUJ OBFldP59eQg59UCF/VzNK7ofEfYpEL0oRJqFXNkk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387829AbfDARij (ORCPT ); Mon, 1 Apr 2019 13:38:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:52044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388345AbfDARih (ORCPT ); Mon, 1 Apr 2019 13:38:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 852AA20830; Mon, 1 Apr 2019 17:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140317; bh=WtQiQSehLpYhfeDd2wUCc/vgTowyxSaJ5xX6rd/BBMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fDkH2G6yYEdnSjmFITrYMPu9tgzSh6TFuTYyHDhVrL3fFC8DxwXGHhPUfB3TsSjap wG6Jc0uzdTj3j3x2EnEicB/nOCD66hR5BQ8Itm+By2+dYemu/QCAcZJq4N2w09JQue KayB+IEZvIwG+BMlYG43+gKHi682zKJSU/evsHyQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Yury Norov , Will Deacon , Sasha Levin Subject: [PATCH 3.18 11/50] arm64: fix COMPAT_SHMLBA definition for large pages Date: Mon, 1 Apr 2019 19:02:54 +0200 Message-Id: <20190401170042.281303741@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170041.257273804@linuxfoundation.org> References: <20190401170041.257273804@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit b9b7aebb42d1b1392f3111de61136bb6cf3aae3f ] ARM glibc uses (4 * __getpagesize()) for SHMLBA, which is correct for 4KB pages and works fine for 64KB pages, but the kernel uses a hardcoded 16KB that is too small for 64KB page based kernels. This changes the definition to what user space sees when using 64KB pages. Acked-by: Arnd Bergmann Signed-off-by: Yury Norov Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/shmparam.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/shmparam.h b/arch/arm64/include/asm/shmparam.h index 4df608a8459e..e368a55ebd22 100644 --- a/arch/arm64/include/asm/shmparam.h +++ b/arch/arm64/include/asm/shmparam.h @@ -21,7 +21,7 @@ * alignment value. Since we don't have aliasing D-caches, the rest of * the time we can safely use PAGE_SIZE. */ -#define COMPAT_SHMLBA 0x4000 +#define COMPAT_SHMLBA (4 * PAGE_SIZE) #include -- 2.19.1