From patchwork Thu Apr 28 13:40:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 739281 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3SDf9xV008342 for ; Thu, 28 Apr 2011 13:41:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932575Ab1D1NlE (ORCPT ); Thu, 28 Apr 2011 09:41:04 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=hLETRIuXG+8l2g2wDzNOSSZ227iqhybD04d0MBPLTVE=; b=Ctn8IROjWI1OskrUX50F1dduKq2TLvT9IBVTPEl6HRrRQZxZ2YfmQhgVJVApYgWOPm F9E47iozBSgwvwGXa1wduGE9eZ/rgd1qls5i6BhJpy7uhwr5bMkUl21jBg7z0ycnCmjM Jkd9LoYOh/0lSk48eL1xUBwdMHL4SGaRmuaV8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=wdJhdDPwC1lvrbMjNx48d+9ZsIUE0C58NHwyXoCW71OVpfI22q5vdsRMGujn2jygGE f3WlyMTJVXq9WOJZwcL3ReR//k0ploLFNVA0/z3F98xaDlKGlVFBPaUC8Luu6jR8oCcJ LgqQwCCH1uKCtfKI3CgyqvgB0ddZDzzxphoHk= Received: by 10.204.7.156 with SMTP id d28mr3364844bkd.28.1303998061227; Thu, 28 Apr 2011 06:41:01 -0700 (PDT) Received: from localhost.localdomain ([188.120.129.206]) by mx.google.com with ESMTPS id w3sm1033795bkt.17.2011.04.28.06.40.58 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Apr 2011 06:41:00 -0700 (PDT) From: Sasha Levin To: penberg@kernel.org Cc: mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, prasadjoshi124@gmail.com, kvm@vger.kernel.org, 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> X-Mailer: git-send-email 1.7.5.rc3 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Apr 2011 13:41:09 +0000 (UTC) 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