linux-kernel - [PATCH] md: fix raid6test build error

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>] [day] [month] [year] [list]

Message-Id: <1274706327-13581-1-git-send-email-akinobu.mita@gmail.com>
Date:	Mon, 24 May 2010 22:05:27 +0900
From:	Akinobu Mita <akinobu.mita@...il.com>
To:	linux-kernel@...r.kernel.org
Cc:	Akinobu Mita <akinobu.mita@...il.com>, Neil Brown <neilb@...e.de>,
	linux-raid@...r.kernel.org, "H. Peter Anvin" <hpa@...or.com>
Subject: [PATCH] md: fix raid6test build error

Fix userspace raid6test build error.

Tested with:
	make -C drivers/md/raid6test/
	./drivers/md/raid6test/raid6test

Signed-off-by: Akinobu Mita <akinobu.mita@...il.com>
Cc: Neil Brown <neilb@...e.de>
Cc: linux-raid@...r.kernel.org
Cc: "H. Peter Anvin" <hpa@...or.com>
---
 drivers/md/raid6algos.c       |    2 +-
 drivers/md/raid6test/Makefile |   20 ++++++++++----------
 include/linux/raid/pq.h       |    2 ++
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/drivers/md/raid6algos.c b/drivers/md/raid6algos.c
index 1f8784b..df7ff72 100644
--- a/drivers/md/raid6algos.c
+++ b/drivers/md/raid6algos.c
@@ -17,11 +17,11 @@
  */
 
 #include <linux/raid/pq.h>
-#include <linux/gfp.h>
 #ifndef __KERNEL__
 #include <sys/mman.h>
 #include <stdio.h>
 #else
+#include <linux/gfp.h>
 #if !RAID6_USE_EMPTY_ZERO_PAGE
 /* In .bss so it's zeroed */
 const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));
diff --git a/drivers/md/raid6test/Makefile b/drivers/md/raid6test/Makefile
index 2874cbe..0674b29 100644
--- a/drivers/md/raid6test/Makefile
+++ b/drivers/md/raid6test/Makefile
@@ -36,34 +36,34 @@ raid6test: test.c raid6.a
 	$(CC) $(CFLAGS) -o raid6test $^
 
 raid6altivec1.c: raid6altivec.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=1 < raid6altivec.uc > $@
+	$(AWK) -f ../unroll.awk -vN=1 < raid6altivec.uc > $@
 
 raid6altivec2.c: raid6altivec.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=2 < raid6altivec.uc > $@
+	$(AWK) -f ../unroll.awk -vN=2 < raid6altivec.uc > $@
 
 raid6altivec4.c: raid6altivec.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=4 < raid6altivec.uc > $@
+	$(AWK) -f ../unroll.awk -vN=4 < raid6altivec.uc > $@
 
 raid6altivec8.c: raid6altivec.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=8 < raid6altivec.uc > $@
+	$(AWK) -f ../unroll.awk -vN=8 < raid6altivec.uc > $@
 
 raid6int1.c: raid6int.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=1 < raid6int.uc > $@
+	$(AWK) -f ../unroll.awk -vN=1 < raid6int.uc > $@
 
 raid6int2.c: raid6int.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=2 < raid6int.uc > $@
+	$(AWK) -f ../unroll.awk -vN=2 < raid6int.uc > $@
 
 raid6int4.c: raid6int.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=4 < raid6int.uc > $@
+	$(AWK) -f ../unroll.awk -vN=4 < raid6int.uc > $@
 
 raid6int8.c: raid6int.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=8 < raid6int.uc > $@
+	$(AWK) -f ../unroll.awk -vN=8 < raid6int.uc > $@
 
 raid6int16.c: raid6int.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=16 < raid6int.uc > $@
+	$(AWK) -f ../unroll.awk -vN=16 < raid6int.uc > $@
 
 raid6int32.c: raid6int.uc ../unroll.awk
-	$(AWK) ../unroll.awk -vN=32 < raid6int.uc > $@
+	$(AWK) -f ../unroll.awk -vN=32 < raid6int.uc > $@
 
 raid6tables.c: mktables
 	./mktables > raid6tables.c
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 1cbbd2c..5be078f 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -62,7 +62,9 @@ extern const char raid6_empty_zero_page[PAGE_SIZE];
 #define disable_kernel_altivec()
 
 #define EXPORT_SYMBOL(sym)
+#define EXPORT_SYMBOL_GPL(sym)
 #define MODULE_LICENSE(licence)
+#define MODULE_DESCRIPTION(_description)
 #define subsys_initcall(x)
 #define module_exit(x)
 #endif /* __KERNEL__ */
-- 
1.6.0.6

--
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/