diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-10-11 08:45:11 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-10-11 08:45:59 -0400 |
| commit | b2efe0138ea23e1f9d2e4b5b622f0863c239ca6d (patch) | |
| tree | 632ef828072a6d6b333440d21ddc915f895daa63 | |
| parent | 220cb1c7cb10259793d1126a9dbbf8943209dd28 (diff) | |
| download | kernel-b2efe0138ea23e1f9d2e4b5b622f0863c239ca6d.tar.gz kernel-b2efe0138ea23e1f9d2e4b5b622f0863c239ca6d.tar.xz kernel-b2efe0138ea23e1f9d2e4b5b622f0863c239ca6d.zip | |
Disable Xen balloon memory hotplug support (rhbz 744408)
| -rw-r--r-- | config-x86_64-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 15277d705..64710294d 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -80,7 +80,7 @@ CONFIG_SGI_GRU=m # CONFIG_VIDEO_CAFE_CCIC is not set CONFIG_XEN_MAX_DOMAIN_MEMORY=32 -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_SYS_HYPERVISOR=y diff --git a/kernel.spec b/kernel.spec index 445f1536d..f9387e9c6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2059,6 +2059,9 @@ fi # ||----w | # || || %changelog +* Tue Oct 11 2011 Josh Boyer <jwboyer@redhat.com> +- Disable CONFIG_XEN_BALLOON_MEMORY_HOTPLUG (rhbz 744408) + * Thu Oct 06 2011 Josh Boyer <jwboyer@redhat.com> - Add patch to fix base frequency check for Ricoh e823 devices (rhbz 722509) |