aboutsummaryrefslogtreecommitdiffstats
path: root/main/btrfs-progs/includes.patch
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2016-12-05 16:43:17 +0100
committerJakub Jirutka <jakub@jirutka.cz>2016-12-05 16:45:40 +0100
commit2dd76425f7b3b3e821ca2755da3e40952baacb8c (patch)
tree6dc7e3fe15d83e5774197175d6840d82db941cf7 /main/btrfs-progs/includes.patch
parent0d4e026be7181aacdd22cb2dd1aa28b43d597f17 (diff)
downloadaports-2dd76425f7b3b3e821ca2755da3e40952baacb8c.tar.bz2
aports-2dd76425f7b3b3e821ca2755da3e40952baacb8c.tar.xz
main/btrfs-progs: upgrade to 4.8.5
Diffstat (limited to 'main/btrfs-progs/includes.patch')
-rw-r--r--main/btrfs-progs/includes.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch
index 6836acb506..c3e4bc4097 100644
--- a/main/btrfs-progs/includes.patch
+++ b/main/btrfs-progs/includes.patch
@@ -1,7 +1,7 @@
diff --git a/bitops.h b/bitops.h
index 323c571..7f30b06 100644
---- a/bitops.h
-+++ b/bitops.h
+--- a/kernel-lib/bitops.h
++++ b/kernel-lib/bitops.h
@@ -65,6 +65,9 @@ static inline unsigned long hweight_long(unsigned long w)
}
@@ -24,8 +24,8 @@ index bb03194e127e..28f832a2e625 100644
#include <stdint.h>
#define ptr_to_u64(x) ((u64)(uintptr_t)x)
---- a/rbtree.h
-+++ b/rbtree.h
+--- a/kernel-lib/rbtree.h
++++ b/kernel-lib/rbtree.h
@@ -38,6 +38,10 @@
extern "C" {
#endif