diff options
Diffstat (limited to 'arch/x86/xen/setup.c')
-rw-r--r-- | arch/x86/xen/setup.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 769c4b01fa32..38fdffaa71d3 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c | |||
@@ -248,8 +248,7 @@ char * __init xen_memory_setup(void) | |||
248 | else | 248 | else |
249 | extra_pages = 0; | 249 | extra_pages = 0; |
250 | 250 | ||
251 | if (!xen_initial_domain()) | 251 | xen_add_extra_mem(extra_pages); |
252 | xen_add_extra_mem(extra_pages); | ||
253 | 252 | ||
254 | return "Xen"; | 253 | return "Xen"; |
255 | } | 254 | } |
@@ -337,9 +336,6 @@ void __cpuinit xen_enable_syscall(void) | |||
337 | 336 | ||
338 | void __init xen_arch_setup(void) | 337 | void __init xen_arch_setup(void) |
339 | { | 338 | { |
340 | struct physdev_set_iopl set_iopl; | ||
341 | int rc; | ||
342 | |||
343 | xen_panic_handler_init(); | 339 | xen_panic_handler_init(); |
344 | 340 | ||
345 | HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments); | 341 | HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments); |
@@ -356,11 +352,6 @@ void __init xen_arch_setup(void) | |||
356 | xen_enable_sysenter(); | 352 | xen_enable_sysenter(); |
357 | xen_enable_syscall(); | 353 | xen_enable_syscall(); |
358 | 354 | ||
359 | set_iopl.iopl = 1; | ||
360 | rc = HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl); | ||
361 | if (rc != 0) | ||
362 | printk(KERN_INFO "physdev_op failed %d\n", rc); | ||
363 | |||
364 | #ifdef CONFIG_ACPI | 355 | #ifdef CONFIG_ACPI |
365 | if (!(xen_start_info->flags & SIF_INITDOMAIN)) { | 356 | if (!(xen_start_info->flags & SIF_INITDOMAIN)) { |
366 | printk(KERN_INFO "ACPI in unprivileged domain disabled\n"); | 357 | printk(KERN_INFO "ACPI in unprivileged domain disabled\n"); |