rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop neuter_intel_microcode_load.patch (rhbz 690930)

Browse Source
This commit is contained in:
Dave Jones 2011-08-04 13:19:26 -04:00
parent 3205070880
commit 85b3aab0f0
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -641,8 +641,6 @@ Patch12010: add-appleir-usb-driver.patch
Patch12016: disable-i8042-check-on-apple-mac.patch
Patch12018: neuter_intel_microcode_load.patch
Patch12022: fix-cdc-ncm-dma-stack-vars.patch
Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.patch
@ -1197,8 +1195,6 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch
ApplyPatch add-appleir-usb-driver.patch
ApplyPatch neuter_intel_microcode_load.patch
ApplyPatch fix-cdc-ncm-dma-stack-vars.patch
ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch
@ -1825,6 +1821,9 @@ fi
# and build.
%changelog
* Thu Aug 04 2011 Dave Jones <davej@redhat.com>
- Drop neuter_intel_microcode_load.patch (rhbz 690930)
* Wed Aug 03 2011 Dave Jones <davej@redhat.com>
- iwlagn: check for !priv->txq in iwlagn_wait_tx_queue_empty (rhbz 728044)

24
neuter_intel_microcode_load.patch
View File

@ -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,