diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 13:26:18 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 13:46:54 +0200 |
| commit | a9ef7254c8973d4a868d539555a68fc3de5604bd (patch) | |
| tree | c7e923faf297f677bfa9329dc406b2ecc908b21c /patches | |
| parent | 84f0635f32aef143ff1600f15268c014765e577e (diff) | |
| download | ptxdist-a9ef7254c8973d4a868d539555a68fc3de5604bd.tar.gz ptxdist-a9ef7254c8973d4a868d539555a68fc3de5604bd.tar.xz | |
fuse: version bump 2.9.3 -> 2.9.4
Also, fix building on arm64.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/fuse-2.9.4/0001-use-asm-types.h-to-define-__u64-etc.patch | 28 | ||||
| -rw-r--r-- | patches/fuse-2.9.4/series | 4 |
2 files changed, 32 insertions, 0 deletions
diff --git a/patches/fuse-2.9.4/0001-use-asm-types.h-to-define-__u64-etc.patch b/patches/fuse-2.9.4/0001-use-asm-types.h-to-define-__u64-etc.patch new file mode 100644 index 000000000..5b79e61a1 --- /dev/null +++ b/patches/fuse-2.9.4/0001-use-asm-types.h-to-define-__u64-etc.patch @@ -0,0 +1,28 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Sat, 30 May 2015 10:42:35 +0200 +Subject: [PATCH] use asm/types.h to define __u64 etc. + +Otherwise building fails on arm64 with conflicting type definitions. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + include/fuse_kernel.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h +index c632b58fbcf4..29eb58227198 100644 +--- a/include/fuse_kernel.h ++++ b/include/fuse_kernel.h +@@ -89,11 +89,7 @@ + #define _LINUX_FUSE_H + + #include <sys/types.h> +-#define __u64 uint64_t +-#define __s64 int64_t +-#define __u32 uint32_t +-#define __s32 int32_t +-#define __u16 uint16_t ++#include <asm/types.h> + + /* + * Version negotiation: diff --git a/patches/fuse-2.9.4/series b/patches/fuse-2.9.4/series new file mode 100644 index 000000000..8ade71715 --- /dev/null +++ b/patches/fuse-2.9.4/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-use-asm-types.h-to-define-__u64-etc.patch +# 14044a304d2cf460a7b33d5e064996e9 - git-ptx-patches magic |