linux-kernel - Re: linux-next: build failure after merge of the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20131219.140914.1059872546032993195.davem@davemloft.net>
Date:	Thu, 19 Dec 2013 14:09:14 -0500 (EST)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	netdev@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, ffusco@...hat.com
Subject: Re: linux-next: build failure after merge of the net-next tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 19 Dec 2013 11:57:10 +1100

> Caused by commit 71ae8aac3e19 ("lib: introduce arch optimized hash
> library").  Read Rule 1 in Documentation/SubmitChecklist :-(  Hint:
> __read_mostly is defined in linux/cache.h ...
> 
> I have used the net-next tree from next-20131217 again today.

Sorry for this breaking in two different ways two days in a row :-/

I hope with the following commit everything is good now:

====================
>From 237217546d44fe06c16b8895eecaef22f18ba5ee Mon Sep 17 00:00:00 2001
From: Francesco Fusco <ffusco@...hat.com>
Date: Wed, 18 Dec 2013 16:05:48 +0100
Subject: [PATCH] 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@...el.com>
Signed-off-by: Francesco Fusco <ffusco@...hat.com>
Signed-off-by: David S. Miller <davem@...emloft.net>
---
 include/asm-generic/hash.h | 4 ++--
 lib/hash.c                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/hash.h b/include/asm-generic/hash.h
index 05cb342..b631284 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 b89f06a..fea973f 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,
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/