Linux v3.18-rc5

- Disable debugging options.

10 files changed, 71 insertions, 278 deletions

diff --git a/Input-add-driver-for-the-Goodix-touchpanel.patch b/Input-add-driver-for-the-Goodix-touchpanel.patch
index 3be7cee56..96ddeceab 100644
--- a/Input-add-driver-for-the-Goodix-touchpanel.patch
+++ b/Input-add-driver-for-the-Goodix-touchpanel.patch
@@ -21,10 +21,10 @@ Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  create mode 100644 drivers/input/touchscreen/goodix.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 60b1163dba28..ec5ae9692f7c 100644
+index c444907ccd69..766848ecf8f5 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4140,6 +4140,12 @@ L:	linux-media@vger.kernel.org
+@@ -4154,6 +4154,12 @@ L:	linux-media@vger.kernel.org
  S:	Maintained
  F:	drivers/media/usb/go7007/
  
diff --git a/ahci-disable-MSI-instead-of-NCQ-on-Samsung-pci-e-SSD.patch b/ahci-disable-MSI-instead-of-NCQ-on-Samsung-pci-e-SSD.patch
deleted file mode 100644
index 64d0e44f7..000000000
--- a/ahci-disable-MSI-instead-of-NCQ-on-Samsung-pci-e-SSD.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Tejun Heo <tj@kernel.org>
-Date: Mon, 27 Oct 2014 10:30:52 -0400
-Subject: [PATCH] ahci: disable MSI instead of NCQ on Samsung pci-e SSDs on
- macbooks
-
-From 44aecdabc85087e7c299d7a28e095e2b91894a51 Mon Sep 17 00:00:00 2001
-From: Tejun Heo <tj@kernel.org>
-Date: Mon, 27 Oct 2014 10:22:56 -0400
-
-Samsung pci-e SSDs on macbooks failed miserably on NCQ commands, so
-67809f85d31e ("ahci: disable NCQ on Samsung pci-e SSDs on macbooks")
-disabled NCQ on them.  It turns out that NCQ is fine as long as MSI is
-not used, so let's turn off MSI and leave NCQ on.
-
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=60731
-Tested-by: <dorin@i51.org>
-Tested-by: Imre Kaloz <kaloz@openwrt.org>
-Cc: stable@vger.kernel.org
-Fixes: 67809f85d31e ("ahci: disable NCQ on Samsung pci-e SSDs on macbooks")
----
- drivers/ata/ahci.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
-index 5f039f191067..ef4b647b3ed2 100644
---- a/drivers/ata/ahci.c
-+++ b/drivers/ata/ahci.c
-@@ -60,6 +60,7 @@ enum board_ids {
- 	/* board IDs by feature in alphabetical order */
- 	board_ahci,
- 	board_ahci_ign_iferr,
-+	board_ahci_nomsi,
- 	board_ahci_noncq,
- 	board_ahci_nosntf,
- 	board_ahci_yes_fbs,
-@@ -121,6 +122,13 @@ static const struct ata_port_info ahci_port_info[] = {
- 		.udma_mask	= ATA_UDMA6,
- 		.port_ops	= &ahci_ops,
- 	},
-+	[board_ahci_nomsi] = {
-+		AHCI_HFLAGS	(AHCI_HFLAG_NO_MSI),
-+		.flags		= AHCI_FLAG_COMMON,
-+		.pio_mask	= ATA_PIO4,
-+		.udma_mask	= ATA_UDMA6,
-+		.port_ops	= &ahci_ops,
-+	},
- 	[board_ahci_noncq] = {
- 		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ),
- 		.flags		= AHCI_FLAG_COMMON,
-@@ -475,10 +483,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {
- 	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1062 */
- 
- 	/*
--	 * Samsung SSDs found on some macbooks.  NCQ times out.
--	 * https://bugzilla.kernel.org/show_bug.cgi?id=60731
-+	 * Samsung SSDs found on some macbooks.  NCQ times out if MSI is
-+	 * enabled.  https://bugzilla.kernel.org/show_bug.cgi?id=60731
- 	 */
--	{ PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_noncq },
-+	{ PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_nomsi },
- 
- 	/* Enmotus */
- 	{ PCI_DEVICE(0x1c44, 0x8000), board_ahci },
--- 
-1.9.3
-
diff --git a/arm64-__clear_user-handle-exceptions-on-strb.patch b/arm64-__clear_user-handle-exceptions-on-strb.patch
deleted file mode 100644
index 199da5e7c..000000000
--- a/arm64-__clear_user-handle-exceptions-on-strb.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Kyle McMartin <kyle@redhat.com>
-Date: Wed, 12 Nov 2014 16:07:44 -0500
-Subject: [PATCH] arm64: __clear_user: handle exceptions on strb
-
-ARM64 currently doesn't fix up faults on the single-byte (strb) case of
-__clear_user... which means that we can cause a nasty kernel panic as an
-ordinary user with any multiple PAGE_SIZE+1 read from /dev/zero.
-i.e.: dd if=/dev/zero of=foo ibs=1 count=1 (or ibs=65537, etc.)
-
-This is a pretty obscure bug in the general case since we'll only
-__do_kernel_fault (since there's no extable entry for pc) if the
-mmap_sem is contended. However, with CONFIG_DEBUG_VM enabled, we'll
-always fault.
-
-if (!down_read_trylock(&mm->mmap_sem)) {
-	if (!user_mode(regs) && !search_exception_tables(regs->pc))
-		goto no_context;
-retry:
-	down_read(&mm->mmap_sem);
-} else {
-	/*
-	 * The above down_read_trylock() might have succeeded in
-	 * which
-	 * case, we'll have missed the might_sleep() from
-	 * down_read().
-	 */
-	might_sleep();
-#ifdef CONFIG_DEBUG_VM
-	if (!user_mode(regs) && !search_exception_tables(regs->pc))
-		goto no_context;
-#endif
-}
-
-Fix that by adding an extable entry for the strb instruction, since it
-touches user memory, similar to the other stores in __clear_user.
-
-Signed-off-by: Kyle McMartin <kyle@redhat.com>
-Cc: stable@vger.kernel.org
----
- arch/arm64/lib/clear_user.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S
-index 6e0ed93d51fe..c17967fdf5f6 100644
---- a/arch/arm64/lib/clear_user.S
-+++ b/arch/arm64/lib/clear_user.S
-@@ -46,7 +46,7 @@ USER(9f, strh	wzr, [x0], #2	)
- 	sub	x1, x1, #2
- 4:	adds	x1, x1, #1
- 	b.mi	5f
--	strb	wzr, [x0]
-+USER(9f, strb	wzr, [x0]	)
- 5:	mov	x0, #0
- 	ret
- ENDPROC(__clear_user)
--- 
-1.9.3
-
diff --git a/config-generic b/config-generic
index 0cffdf916..0bf45a93d 100644
--- a/config-generic
+++ b/config-generic
@@ -1697,13 +1697,13 @@ CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_HT=y
 CONFIG_B43_PHY_G=y
 CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -4686,7 +4686,7 @@ CONFIG_PM_DEBUG=y
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_RUNTIME=y
 # CONFIG_PM_OPP is not set
 # CONFIG_PM_AUTOSLEEP is not set
diff --git a/config-nodebug b/config-nodebug
index 143433bf8..ed6913376 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -2,115 +2,115 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_LOCK_TORTURE_TEST=m
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_PROVE_RCU=y
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_PROVE_RCU is not set
 # CONFIG_PROVE_RCU_REPEATEDLY is not set
-CONFIG_DEBUG_PER_CPU_MAPS=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_CPUMASK_OFFSTACK=y
 
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAILSLAB=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAIL_MAKE_REQUEST=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
-CONFIG_FAIL_IO_TIMEOUT=y
-CONFIG_FAIL_MMC_REQUEST=y
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FAILSLAB is not set
+# CONFIG_FAIL_PAGE_ALLOC is not set
+# CONFIG_FAIL_MAKE_REQUEST is not set
+# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
+# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
+# CONFIG_FAIL_IO_TIMEOUT is not set
+# CONFIG_FAIL_MMC_REQUEST is not set
 
-CONFIG_LOCK_STAT=y
+# CONFIG_LOCK_STAT is not set
 
-CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
 
-CONFIG_ACPI_DEBUG=y
+# CONFIG_ACPI_DEBUG is not set
 
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_PI_LIST=y
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_PI_LIST is not set
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-CONFIG_DEBUG_OBJECTS_FREE=y
-CONFIG_DEBUG_OBJECTS_TIMERS=y
-CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+# CONFIG_DEBUG_OBJECTS_FREE is not set
+# CONFIG_DEBUG_OBJECTS_TIMERS is not set
+# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
-CONFIG_X86_PTDUMP=y
-CONFIG_EFI_PGT_DUMP=y
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
 
-CONFIG_CAN_DEBUG_DEVICES=y
+# CONFIG_CAN_DEBUG_DEVICES is not set
 
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
 
 
-CONFIG_DEBUG_NOTIFIERS=y
+# CONFIG_DEBUG_NOTIFIERS is not set
 
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
 
-CONFIG_MMIOTRACE=y
+# CONFIG_MMIOTRACE is not set
 
-CONFIG_DEBUG_CREDENTIALS=y
+# CONFIG_DEBUG_CREDENTIALS is not set
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 
-CONFIG_EXT4_DEBUG=y
+# CONFIG_EXT4_DEBUG is not set
 
 # CONFIG_XFS_WARN is not set
 
-CONFIG_DEBUG_PERF_USE_VMALLOC=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 
-CONFIG_JBD2_DEBUG=y
+# CONFIG_JBD2_DEBUG is not set
 
-CONFIG_NFSD_FAULT_INJECTION=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 
-CONFIG_DEBUG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 
-CONFIG_DRBD_FAULT_INJECTION=y
+# CONFIG_DRBD_FAULT_INJECTION is not set
 
-CONFIG_ATH_DEBUG=y
-CONFIG_CARL9170_DEBUGFS=y
-CONFIG_IWLWIFI_DEVICE_TRACING=y
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_CARL9170_DEBUGFS is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
 
 # CONFIG_RTLWIFI_DEBUG is not set
 
-CONFIG_DEBUG_OBJECTS_WORK=y
+# CONFIG_DEBUG_OBJECTS_WORK is not set
 
-CONFIG_DMADEVICES_DEBUG=y
-CONFIG_DMADEVICES_VDEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMADEVICES_VDEBUG is not set
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-CONFIG_CEPH_LIB_PRETTYDEBUG=y
-CONFIG_QUOTA_DEBUG=y
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_QUOTA_DEBUG is not set
 
 
 CONFIG_KGDB_KDB=y
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 
-CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
+# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
 # CONFIG_PERCPU_TEST is not set
-CONFIG_TEST_LIST_SORT=y
+# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 
-CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 
-CONFIG_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
 CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
@@ -121,7 +121,7 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 
 # CONFIG_SPI_DEBUG is not set
 
-CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_LATENCYTOP is not set
diff --git a/config-x86-generic b/config-x86-generic
index ddaa58cdc..88347fede 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -338,7 +338,7 @@ CONFIG_SP5100_TCO=m
 
 # CONFIG_MEMTEST is not set
 # CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
 
 
 CONFIG_HP_ILO=m
diff --git a/kernel-arm64.patch b/kernel-arm64.patch
index b3f7e3e59..9295ab991 100644
--- a/kernel-arm64.patch
+++ b/kernel-arm64.patch
@@ -1772,7 +1772,6 @@ Date:   Wed Oct 8 16:11:27 2014 +0200
  arch/arm64/kernel/vmlinux.lds.S                  |  17 +
  arch/arm64/kvm/hyp.S                             |   4 +-
  arch/arm64/mm/dma-mapping.c                      | 103 +++
- arch/arm64/mm/mmu.c                              |   2 +-
  arch/arm64/pci/Makefile                          |   2 +
  arch/arm64/pci/mmconfig.c                        | 292 +++++++++
  arch/arm64/pci/pci.c                             | 461 ++++++++++++++
@@ -4750,17 +4749,6 @@ index d920942..705a9ce 100644
  	return swiotlb_late_init_with_default_size(swiotlb_size);
 diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
 index 0bf90d2..f4f8b50 100644
---- a/arch/arm64/mm/mmu.c
-+++ b/arch/arm64/mm/mmu.c
-@@ -202,7 +202,7 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
- }
- 
- static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
--				  unsigned long end, unsigned long phys,
-+				  unsigned long end, phys_addr_t phys,
- 				  int map_io)
- {
- 	pud_t *pud;
 diff --git a/arch/arm64/pci/Makefile b/arch/arm64/pci/Makefile
 new file mode 100644
 index 0000000..7038b51
diff --git a/kernel.spec b/kernel.spec
index 425bc1b94..06c0e41ac 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 4
+%define rcrev 5
 # The git snapshot level
-%define gitrev 2
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -124,7 +124,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -607,19 +607,10 @@ Patch26058: asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
 #rhbz 1111138
 Patch26059: i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch
 
-#rhbz 1158204 1157157
-Patch26063: x86-microcode-AMD-Fix-early-ucode-loading-on-32-bit.patch
-
 Patch26064: Input-add-driver-for-the-Goodix-touchpanel.patch
 
 Patch26065: sched-Remove-lockdep-check-in-sched_move_task.patch
 
-#rhbz 1161805
-Patch26066: ahci-disable-MSI-instead-of-NCQ-on-Samsung-pci-e-SSD.patch
-
-#CVE-2014-7843 rhbz 1163744 1163745
-Patch26069: arm64-__clear_user-handle-exceptions-on-strb.patch
-
 #rhbz 1135338
 Patch26070: HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch
 
@@ -1339,19 +1330,10 @@ ApplyPatch asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
 #rhbz 1111138
 ApplyPatch i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch
 
-#rhbz 1158204 1157157
-ApplyPatch x86-microcode-AMD-Fix-early-ucode-loading-on-32-bit.patch
-
 ApplyPatch Input-add-driver-for-the-Goodix-touchpanel.patch
 
 ApplyPatch sched-Remove-lockdep-check-in-sched_move_task.patch
 
-#rhbz 1161805
-ApplyPatch ahci-disable-MSI-instead-of-NCQ-on-Samsung-pci-e-SSD.patch
-
-#CVE-2014-7843 rhbz 1163744 1163745
-ApplyPatch arm64-__clear_user-handle-exceptions-on-strb.patch
-
 #rhbz 1135338
 ApplyPatch HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch
 
@@ -2223,6 +2205,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Mon Nov 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc5.git0.1
+- Linux v3.18-rc5
+- Disable debugging options.
+
 * Fri Nov 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Enable I40EVF driver (rhbz 1164029)
 
diff --git a/sources b/sources
index f4395aecf..105408a10 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 fb30d0f29214d75cddd2faa94f73d5cf  linux-3.17.tar.xz
 159e969cbc27201d8e2fa0f609dc722f  perf-man-3.17.tar.gz
-587ecff959eff7392c4977c513580f44  patch-3.18-rc4.xz
-eaaef1d4eaf53e64e5b54c12f5dcdf0b  patch-3.18-rc4-git2.xz
+852725a732b5e21318324296f1940dfd  patch-3.18-rc5.xz
diff --git a/x86-microcode-AMD-Fix-early-ucode-loading-on-32-bit.patch b/x86-microcode-AMD-Fix-early-ucode-loading-on-32-bit.patch
deleted file mode 100644
index 93887f247..000000000
--- a/x86-microcode-AMD-Fix-early-ucode-loading-on-32-bit.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Borislav Petkov <bp@alien8.de>
-Date: Sat, 1 Nov 2014 11:01:00 +0100
-Subject: [PATCH] x86, microcode, AMD: Fix early ucode loading on 32-bit
-
-Hi guys,
-
-please queue this for the next batch to Linus.
-
-Thanks.
----
- arch/x86/kernel/cpu/microcode/amd_early.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/arch/x86/kernel/cpu/microcode/amd_early.c b/arch/x86/kernel/cpu/microcode/amd_early.c
-index 7aa1acc79789..8b75f7050129 100644
---- a/arch/x86/kernel/cpu/microcode/amd_early.c
-+++ b/arch/x86/kernel/cpu/microcode/amd_early.c
-@@ -348,6 +348,7 @@ int __init save_microcode_in_initrd_amd(void)
- {
- 	unsigned long cont;
- 	enum ucode_state ret;
-+	u8 *cont_va;
- 	u32 eax;
- 
- 	if (!container)
-@@ -355,13 +356,15 @@ int __init save_microcode_in_initrd_amd(void)
- 
- #ifdef CONFIG_X86_32
- 	get_bsp_sig();
--	cont = (unsigned long)container;
-+	cont	= (unsigned long)container;
-+	cont_va = __va(container);
- #else
- 	/*
- 	 * We need the physical address of the container for both bitness since
- 	 * boot_params.hdr.ramdisk_image is a physical address.
- 	 */
--	cont = __pa(container);
-+	cont    = __pa(container);
-+	cont_va = container;
- #endif
- 
- 	/*
-@@ -372,6 +375,8 @@ int __init save_microcode_in_initrd_amd(void)
- 	if (relocated_ramdisk)
- 		container = (u8 *)(__va(relocated_ramdisk) +
- 			     (cont - boot_params.hdr.ramdisk_image));
-+	else
-+		container = cont_va;
- 
- 	if (ucode_new_rev)
- 		pr_info("microcode: updated early to new patch_level=0x%08x\n",
--- 
-1.9.3
-