diff options
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | neuter_intel_microcode_load.patch | 24 |
2 files changed, 3 insertions, 28 deletions
diff --git a/kernel.spec b/kernel.spec index 7f7d6accc..2fc1bfa07 100644 --- a/kernel.spec +++ b/kernel.spec @@ -677,8 +677,6 @@ Patch12010: add-appleir-usb-driver.patch Patch12016: disable-i8042-check-on-apple-mac.patch -Patch12018: neuter_intel_microcode_load.patch - Patch12021: udlfb-bind-framebuffer-to-interface.patch Patch12022: fix-cdc-ncm-dma-stack-vars.patch @@ -1257,8 +1255,6 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch ApplyPatch add-appleir-usb-driver.patch -ApplyPatch neuter_intel_microcode_load.patch - ApplyPatch udlfb-bind-framebuffer-to-interface.patch ApplyPatch fix-cdc-ncm-dma-stack-vars.patch ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch @@ -1895,6 +1891,9 @@ fi # ||----w | # || || %changelog +* Thu Aug 04 2011 Dave Jones <davej@redhat.com> +- Drop neuter_intel_microcode_load.patch (rhbz 690930) + * Thu Aug 04 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.0-git19 - Add patch to fix epoll backtrace (rhbz 722472) diff --git a/neuter_intel_microcode_load.patch b/neuter_intel_microcode_load.patch deleted file mode 100644 index 2766e439d..000000000 --- a/neuter_intel_microcode_load.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c -index ebd193e..c57024a 100644 ---- a/arch/x86/kernel/microcode_intel.c -+++ b/arch/x86/kernel/microcode_intel.c -@@ -453,9 +453,18 @@ static void microcode_fini_cpu(int cpu) - uci->mc = NULL; - } - -+/* we don't ship the broken out files... -+ * instead, we'll just fail here, and load it with microcode_ctl -+ */ -+static enum ucode_state noop_request_microcode_fw(int cpu, -+ struct device *device) -+{ -+ return UCODE_NFOUND; -+} -+ - static struct microcode_ops microcode_intel_ops = { - .request_microcode_user = request_microcode_user, -- .request_microcode_fw = request_microcode_fw, -+ .request_microcode_fw = noop_request_microcode_fw, - .collect_cpu_info = collect_cpu_info, - .apply_microcode = apply_microcode, - .microcode_fini_cpu = microcode_fini_cpu, |