aboutsummaryrefslogtreecommitdiffstats
path: root/main/btrfs-progs/includes.patch
diff options
context:
space:
mode:
authorEivind Uggedal <eivind@uggedal.com>2014-08-27 07:23:28 +0000
committerEivind Uggedal <eivind@uggedal.com>2014-08-27 07:23:28 +0000
commit4e109ac04b9fccfc6d6bba44a5091ebb1c237db1 (patch)
tree3556f16e37802ce20e5bef8fa7e2b23110ca75b3 /main/btrfs-progs/includes.patch
parentc319d38800544e9fc70a53e97f8586d911d9acc7 (diff)
downloadaports-4e109ac04b9fccfc6d6bba44a5091ebb1c237db1.tar.bz2
aports-4e109ac04b9fccfc6d6bba44a5091ebb1c237db1.tar.xz
main/btrfs-progs: upgrade to 3.16
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 ae69dae492..393399a999 100644
--- a/main/btrfs-progs/includes.patch
+++ b/main/btrfs-progs/includes.patch
@@ -12,8 +12,8 @@ index 323c571..7f30b06 100644
/**
* __ffs - find first bit in word.
-diff --git a/kerncompat.h b/kerncompat.h
-index 1fc2b34..e7d3ca5 100644
+diff --git a/kerncompat.h.orig b/kerncompat.h
+index bb03194e127e..28f832a2e625 100644
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -28,6 +28,7 @@
@@ -21,6 +21,6 @@ index 1fc2b34..e7d3ca5 100644
#include <stddef.h>
#include <linux/types.h>
+#include <linux/limits.h>
+ #include <stdint.h>
- #ifndef READ
- #define READ 0
+ #define ptr_to_u64(x) ((u64)(uintptr_t)x)