diff options
| author | Yaniv Kamay <ykamay@redhat.com> | 2009-09-24 16:38:32 +0300 |
|---|---|---|
| committer | Yaniv Kamay <ykamay@redhat.com> | 2009-09-24 16:38:32 +0300 |
| commit | fb2e4fa73744c5a4b1ca592e96396f97878dfe2f (patch) | |
| tree | 31e9eaa65e0bdb29d10da168748eeb8ab023bf02 | |
| parent | 96e43a71aff1c5fcb3506dee3edc89acead708ca (diff) | |
fix build on f11
| -rw-r--r-- | kernel/Makefile | 2 | ||||
| -rw-r--r-- | kernel/external-module-compat-comm.h | 5 | ||||
| -rwxr-xr-x | qemu/configure | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 34fdf747..c0f636c4 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -49,7 +49,7 @@ all:: header-link prerequisite "$$@" ifndef SKIP_KSM cp Module.symvers ksm - $(MAKE) -C $(KERNELDIR) M=`pwd`/ksm \ +# $(MAKE) -C $(KERNELDIR) M=`pwd`/ksm \ LINUXINCLUDE="-I`pwd`/include -Iinclude \ $(if $(KERNELSOURCEDIR),-Iinclude2 -I$(KERNELSOURCEDIR)/include) \ -Iarch/${ARCH_DIR}/include -I`pwd`/include-compat \ diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h index ae7acfdd..e324f781 100644 --- a/kernel/external-module-compat-comm.h +++ b/kernel/external-module-compat-comm.h @@ -577,10 +577,7 @@ struct rchan *kvm_relay_open(const char *base_filename, #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) && \ - (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,4) || \ - !defined(CONFIG_X86_64))) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) static inline int kvm_get_user_pages_fast(unsigned long start, int nr_pages, int write, struct page **pages) diff --git a/qemu/configure b/qemu/configure index 052fd497..e832d414 100755 --- a/qemu/configure +++ b/qemu/configure @@ -181,7 +181,7 @@ usb_msd="yes" usb_wacom="yes" usb_serial="yes" usb_net="yes" -usb_bluez="yes" +usb_bluez="no" vmware="yes" nbd="yes" x86_only_generic_cpus="no" @@ -841,6 +841,7 @@ EOF kvm_cap_device_assignment="yes" fi fi +kvm_cap_device_assignment="no" # libpci probe for kvm_cap_device_assignment if test $kvm_cap_device_assignment = "yes" ; then |