Andrew Morton commented out some stuff to make lguest compile. This
should actually make it work (in the latest -mm).
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
---
drivers/lguest/lguest.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
===================================================================
--- a/drivers/lguest/lguest.c
+++ b/drivers/lguest/lguest.c
@@ -34,7 +34,6 @@
#include <asm/desc.h>
#include <asm/setup.h>
#include <asm/e820.h>
-//#include <asm/pda.h>
#include <asm/mce.h>
/* Declarations for definitions in lguest_guest.S */
@@ -406,10 +409,6 @@ static unsigned lguest_patch(u8 type, u1
memcpy(insns, lguest_insns[type].start, insn_len);
return insn_len;
}
-
-/* From head.S */
-//extern void setup_pda(void);
-extern struct Xgt_desc_struct early_gdt_descr;
__init void lguest_init(void)
{
@@ -466,10 +465,8 @@ __init void lguest_init(void)
/* We use top of mem for initial pagetables. */
init_pg_tables_end = __pa(pg0);
- /* set up PDA descriptor */
-// setup_pda();
- load_gdt(&early_gdt_descr);
-// asm volatile ("mov %0, %%fs" : : "r" (__KERNEL_PDA) : "memory");
+ /* Set up per-cpu descriptor (pointing to master area) */
+ asm volatile ("mov %0, %%fs" : : "r" (__KERNEL_DS) : "memory");
reserve_top_address(lguest_data.reserve_mem);
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/virtualization
