tg3: Remove tg3_config_info definition

[net-next-2.6.git] / virt / kvm / kvm_main.c

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index b8499f544e1dcacd510001e5c3d1f89bf5ea8802..5225052aebc15d28709359b7ee365f0490035203 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -5,7 +5,7 @@
  * machines without emulation or binary translation.
  *
  * Copyright (C) 2006 Qumranet, Inc.
- * Copyright 2010 Red Hat, Inc. and/or its affilates.
+ * Copyright 2010 Red Hat, Inc. and/or its affiliates.
  *
  * Authors:
  *   Avi Kivity   <avi@qumranet.com>
@@ -705,14 +705,12 @@ skip_lpage:
        if (r)
                goto out_free;
 
-#ifdef CONFIG_DMAR
        /* map the pages in iommu page table */
        if (npages) {
                r = kvm_iommu_map_pages(kvm, &new);
                if (r)
                        goto out_free;
        }
-#endif
 
        r = -ENOMEM;
        slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
@@ -1351,6 +1349,7 @@ static struct file_operations kvm_vcpu_fops = {
        .unlocked_ioctl = kvm_vcpu_ioctl,
        .compat_ioctl   = kvm_vcpu_ioctl,
        .mmap           = kvm_vcpu_mmap,
+       .llseek         = noop_llseek,
 };
 
 /*
@@ -1820,6 +1819,7 @@ static struct file_operations kvm_vm_fops = {
        .compat_ioctl   = kvm_vm_compat_ioctl,
 #endif
        .mmap           = kvm_vm_mmap,
+       .llseek         = noop_llseek,
 };
 
 static int kvm_dev_ioctl_create_vm(void)
@@ -1913,6 +1913,7 @@ out:
 static struct file_operations kvm_chardev_ops = {
        .unlocked_ioctl = kvm_dev_ioctl,
        .compat_ioctl   = kvm_dev_ioctl,
+       .llseek         = noop_llseek,
 };
 
 static struct miscdevice kvm_dev = {