Skip to content

Commit ddff9a4

Browse files
behlendorfrobn
authored andcommitted
icp: remove global icp includes
Only include the required icp headers. There's no need to include sys/zfs_context.h and pull in all of the zfs headers. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <robn@despairlabs.com>
1 parent 5fbce31 commit ddff9a4

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

config/Rules.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
88
-include $(top_builddir)/zfs_config.h \
99
-I$(top_builddir)/include \
1010
-I$(top_srcdir)/include \
11-
-I$(top_srcdir)/module/icp/include \
1211
-I$(top_srcdir)/lib/libspl/include \
1312
-I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@ \
1413
-I$(top_srcdir)/lib/libzpool/include

include/sys/crypto/common.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ extern "C" {
3838
#endif
3939

4040
#include <sys/zfs_context.h>
41+
#include <sys/types.h>
42+
#include <sys/uio.h>
4143

4244
/* Cryptographic Mechanisms */
4345

lib/libicp/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
libicp_la_CCASFLAGS = $(AM_CCASFLAGS)
22
libicp_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS)
33

4+
libicp_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
5+
libicp_la_CPPFLAGS += -I$(top_srcdir)/module/icp/include
6+
47
noinst_LTLIBRARIES += libicp.la
58

69
nodist_libicp_la_SOURCES = \

module/icp/spi/kcf_spi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
*/
3232

3333

34-
#include <sys/zfs_context.h>
3534
#include <sys/crypto/common.h>
3635
#include <sys/crypto/impl.h>
3736
#include <sys/crypto/sched_impl.h>

0 commit comments

Comments
 (0)