diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-04-23 20:35:23 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-27 14:59:48 +0100 |
commit | 25105f86a089aab4f26156af8301290533587ee6 (patch) | |
tree | 7393a095a34420e3c4dbb4ce0e909359f51f237b /meta/recipes-extended/mdadm/files | |
parent | 77c2e2db43c07b64291221e1aabcab9c0a831954 (diff) | |
download | poky-25105f86a089aab4f26156af8301290533587ee6.tar.gz |
mdadm: Fix inline semantics
With gcc-5 defaulting to gnu11 C we need to follow
c99 inline semantics
Change-Id: I397520c36c81634556b3f3782aebc532e4a79aed
(From OE-Core rev: 944f94a32577969ee1fc197ab285b0abd9e541fa)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm/files')
-rw-r--r-- | meta/recipes-extended/mdadm/files/inline.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/inline.patch b/meta/recipes-extended/mdadm/files/inline.patch new file mode 100644 index 0000000000..9009f0650c --- /dev/null +++ b/meta/recipes-extended/mdadm/files/inline.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | with gnu11 turning on a default with gcc-5 we have to abide by new inline semantics | ||
2 | using 'inline' and using is in same translation unit means an external definition has to exist | ||
3 | same like "external inline" in gnu89, we simply make the functions static inline since they | ||
4 | are just meant to be used in this file | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Index: mdadm-3.3.2/bitmap.c | ||
10 | =================================================================== | ||
11 | --- mdadm-3.3.2.orig/bitmap.c | ||
12 | +++ mdadm-3.3.2/bitmap.c | ||
13 | @@ -20,7 +20,7 @@ | ||
14 | |||
15 | #include "mdadm.h" | ||
16 | |||
17 | -inline void sb_le_to_cpu(bitmap_super_t *sb) | ||
18 | +static inline void sb_le_to_cpu(bitmap_super_t *sb) | ||
19 | { | ||
20 | sb->magic = __le32_to_cpu(sb->magic); | ||
21 | sb->version = __le32_to_cpu(sb->version); | ||
22 | @@ -34,7 +34,7 @@ inline void sb_le_to_cpu(bitmap_super_t | ||
23 | sb->write_behind = __le32_to_cpu(sb->write_behind); | ||
24 | } | ||
25 | |||
26 | -inline void sb_cpu_to_le(bitmap_super_t *sb) | ||
27 | +static inline void sb_cpu_to_le(bitmap_super_t *sb) | ||
28 | { | ||
29 | sb_le_to_cpu(sb); /* these are really the same thing */ | ||
30 | } | ||
31 | @@ -74,7 +74,7 @@ typedef struct bitmap_info_s { | ||
32 | } bitmap_info_t; | ||
33 | |||
34 | /* count the dirty bits in the first num_bits of byte */ | ||
35 | -inline int count_dirty_bits_byte(char byte, int num_bits) | ||
36 | +static inline int count_dirty_bits_byte(char byte, int num_bits) | ||
37 | { | ||
38 | int num = 0; | ||
39 | |||