From: Jian Yu Date: Thu, 17 Aug 2023 20:46:38 +0000 (-0700) Subject: LU-16510 build: check if CONFIG_FORTIFY_SOURCE is defined X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F51973%2F1;p=fs%2Flustre-release.git LU-16510 build: check if CONFIG_FORTIFY_SOURCE is defined The linux/fortify-string.h header file should not be included while the kernel config option CONFIG_FORTIFY_SOURCE is not defined. Change-Id: I2e1905406e892b182f143d512a2d3722b141e52d Fixes: 919b93b951d4 ("LU-16510 build: fortified memcpy from linux 6.1") Signed-off-by: Jian Yu --- diff --git a/libcfs/include/libcfs/linux/linux-fortify-string.h b/libcfs/include/libcfs/linux/linux-fortify-string.h index aeed8c5..9750580 100644 --- a/libcfs/include/libcfs/linux/linux-fortify-string.h +++ b/libcfs/include/libcfs/linux/linux-fortify-string.h @@ -1,7 +1,9 @@ #ifndef _LIBCFS_FORTIFY_STRING_H #define _LIBCFS_FORTIFY_STRING_H -#ifdef HAVE_LINUX_FORTIFY_STRING_HEADER +#if defined(HAVE_LINUX_FORTIFY_STRING_HEADER) && \ + !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && \ + defined(CONFIG_FORTIFY_SOURCE) #include /*