From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751485AbbAaGaM (ORCPT ); Sat, 31 Jan 2015 01:30:12 -0500 Received: from mail-la0-f54.google.com ([209.85.215.54]:52092 "EHLO mail-la0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323AbbAaGaK (ORCPT ); Sat, 31 Jan 2015 01:30:10 -0500 From: Alexander Kuleshov To: Chris Mason Cc: Josef Bacik , David Sterba , linux-kernel@vger.kernel.org, Alexander Kuleshov Subject: [PATCH v2 1/2] x86: use already defined KEEP_SEGMENTS macro from bootparam.h Date: Sat, 31 Jan 2015 12:30:04 +0600 Message-Id: <1422685804-5863-1-git-send-email-kuleshovmail@gmail.com> X-Mailer: git-send-email 2.3.0-rc1 In-Reply-To: <1422685775-5804-1-git-send-email-kuleshovmail@gmail.com> References: <1422685775-5804-1-git-send-email-kuleshovmail@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is already defined macro KEEP_SEGMENTS in the bootparam.h, let's use it instead of shifting bits Signed-off-by: Alexander Kuleshov --- arch/x86/kernel/head_32.S | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index f36bd42..fba3990 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -22,7 +22,8 @@ #include #include #include - +#include + /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET) @@ -89,8 +90,8 @@ ENTRY(startup_32) movl pa(stack_start),%ecx /* test KEEP_SEGMENTS flag to see if the bootloader is asking - us to not reload segments */ - testb $(1<<6), BP_loadflags(%esi) + us to not reload segments */ + testb $KEEP_SEGMENTS, BP_loadflags(%esi) jnz 2f /* -- 2.3.0-rc1