From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752058AbbAaGa0 (ORCPT ); Sat, 31 Jan 2015 01:30:26 -0500 Received: from mail-la0-f41.google.com ([209.85.215.41]:57370 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbbAaGaT (ORCPT ); Sat, 31 Jan 2015 01:30:19 -0500 From: Alexander Kuleshov To: Chris Mason Cc: Josef Bacik , David Sterba , linux-kernel@vger.kernel.org, Alexander Kuleshov Subject: [PATCH v2 2/2] x86/boot: use already defined KEEP_SEGMENTS macro in head_{32,64}.S Date: Sat, 31 Jan 2015 12:30:13 +0600 Message-Id: <1422685813-5921-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/boot/compressed/head_32.S | 5 +++-- arch/x86/boot/compressed/head_64.S | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S index 1d7fbbc..11e549d 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S @@ -29,7 +29,8 @@ #include #include #include - +#include + __HEAD ENTRY(startup_32) #ifdef CONFIG_EFI_STUB @@ -102,7 +103,7 @@ preferred_addr: * Test KEEP_SEGMENTS flag to see if the bootloader is asking * us to not reload segments */ - testb $(1<<6), BP_loadflags(%esi) + testb $KEEP_SEGMENTS, BP_loadflags(%esi) jnz 1f cli diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index 6b1766c..90c1521 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S @@ -31,6 +31,7 @@ #include #include #include +#include __HEAD .code32 @@ -46,7 +47,7 @@ ENTRY(startup_32) * Test KEEP_SEGMENTS flag to see if the bootloader is asking * us to not reload segments */ - testb $(1<<6), BP_loadflags(%esi) + testb $KEEP_SEGMENTS, BP_loadflags(%esi) jnz 1f cli -- 2.3.0-rc1