kvm tools: Drop ALIGN from bios.h

Drops align from bios.h, fixes related code to use
<linux/kernel.h> instead.

Acked-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/include/kvm/bios.h b/tools/kvm/include/kvm/bios.h
index 914720b22a8b1ec543954d55adb7a17c2823b1c0..7586e2a3d4cda6d2a3d88dfcffb003704e449397 100644 (file)
--- 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 5bbe7eada3b6f3e351ed8820d1a3c690d5dde8cc..b74c491369dd895728220130ef2f39fcb1175909 100644 (file)
--- 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>
 
 /*