[PATCH 0/2] Fix RAID5 + IA64 compile

[PATCH 0/2] Fix RAID5 + IA64 compile

[Prarit Bhargava]

Patchset to fix RAID5 on ia64.  Removes dead CONFIG options and
introduces a new CONFIG option.

Patch is against 2.6.17 + 2.6.18-rc2-git5

Signed-off-by: Prarit Bhargava <prarit@redhat.com>

[PATCH 1/2] Fix RAID5 components

[Prarit Bhargava]

Patch to fix export issue with RAID5 + IA64.

	-adds new MD_RAID5_IA64 option (default to "y")
	 that builds IA64 RAID5 components.

This patch should be committed by the MD maintainers.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>

diff -urNp linux-2.6.17.ia64.orig/drivers/md/Kconfig linux-2.6.17.ia64/drivers/md/Kconfig
--- linux-2.6.17.ia64.orig/drivers/md/Kconfig	2006-07-27 09:20:03.000000000 -0400
+++ linux-2.6.17.ia64/drivers/md/Kconfig	2006-07-27 14:55:15.000000000 -0400
@@ -135,6 +135,13 @@ config MD_RAID456
 
 	  If unsure, say Y.
 
+config MD_RAID5_IA64
+	bool "RAID 5 support for IA64"
+	depends on MD_RAID456 && IA64
+	default y
+	---help---
+	Say "Y" if you plan on using RAID5 in IA64
+
 config MD_RAID5_RESHAPE
 	bool "Support adding drives to a raid-5 array (experimental)"
 	depends on MD_RAID456 && EXPERIMENTAL

[PATCH 2/2] Fix IA64 components

[Prarit Bhargava]

Patch to fix export issue with RAID5 + IA64.

	-removes dead CONFIG options

This patch should be committed by the IA64 maintainer.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>

diff -urNp linux-2.6.17.ia64.orig/arch/ia64/kernel/ia64_ksyms.c linux-2.6.17.ia64/arch/ia64/kernel/ia64_ksyms.c
--- linux-2.6.17.ia64.orig/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 09:20:01.000000000 -0400
+++ linux-2.6.17.ia64/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 14:51:42.000000000 -0400
@@ -67,7 +68,7 @@ EXPORT_SYMBOL(__udivdi3);
 EXPORT_SYMBOL(__moddi3);
 EXPORT_SYMBOL(__umoddi3);
 
-#if defined(CONFIG_MD_RAID5) || defined(CONFIG_MD_RAID5_MODULE)
+#ifdef CONFIG_MD_RAID5_IA64
 extern void xor_ia64_2(void);
 extern void xor_ia64_3(void);
 extern void xor_ia64_4(void);
diff -urNp linux-2.6.17.ia64.orig/arch/ia64/lib/Makefile linux-2.6.17.ia64/arch/ia64/lib/Makefile
--- linux-2.6.17.ia64.orig/arch/ia64/lib/Makefile	2006-07-27 09:20:01.000000000 -0400
+++ linux-2.6.17.ia64/arch/ia64/lib/Makefile	2006-07-27 14:51:19.000000000 -0400
@@ -14,7 +14,7 @@ lib-y := __divsi3.o __udivsi3.o __modsi3
 lib-$(CONFIG_ITANIUM)	+= copy_page.o copy_user.o memcpy.o
 lib-$(CONFIG_MCKINLEY)	+= copy_page_mck.o memcpy_mck.o
 lib-$(CONFIG_PERFMON)	+= carta_random.o
-lib-$(CONFIG_MD_RAID5)	+= xor.o
+lib-$(CONFIG_MD_RAID5_IA64)	+= xor.o
 
 AFLAGS___divdi3.o	=
 AFLAGS___udivdi3.o	= -DUNSIGNED

Re: [PATCH 0/2] Fix RAID5 + IA64 compile

[Prarit Bhargava]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

Resubmitting ... please note this patch is ia64 ONLY.


CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make 
the same
change in arch/ia64

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Aron Griffis <aron@hp.com>


[-- Attachment #2: xor.diff --]
[-- Type: text/plain, Size: 1207 bytes --]

CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the same
change in arch/ia64

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Aron Griffis <aron@hp.com>

--- linux-2.6.17.ia64.orig/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 15:21:47.000000000 -0400
+++ linux-2.6.17.ia64/arch/ia64/kernel/ia64_ksyms.c	2006-07-31 09:02:06.000000000 -0400
@@ -68,7 +68,7 @@ EXPORT_SYMBOL(__udivdi3);
 EXPORT_SYMBOL(__moddi3);
 EXPORT_SYMBOL(__umoddi3);
 
-#if defined(CONFIG_MD_RAID5) || defined(CONFIG_MD_RAID5_MODULE)
+#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
 extern void xor_ia64_2(void);
 extern void xor_ia64_3(void);
 extern void xor_ia64_4(void);
--- linux-2.6.17.ia64.orig/arch/ia64/lib/Makefile	2006-07-27 09:20:01.000000000 -0400
+++ linux-2.6.17.ia64/arch/ia64/lib/Makefile	2006-07-31 09:02:41.000000000 -0400
@@ -14,7 +14,7 @@ lib-y := __divsi3.o __udivsi3.o __modsi3
 lib-$(CONFIG_ITANIUM)	+= copy_page.o copy_user.o memcpy.o
 lib-$(CONFIG_MCKINLEY)	+= copy_page_mck.o memcpy_mck.o
 lib-$(CONFIG_PERFMON)	+= carta_random.o
-lib-$(CONFIG_MD_RAID5)	+= xor.o
+lib-$(CONFIG_MD_RAID456)	+= xor.o
 
 AFLAGS___divdi3.o	=
 AFLAGS___udivdi3.o	= -DUNSIGNED

Re: [PATCH 0/2] Fix RAID5 + IA64 compile

[Jes Sorensen]

Prarit Bhargava wrote:
> Resubmitting ... please note this patch is ia64 ONLY.

> ------------------------------------------------------------------------
> 
> CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the same
> change in arch/ia64
> 
> Signed-off-by: Prarit Bhargava <prarit@redhat.com>
> Signed-off-by: Aron Griffis <aron@hp.com>

Acked-by: Jes Sorensen <jes@sgi.com>

I like this one much better :-)

Jes