Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933520AbbGGUZt (ORCPT ); Tue, 7 Jul 2015 16:25:49 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:16772 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758071AbbGGUVF (ORCPT ); Tue, 7 Jul 2015 16:21:05 -0400 From: Yinghai Lu To: Kees Cook , "H. Peter Anvin" , Baoquan He Cc: linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH 38/42] x86: Fix typo in mark_rodata_ro Date: Tue, 7 Jul 2015 13:20:24 -0700 Message-Id: <1436300428-21163-39-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1436300428-21163-1-git-send-email-yinghai@kernel.org> References: <1436300428-21163-1-git-send-email-yinghai@kernel.org> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1115 Lines: 33 In the comment, should use cleanup_highmap(). and also remove not needed cast for _brk_end, as it is unsigned long. Signed-off-by: Yinghai Lu --- arch/x86/mm/init_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 257ba4b..3b7453a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1054,9 +1054,9 @@ void mark_rodata_ro(void) * of the PMD will remain mapped executable. * * Any PMD which was setup after the one which covers _brk_end - * has been zapped already via cleanup_highmem(). + * has been zapped already via cleanup_highmap(). */ - all_end = roundup((unsigned long)_brk_end, PMD_SIZE); + all_end = roundup(_brk_end, PMD_SIZE); set_memory_nx(rodata_start, (all_end - rodata_start) >> PAGE_SHIFT); rodata_test(); -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/