From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755516AbbCRH3m (ORCPT ); Wed, 18 Mar 2015 03:29:42 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:37088 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755427AbbCRH33 (ORCPT ); Wed, 18 Mar 2015 03:29:29 -0400 From: Yinghai Lu To: Matt Fleming , "H. Peter Anvin" , Ingo Molnar , Jiri Kosina , Kees Cook , Borislav Petkov , Baoquan He Cc: Thomas Gleixner , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org Subject: [PATCH v5 18/19] x86, kaslr: Remove useless codes Date: Wed, 18 Mar 2015 00:28:25 -0700 Message-Id: <1426663706-23979-19-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1426663706-23979-1-git-send-email-yinghai@kernel.org> References: <1426663706-23979-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Baoquan He Several auxiliary functions and slots[] are not needed any more since struct slot_area is used to store the slot info of kaslr now. Hence remove them in this patch. Signed-off-by: Baoquan He --- arch/x86/boot/compressed/aslr.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c index 2f60f41..e3bd2e2 100644 --- a/arch/x86/boot/compressed/aslr.c +++ b/arch/x86/boot/compressed/aslr.c @@ -115,17 +115,6 @@ struct mem_vector { #define MEM_AVOID_MAX 4 static struct mem_vector mem_avoid[MEM_AVOID_MAX]; -static bool mem_contains(struct mem_vector *region, struct mem_vector *item) -{ - /* Item at least partially before region. */ - if (item->start < region->start) - return false; - /* Item at least partially after region. */ - if (item->start + item->size > region->start + region->size) - return false; - return true; -} - static bool mem_overlaps(struct mem_vector *one, struct mem_vector *two) { /* Item one is entirely before item two. */ @@ -251,9 +240,6 @@ mem_min_overlap(struct mem_vector *img, struct mem_vector *out) return min; } -static unsigned long slots[CONFIG_RANDOMIZE_BASE_MAX_OFFSET / - CONFIG_PHYSICAL_ALIGN]; - struct slot_area { unsigned long addr; int num; @@ -284,16 +270,6 @@ static void store_slot_info(struct mem_vector *region, unsigned long image_size) } } -static void slots_append(unsigned long addr) -{ - /* Overflowing the slots list should be impossible. */ - if (slot_max >= CONFIG_RANDOMIZE_BASE_MAX_OFFSET / - CONFIG_PHYSICAL_ALIGN) - return; - - slots[slot_max++] = addr; -} - static unsigned long slots_fetch_random(void) { unsigned long random; -- 1.8.4.5