1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

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>
This commit is contained in:
Khem Raj
2015-04-23 20:35:23 -07:00
committed by Richard Purdie
parent 77c2e2db43
commit 25105f86a0
2 changed files with 40 additions and 0 deletions
@@ -0,0 +1,39 @@
with gnu11 turning on a default with gcc-5 we have to abide by new inline semantics
using 'inline' and using is in same translation unit means an external definition has to exist
same like "external inline" in gnu89, we simply make the functions static inline since they
are just meant to be used in this file
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: mdadm-3.3.2/bitmap.c
===================================================================
--- mdadm-3.3.2.orig/bitmap.c
+++ mdadm-3.3.2/bitmap.c
@@ -20,7 +20,7 @@
#include "mdadm.h"
-inline void sb_le_to_cpu(bitmap_super_t *sb)
+static inline void sb_le_to_cpu(bitmap_super_t *sb)
{
sb->magic = __le32_to_cpu(sb->magic);
sb->version = __le32_to_cpu(sb->version);
@@ -34,7 +34,7 @@ inline void sb_le_to_cpu(bitmap_super_t
sb->write_behind = __le32_to_cpu(sb->write_behind);
}
-inline void sb_cpu_to_le(bitmap_super_t *sb)
+static inline void sb_cpu_to_le(bitmap_super_t *sb)
{
sb_le_to_cpu(sb); /* these are really the same thing */
}
@@ -74,7 +74,7 @@ typedef struct bitmap_info_s {
} bitmap_info_t;
/* count the dirty bits in the first num_bits of byte */
-inline int count_dirty_bits_byte(char byte, int num_bits)
+static inline int count_dirty_bits_byte(char byte, int num_bits)
{
int num = 0;
@@ -12,6 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://mdadm-3.2.2_fix_for_x32.patch \
file://gcc-4.9.patch \
file://mdadm-3.3.2_x32_abi_time_t.patch \
file://inline.patch \
file://run-ptest \
"