From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH 1/6] kvm tools: Prevent duplicate definitions of ALIGN Date: Thu, 28 Apr 2011 16:40:40 +0300 Message-ID: <1303998045-22932-1-git-send-email-levinsasha928@gmail.com> Cc: mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, prasadjoshi124@gmail.com, kvm@vger.kernel.org, Sasha Levin To: penberg@kernel.org Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:52574 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932537Ab1D1NlD (ORCPT ); Thu, 28 Apr 2011 09:41:03 -0400 Received: by bwz15 with SMTP id 15so2302490bwz.19 for ; Thu, 28 Apr 2011 06:41:01 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Sasha Levin --- tools/kvm/include/kvm/bios.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/kvm/include/kvm/bios.h b/tools/kvm/include/kvm/bios.h index dd70c44..914720b 100644 --- a/tools/kvm/include/kvm/bios.h +++ b/tools/kvm/include/kvm/bios.h @@ -51,8 +51,10 @@ #define MB_BIOS_SS 0xfff7 #define MB_BIOS_SP 0x40 +#ifndef ALIGN #define ALIGN(x, a) \ (((x) + ((a) - 1)) & ~((a) - 1)) +#endif /* * note we use 16 bytes alignment which makes segment based -- 1.7.5.rc3