diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-09-29 12:03:40 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-09-29 12:03:40 -0400 |
| commit | 3bacf9047b0726b644d8841e4ca1ebd3ea25b18a (patch) | |
| tree | cc35297bb72d79009809b4d3d10d25b4106e4d2d | |
| parent | 3a4b91a21546533045be67ed0482c68f7fb00c0c (diff) | |
| download | kernel-3bacf9047b0726b644d8841e4ca1ebd3ea25b18a.tar.gz kernel-3bacf9047b0726b644d8841e4ca1ebd3ea25b18a.tar.xz kernel-3bacf9047b0726b644d8841e4ca1ebd3ea25b18a.zip | |
Drop ARM btrfs build patch
Should be fixed with upstream commit c89efa731e70a12908a0c155518ebbfd2d6ca605
| -rw-r--r-- | fix-arm-btrfs-build.patch | 14 | ||||
| -rw-r--r-- | kernel.spec | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/fix-arm-btrfs-build.patch b/fix-arm-btrfs-build.patch deleted file mode 100644 index 7e33f29b9..000000000 --- a/fix-arm-btrfs-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h -index 7e1f760..05c9825 100644 ---- a/arch/arm/include/asm/uaccess.h -+++ b/arch/arm/include/asm/uaccess.h -@@ -417,6 +417,9 @@ do { \ - : "cc") - - -+#define __get_user_unaligned(x, ptr) __get_user((x), (ptr)) -+#define __put_user_unaligned(x, ptr) __put_user((x), (ptr)) -+ - #ifdef CONFIG_MMU - extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n); - extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n); diff --git a/kernel.spec b/kernel.spec index 684ab2ae9..910e41092 100644 --- a/kernel.spec +++ b/kernel.spec @@ -732,8 +732,6 @@ Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch #CVE-2013-4345 rhbz 1007690 1009136 Patch25104: ansi_cprng-Fix-off-by-one-error-in-non-block-size-request.patch -Patch25103: fix-arm-btrfs-build.patch - #rhbz 985522 Patch25107: ntp-Make-periodic-RTC-update-more-reliable.patch @@ -1437,8 +1435,6 @@ ApplyPatch ath9k_rx_dma_stop_check.patch ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch -ApplyPatch fix-arm-btrfs-build.patch - #CVE-2013-4345 rhbz 1007690 1009136 ApplyPatch ansi_cprng-Fix-off-by-one-error-in-non-block-size-request.patch |