From c55b696a92eb209899778f6a753b43ce9d091dc1 Mon Sep 17 00:00:00 2001 From: Yonghua Huang Date: Tue, 14 Aug 2018 00:46:00 +0800 Subject: [PATCH] HV: remove 'warm_reboot()'function and other minor cleanup - 'reboot.c' defines 'warm_reboot()' only, and this function is deprecated. - remove the eXecution attribute of 'mttr.h' Signed-off-by: Yonghua Huang Acked-by: Eddie Dong --- hypervisor/Makefile | 1 - hypervisor/arch/x86/debug/reboot.c | 12 ------------ hypervisor/include/arch/x86/mtrr.h | 0 hypervisor/include/arch/x86/reboot.h | 9 --------- 4 files changed, 22 deletions(-) delete mode 100644 hypervisor/arch/x86/debug/reboot.c mode change 100755 => 100644 hypervisor/include/arch/x86/mtrr.h delete mode 100644 hypervisor/include/arch/x86/reboot.h diff --git a/hypervisor/Makefile b/hypervisor/Makefile index b0588b712..397860057 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -149,7 +149,6 @@ C_SRCS += arch/x86/guest/vmsr.c C_SRCS += arch/x86/guest/instr_emul.c C_SRCS += arch/x86/guest/ucode.c C_SRCS += arch/x86/guest/pm.c -C_SRCS += arch/x86/debug/reboot.c C_SRCS += lib/spinlock.c C_SRCS += lib/udelay.c C_SRCS += lib/mdelay.c diff --git a/hypervisor/arch/x86/debug/reboot.c b/hypervisor/arch/x86/debug/reboot.c deleted file mode 100644 index 8fc5cb90f..000000000 --- a/hypervisor/arch/x86/debug/reboot.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (C) <2018> Intel Corporation - * SPDX-License-Identifier: BSD-3-Clause - */ -#include -#include - -int warm_reboot(void) -{ - pio_write8(0x6, 0xcf9); - return 0; -} diff --git a/hypervisor/include/arch/x86/mtrr.h b/hypervisor/include/arch/x86/mtrr.h old mode 100755 new mode 100644 diff --git a/hypervisor/include/arch/x86/reboot.h b/hypervisor/include/arch/x86/reboot.h deleted file mode 100644 index db502b1ae..000000000 --- a/hypervisor/include/arch/x86/reboot.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (C) <2018> Intel Corporation - * SPDX-License-Identifier: BSD-3-Clause - */ -#ifndef REBOOT_H -#define REBOOT_H - -int warm_reboot(void); -#endif