diff mbox

[1/2,V2] kvm tools: Drop ALIGN from bios.h

Message ID 1304454487-2539-1-git-send-email-levinsasha928@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sasha Levin May 3, 2011, 8:28 p.m. UTC
Drops align from bios.h, fixes related code to use
<linux/kernel.h> instead.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
 tools/kvm/include/kvm/bios.h |   13 -------------
 tools/kvm/mptable.c          |    1 +
 2 files changed, 1 insertions(+), 13 deletions(-)

Comments

Cyrill Gorcunov May 3, 2011, 8:35 p.m. UTC | #1
On 05/04/2011 12:28 AM, Sasha Levin wrote:
> Drops align from bios.h, fixes related code to use
> <linux/kernel.h> instead.
> 
> Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
> ---
...

Looks good to me, thanks Sasha. (I suspect it still builds and run, right? :)
diff mbox

Patch

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 <linux/kernel.h>
 #include <string.h>
 
 /*