summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Fusco <ffusco@redhat.com>2013-12-18 16:05:48 +0100
committerDavid S. Miller <davem@davemloft.net>2013-12-19 00:14:53 -0500
commit237217546d44fe06c16b8895eecaef22f18ba5ee (patch)
treea82ae9fc4ffd8f326baec66803180b34613c0b5b
parent020e867c755610fa5a2a08a69707e636cf368b55 (diff)
lib: hash: follow-up fixups for arch hash
This patch adds the include file to pull in __read_mostly on some architectures e.g. ppc and also fixes up signatures in generic asm. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Francesco Fusco <ffusco@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/asm-generic/hash.h4
-rw-r--r--lib/hash.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-generic/hash.h b/include/asm-generic/hash.h
index 05cb3421ee7..b6312843dbd 100644
--- a/include/asm-generic/hash.h
+++ b/include/asm-generic/hash.h
@@ -1,8 +1,8 @@
#ifndef __ASM_GENERIC_HASH_H
#define __ASM_GENERIC_HASH_H
-struct arch_hash_ops;
-static inline void setup_arch_fast_hash(struct arch_hash_ops *ops)
+struct fast_hash_ops;
+static inline void setup_arch_fast_hash(struct fast_hash_ops *ops)
{
}
diff --git a/lib/hash.c b/lib/hash.c
index b89f06a2d60..fea973f4bd5 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -12,6 +12,7 @@
#include <linux/jhash.h>
#include <linux/hash.h>
+#include <linux/cache.h>
static struct fast_hash_ops arch_hash_ops __read_mostly = {
.hash = jhash,