Merge branch 'x86/vmware' into x86/trampoline

2026-09-26 18:16:26 +00:00 · 2010-10-20 13:18:17 -07:00 · 2010-10-20 13:18:17 -07:00 · e44dea35cc
commit e44dea35cc
parent 51ea8a88aa b0f4c062fb
15 changed files with 5 additions and 1648 deletions
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
--- a/arch/x86/include/asm/vmi.h
+++ b/arch/x86/include/asm/vmi.h
--- a/arch/x86/include/asm/vmi_time.h
+++ b/arch/x86/include/asm/vmi_time.h
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
--- a/arch/x86/kernel/vmiclock_32.c
+++ b/arch/x86/kernel/vmiclock_32.c
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c