From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH 1/2 V2] kvm tools: Drop ALIGN from bios.h Date: Tue, 3 May 2011 23:28:06 +0300 Message-ID: <1304454487-2539-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-ww0-f44.google.com ([74.125.82.44]:61228 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753875Ab1ECU2e (ORCPT ); Tue, 3 May 2011 16:28:34 -0400 Received: by wwa36 with SMTP id 36so489017wwa.1 for ; Tue, 03 May 2011 13:28:33 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: Drops align from bios.h, fixes related code to use instead. Signed-off-by: Sasha Levin --- tools/kvm/include/kvm/bios.h | 13 ------------- tools/kvm/mptable.c | 1 + 2 files changed, 1 insertions(+), 13 deletions(-) diff --git a/tools/kvm/include/kvm/bios.h b/tools/kvm/include/kvm/bios.h index 914720b..7586e2a 100644 --- a/tools/kvm/include/kvm/bios.h +++ b/tools/kvm/include/kvm/bios.h @@ -51,19 +51,6 @@ #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 - * addressing easy to compute, dont change it otherwise you - * may break local variables offsets in BIOS irq routines - */ -#define BIOS_NEXT_IRQ_ADDR(addr, size) \ - ALIGN((addr + size + 1), 16) - /* * When interfere with assembler code we need to be sure how * arguments are passed in real mode. diff --git a/tools/kvm/mptable.c b/tools/kvm/mptable.c index 5bbe7ea..b74c491 100644 --- a/tools/kvm/mptable.c +++ b/tools/kvm/mptable.c @@ -4,6 +4,7 @@ #include "kvm/mptable.h" #include "kvm/util.h" +#include #include /* -- 1.7.5.rc3