[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging] x86: Drop mach-default/bios_ebda.h



commit b80c5357941efb23fe58c8ee54a5f34fc1387fd0
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Nov 8 19:35:04 2024 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Nov 11 15:25:39 2024 +0000

    x86: Drop mach-default/bios_ebda.h
    
    It has a single function, and a single user.  This is unlikely to change
    moving forwards so fold it into mpparse.c.
    
    Update it to use an explicit uint16_t cast, rather than assuming the width 
of
    short.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/include/asm/mach-default/bios_ebda.h | 15 ---------------
 xen/arch/x86/mpparse.c                            |  9 +++++++--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/xen/arch/x86/include/asm/mach-default/bios_ebda.h 
b/xen/arch/x86/include/asm/mach-default/bios_ebda.h
deleted file mode 100644
index 42de6b2a5b..0000000000
--- a/xen/arch/x86/include/asm/mach-default/bios_ebda.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _MACH_BIOS_EBDA_H
-#define _MACH_BIOS_EBDA_H
-
-/*
- * there is a real-mode segmented pointer pointing to the
- * 4K EBDA area at 0x40E.
- */
-static inline unsigned int get_bios_ebda(void)
-{
-       unsigned int address = *(unsigned short *)maddr_to_virt(0x40E);
-       address <<= 4;
-       return address; /* 0 means none */
-}
-
-#endif /* _MACH_BIOS_EBDA_H */
diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index b16c105b18..e74a714f50 100644
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -31,8 +31,6 @@
 #include <asm/io_apic.h>
 #include <asm/setup.h>
 
-#include <bios_ebda.h>
-
 /* Have we found an MP table */
 bool __initdata smp_found_config;
 
@@ -734,6 +732,13 @@ static void __init efi_check_config(void)
                efi_unmap_mpf();
 }
 
+static unsigned int get_bios_ebda(void)
+{
+       unsigned int address = *(uint16_t *)maddr_to_virt(0x40e);
+
+       return address << 4; /* 0 means none */
+}
+
 void __init find_smp_config (void)
 {
        unsigned int address;
--
generated by git-patchbot for /home/xen/git/xen.git#staging



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.