Commit cfee63b6 authored by Charles Jacobsen's avatar Charles Jacobsen Committed by Vikram Narayanan

Finished tweaking build setup (will test modprobe next).

Some simple renaming
-- LCD => LCD_DOMAINS
-- core.c => lcd-domains.c
-- new LCD_VMX_INTEL configuration

Adjusted virt/lcd/Kconfig to reflect LCD_DOMAINS dependency
on LCD_VMX_INTEL.
parent 62e4ac37
......@@ -11,7 +11,7 @@ obj-$(CONFIG_XEN) += xen/
obj-$(CONFIG_LGUEST_GUEST) += lguest/
# Lightweight Capability Domains (LCD)
obj-$(CONFIG_LCD) += lcd/
obj-$(CONFIG_LCD_VMX_INTEL) += lcd/
# LCD paravirtualization support
obj-$(CONFIG_LCD_GUEST) += lcdguest/
......
......@@ -4,4 +4,4 @@
ccflags-y += -Werror
obj-$(CONFIG_LCD) += lcd-vmx.o
\ No newline at end of file
obj-$(CONFIG_LCD_VMX_INTEL) += lcd-vmx.o
\ No newline at end of file
......@@ -612,6 +612,7 @@ failed1:
free_page((unsigned long)msr_bitmap);
return ret;
}
EXPORT_SYMBOL(lcd_vmx_init);
void lcd_vmx_exit(void)
{
......@@ -619,3 +620,4 @@ void lcd_vmx_exit(void)
vmx_free_vmxon_areas();
free_page((unsigned long)msr_bitmap);
}
EXPORT_SYMBOL(lcd_vmx_exit);
menu "Virtualization (2)"
menuconfig VIRTUALIZATION2
bool "Virtualization (2)"
depends on X86_64
default y
---help---
Virtualization for LCDs.
if VIRTUALIZATION2
source "virt/lcd/Kconfig"
endmenu
endif
#
# Makefile for the virtualization
#
obj-y += lib/
obj-$(CONFIG_LCD) += lcd/
obj-$(CONFIG_LCD_DOMAINS) += lcd/
......@@ -2,9 +2,17 @@
# LCD configuration
#
config LCD
tristate "Light-weight Capability Domains"
depends on X86_64
default y
---help---
Light-weight Capability Domains for Linux.
config LCD_DOMAINS
tristate "Light-weight Capability Domains"
depends on X86_64
depends on LCD_VMX_INTEL
default y
---help---
Light-weight Capability Domains for Linux.
config LCD_VMX_INTEL
tristate "Intel support for LCDs"
depends on X86_64
default y
---help---
Intel-specific code for using LCDs.
\ No newline at end of file
......@@ -2,8 +2,6 @@
# One (and only) build file for LCD system.
#
ccflags-y += -Werror
ccflags-y += -Werror
obj-$(CONFIG_LCD) += core.o
lcd-y += arch/$(ARCH)/lcd/lcd-vmx.o
obj-$(CONFIG_LCD_DOMAINS) += lcd-domains.o
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment