aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2015-06-01 15:51:12 +0100
committerWill Deacon <will.deacon@arm.com>2015-06-01 17:54:09 +0100
commit9759db0dd916586ff022f5d16bde5ab52cc05e83 (patch)
tree4dd065b4edbd41150351e4a751e4a6c447d8467f
parent813359ed4ad84c785148ab2d321031fe159456ad (diff)
downloadkvmtool-9759db0dd916586ff022f5d16bde5ab52cc05e83.tar.gz
kvmtool: move include/bios/memcpy.h to x86/include/asm/bios
This file contains a prototype solely used by the BIOS blob code for x86 systems. Make this clear by moving the include file into the x86 directory. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--x86/bios/int10.c2
-rw-r--r--x86/bios/memcpy.c2
-rw-r--r--x86/include/asm/bios/memcpy.h (renamed from include/bios/memcpy.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/x86/bios/int10.c b/x86/bios/int10.c
index 2ea46980..d164cf5c 100644
--- a/x86/bios/int10.c
+++ b/x86/bios/int10.c
@@ -1,7 +1,7 @@
#include "kvm/bios.h"
#include "kvm/vesa.h"
-#include "bios/memcpy.h"
+#include "asm/bios/memcpy.h"
#include "asm/bios/vesa.h"
diff --git a/x86/bios/memcpy.c b/x86/bios/memcpy.c
index 40b9b65f..2be3a270 100644
--- a/x86/bios/memcpy.c
+++ b/x86/bios/memcpy.c
@@ -1,4 +1,4 @@
-#include "bios/memcpy.h"
+#include "asm/bios/memcpy.h"
/*
* Copy memory area in 16-bit real mode.
diff --git a/include/bios/memcpy.h b/x86/include/asm/bios/memcpy.h
index eec9d20a..eec9d20a 100644
--- a/include/bios/memcpy.h
+++ b/x86/include/asm/bios/memcpy.h