39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
|
From 2fdbfac178348ec229db866bccec8dd0f23738ab Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Marek <mmarek@suse.cz>
|
||
|
|
Date: Tue, 9 Jul 2013 18:38:46 +0200
|
||
|
|
Subject: [PATCH 52/62] btrfs-progs: fix duplicate __[su]* typedefs on ppc64
|
||
|
|
|
||
|
|
The <ext2fs/ext2_types.h> header does attempt to avoid conflicts with
|
||
|
|
<linux/types.h>, but on ppc64, <asm-generic/int-ll64.h> gets somehow
|
||
|
|
included by other headers.
|
||
|
|
|
||
|
|
Include <linux/types.h> explicitly, so that <ext2fs/ext2_types.h>
|
||
|
|
notices it. The proper fix would be to fix <ext2fs/ext2_types.h> to not
|
||
|
|
use its own typedefs.
|
||
|
|
|
||
|
|
Originally observed in btrfs-convert, put the include into kerncompat.h
|
||
|
|
to avoid future problems.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Marek <mmarek@suse.cz>
|
||
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
||
|
|
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
|
||
|
|
---
|
||
|
|
kerncompat.h | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/kerncompat.h b/kerncompat.h
|
||
|
|
index 9c116b4fe841..6584818d0af3 100644
|
||
|
|
--- a/kerncompat.h
|
||
|
|
+++ b/kerncompat.h
|
||
|
|
@@ -26,6 +26,7 @@
|
||
|
|
#include <endian.h>
|
||
|
|
#include <byteswap.h>
|
||
|
|
#include <assert.h>
|
||
|
|
+#include <linux/types.h>
|
||
|
|
|
||
|
|
#ifndef READ
|
||
|
|
#define READ 0
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|