| From 98c83327d85dfe0df25b41fdc614c462f7e2a6d3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 20 Dec 2019 10:21:26 +0800 |
| Subject: raid6/test: fix a compilation error |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Zhengyuan Liu <liuzhengyuan@kylinos.cn> |
| |
| [ Upstream commit 6b8651aac1dca6140dd7fb4c9fec2736ed3f6223 ] |
| |
| The compilation error is redeclaration showed as following: |
| |
| In file included from ../../../include/linux/limits.h:6, |
| from /usr/include/x86_64-linux-gnu/bits/local_lim.h:38, |
| from /usr/include/x86_64-linux-gnu/bits/posix1_lim.h:161, |
| from /usr/include/limits.h:183, |
| from /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/limits.h:194, |
| from /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/syslimits.h:7, |
| from /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/limits.h:34, |
| from ../../../include/linux/raid/pq.h:30, |
| from algos.c:14: |
| ../../../include/linux/types.h:114:15: error: conflicting types for ‘int64_t’ |
| typedef s64 int64_t; |
| ^~~~~~~ |
| In file included from /usr/include/stdint.h:34, |
| from /usr/lib/gcc/x86_64-linux-gnu/8/include/stdint.h:9, |
| from /usr/include/inttypes.h:27, |
| from ../../../include/linux/raid/pq.h:29, |
| from algos.c:14: |
| /usr/include/x86_64-linux-gnu/bits/stdint-intn.h:27:19: note: previous \ |
| declaration of ‘int64_t’ was here |
| typedef __int64_t int64_t; |
| |
| Fixes: 54d50897d544 ("linux/kernel.h: split *_MAX and *_MIN macros into <linux/limits.h>") |
| Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn> |
| Signed-off-by: Song Liu <songliubraving@fb.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| include/linux/raid/pq.h | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h |
| index 0832c9b66852e..0b6e7ad9cd2a8 100644 |
| --- a/include/linux/raid/pq.h |
| +++ b/include/linux/raid/pq.h |
| @@ -27,7 +27,6 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; |
| |
| #include <errno.h> |
| #include <inttypes.h> |
| -#include <limits.h> |
| #include <stddef.h> |
| #include <sys/mman.h> |
| #include <sys/time.h> |
| -- |
| 2.20.1 |
| |
