summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2015-02-12 15:02:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-12 18:54:15 -0800
commit3248340d3f10871d2ae2d1df9e323f284fa1fdb6 (patch)
tree7182a43fe280b3fae73484defece49ce93be4457
parent565ac23b81ebbcfad4111fa9c743ebc7fc25a4f7 (diff)
downloadop-kernel-dev-3248340d3f10871d2ae2d1df9e323f284fa1fdb6.zip
op-kernel-dev-3248340d3f10871d2ae2d1df9e323f284fa1fdb6.tar.gz
lib/halfmd4.c: simplify includes
We only need EXPORT_SYMBOL, so compiler.h and export.h suffice. This means linux/types.h is no longer implicitly included, so add an include of uapi/linux/types.h to linux/cryptohash.h for __u32. Other users of cryptohash.h cannot be affected, since they must already have been including uapi/linux/types.h in order for gcc not to complain about unknown types. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/cryptohash.h2
-rw-r--r--lib/halfmd4.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/cryptohash.h b/include/linux/cryptohash.h
index 2cd9f1c..f475428 100644
--- a/include/linux/cryptohash.h
+++ b/include/linux/cryptohash.h
@@ -1,6 +1,8 @@
#ifndef __CRYPTOHASH_H
#define __CRYPTOHASH_H
+#include <uapi/linux/types.h>
+
#define SHA_DIGEST_WORDS 5
#define SHA_MESSAGE_BYTES (512 /*bits*/ / 8)
#define SHA_WORKSPACE_WORDS 16
diff --git a/lib/halfmd4.c b/lib/halfmd4.c
index 66d0ee8..a8fe627 100644
--- a/lib/halfmd4.c
+++ b/lib/halfmd4.c
@@ -1,4 +1,4 @@
-#include <linux/kernel.h>
+#include <linux/compiler.h>
#include <linux/export.h>
#include <linux/cryptohash.h>
OpenPOWER on IntegriCloud