rpms/kernel/devel kernel-2.6.spec, 1.2483, 1.2484 linux-2.6-compile-fixes.patch, 1.96, 1.97

[fedora-cvs-commits at redhat.com]

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26137

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
some RAID ia64 compile fixes




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2483
retrieving revision 1.2484
diff -u -r1.2483 -r1.2484
--- kernel-2.6.spec	31 Jul 2006 20:55:10 -0000	1.2483
+++ kernel-2.6.spec	31 Jul 2006 21:31:30 -0000	1.2484
@@ -1662,6 +1662,9 @@
 %endif
 
 %changelog
+* Mon Jul 31 2006 Don Zickus <dzickus at redhat.com>
+- IA64 compile fixes
+
 * Mon Jul 31 2006 Juan Quintela <quintela at redhat.com>
 - Update xen patch to linux-2.6-xen-fedora cset 34801.
 	* linux-2.6 cset 33175

linux-2.6-compile-fixes.patch:
 arch/ia64/kernel/ia64_ksyms.c                     |    2 +-
 arch/ia64/lib/Makefile                            |    2 +-
 linux-2.6.17.noarch/Makefile                      |    4 ----
 linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c |    1 +
 4 files changed, 3 insertions(+), 6 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- linux-2.6-compile-fixes.patch	27 Jul 2006 17:48:23 -0000	1.96
+++ linux-2.6-compile-fixes.patch	31 Jul 2006 21:31:31 -0000	1.97
@@ -22,3 +22,45 @@
  
  #define __KERNEL_SYSCALLS__
  #include <asm/unistd.h>
+Date: Mon, 31 Jul 2006 09:17:01 -0400
+From: Prarit Bhargava <prarit at redhat.com>
+Subject: [RHEL5/Fedora]: BZ 196903 Fix ia64 compile
+
+CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the 
+same
+change in arch/ia64
+
+Signed-off-by: Prarit Bhargava <prarit at redhat.com>
+Signed-off-by: Aron Griffis <aron at hp.com>
+
+
+
+CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the same
+change in arch/ia64
+
+Signed-off-by: Prarit Bhargava <prarit at redhat.com>
+Signed-off-by: Aron Griffis <aron at 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
+