Skip to contentSkip to conversation

Fix RAID5 + IA64 compile

PATCH In review Prarit Bhargava 3 participants 6 messages Jul 28, 2006 – Jul 31, 2006

Subsystems (3)
SCSI MD RAID Device mapper
lore
Share & tools
lore
author
#1 lore raw

PATCH 1/2 Fix RAID5 components

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 <[email protected]>
drivers/md/Kconfig +7 -0
diff -urNp linux-2.6.17.ia64.orig/drivers/md/Kconfig linux-2.6.17.ia64/drivers/md/Kconfig
@@ -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
author
#2 lore raw

PATCH 2/2 Fix IA64 components

In reply to 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 <[email protected]>
arch/ia64/kernel/ia64_ksyms.c +1 -1
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
@@ -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);
arch/ia64/lib/Makefile +1 -1
diff -urNp linux-2.6.17.ia64.orig/arch/ia64/lib/Makefile linux-2.6.17.ia64/arch/ia64/lib/Makefile
@@ -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
#3 lore raw
In reply to Prarit Bhargava
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Prarit" = Prarit Bhargava <[email protected]> writes:

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

Prarit,

Looking through that patch, why introduce a new CONFIG_ option when it can all be deducted from CONFIG_MDRAID456 and CONFIG_ia64?

Cheers,
Jes

#4 lore raw

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 <[email protected]>
Signed-off-by Aron Griffis <[email protected]>

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

Signed-off-by Prarit Bhargava <[email protected]>
Signed-off-by Aron Griffis <[email protected]>
arch/ia64/kernel/ia64_ksyms.c +1 -1
@@ -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);
arch/ia64/lib/Makefile +1 -1
@@ -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