Drop obsolete ARM LPAE patches

arm-lpae-ax88796.patch

@@ -1,21 +0,0 @@
-X-Git-Url: http://git.linaro.org/gitweb?p=people%2Fahs3%2Farndale-acpi.git;a=blobdiff_plain;f=drivers%2Fnet%2Fethernet%2F8390%2Fax88796.c;fp=drivers%2Fnet%2Fethernet%2F8390%2Fax88796.c;h=763e575c82bc5d24e1927ad685dfbdd7a0eaa19e;hp=70dba5d01ad3cc8178318f9976a5922894a86859;hb=fe8e7c500d3d25234759351096d457b6e557ebd9;hpb=af28003b46fa7b2c5d7b52e0d4bc8f725a6305f1
-
-diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
-index 70dba5d..763e575 100644
---- a/drivers/net/ethernet/8390/ax88796.c
-+++ b/drivers/net/ethernet/8390/ax88796.c
-@@ -828,7 +828,14 @@ static int ax_probe(struct platform_device *pdev)
- 	struct ei_device *ei_local;
- 	struct ax_device *ax;
- 	struct resource *irq, *mem, *mem2;
-+#ifndef CONFIG_ARM_LPAE
-+	/* LPAE breaks this code as __aeabi_uldivmod for 64-bit
-+	 * is not supported in lib1funcs.s yet
-+	 */
- 	unsigned long mem_size, mem2_size = 0;
-+#else
-+	u32 mem_size, mem2_size = 0;
-+#endif
- 	int ret = 0;
- 
- 	dev = ax__alloc_ei_netdev(sizeof(struct ax_device));

arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch

@@ -1,13 +0,0 @@
-diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
-index 21b7926..19e6662 100644
---- a/sound/soc/samsung/dma.c
-+++ b/sound/soc/samsung/dma.c
-@@ -76,7 +76,7 @@ static void dma_enqueue(struct snd_pcm_substream *substream)
- 
- 	pr_debug("Entered %s\n", __func__);
- 
--	limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period;
-+	limit = (u32)(prtd->dma_end - prtd->dma_start) / prtd->dma_period;
- 
- 	pr_debug("%s: loaded %d, limit %d\n",
- 				__func__, prtd->dma_loaded, limit);

kernel.spec

@@ -601,8 +601,6 @@ Patch15000: nowatchdog-on-virt.patch
 # ARM
 
 # lpae
-Patch21001: arm-lpae-ax88796.patch
-Patch21004: arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch
 
 # ARM omap
 
@@ -1174,8 +1172,6 @@ ApplyPatch 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 #
 # ARM
 #
-ApplyPatch arm-lpae-ax88796.patch
-ApplyPatch arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 ApplyPatch 0001-ARM-sunxi-Add-driver-for-SD-MMC-hosts-found-on-Allwi.patch
 
@@ -2081,6 +2077,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Apr 25 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Drop obsolete ARM LPAE patches
+
 * Fri Apr 25 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Add patch from Will Woods to fix fanotify EOVERFLOW issue (rhbz 696821)
 - Fix ACPI issue preventing boot on AMI firmware (rhbz 1090746)