rpms/kernel/devel linux-2.6-compile-fixes.patch,1.117,1.118

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
Fix ppc32, ppciseries builds

linux-2.6-compile-fixes.patch:
 b/include/asm-powerpc/io.h                         |    1 
 linux-2.6.19.noarch/drivers/char/tty_io.c          |    1 
 linux-2.6.19.noarch/drivers/macintosh/via-pmu.c    |    1 
 linux-2.6.19.noarch/drivers/s390/char/fs3270.c     |    1 
 linux-2.6.19.noarch/include/asm-i386/desc.h        |   28 ++++++++++-----------
 linux-2.6.19.noarch/include/asm-ia64/scatterlist.h |    8 ++++++
 linux-2.6.19.ppc/sound/oss/dmasound/tas3001c.c     |   10 +++----
 linux-2.6.19.ppc/sound/oss/dmasound/tas3004.c      |   10 +++----
 linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c |    4 +++
 9 files changed, 40 insertions(+), 24 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.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- linux-2.6-compile-fixes.patch	13 Dec 2006 15:00:14 -0000	1.117
+++ linux-2.6-compile-fixes.patch	13 Dec 2006 17:14:25 -0000	1.118
@@ -110,3 +110,132 @@
 +
  #endif /* _ASM_IA64_SCATTERLIST_H */
 
+diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
+index 1cd5323..ec7bb5b 100644
+--- a/include/asm-powerpc/io.h
++++ b/include/asm-powerpc/io.h
+@@ -732,6 +732,7 @@ static inline void * bus_to_virt(unsigned long address)
+ 
+ #endif /* CONFIG_PPC32 */
+ 
++#define eth_io_copy_and_sum(a,b,c,d)            eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d))
+ 
+ #endif /* __KERNEL__ */
+ 
+--- linux-2.6.19.ppc/sound/oss/dmasound/tas3004.c~	2006-11-29 21:57:37.000000000 +0000
++++ linux-2.6.19.ppc/sound/oss/dmasound/tas3004.c	2006-12-13 16:40:26.000000000 +0000
+@@ -48,6 +48,7 @@ struct tas3004_data_t {
+ 	int output_id;
+ 	int speaker_id;
+ 	struct tas_drce_t drce_state;
++	struct work_struct device_change;
+ };
+ 
+ #define MAKE_TIME(sec,usec) (((sec)<<12) + (50000+(usec/10)*(1<<12))/100000)
+@@ -914,15 +915,14 @@ tas3004_update_device_parameters(struct 
+ }
+ 
+ static void
+-tas3004_device_change_handler(void *self)
++tas3004_device_change_handler(struct work_struct *work)
+ {
++	void *self = container_of(work, struct tas3004_data_t, device_change);
+ 	if (!self) return;
+ 
+ 	tas3004_update_device_parameters((struct tas3004_data_t *)self);
+ }
+ 
+-static struct work_struct device_change;
+-
+ static int
+ tas3004_output_device_change(	struct tas3004_data_t *self,
+ 				int device_id,
+@@ -933,7 +933,7 @@ tas3004_output_device_change(	struct tas
+ 	self->output_id=output_id;
+ 	self->speaker_id=speaker_id;
+ 
+-	schedule_work(&device_change);
++	schedule_work(&self->device_change);
+ 
+ 	return 0;
+ }
+@@ -1112,7 +1112,7 @@ tas3004_init(struct i2c_client *client)
+ 	tas3004_write_register(self, TAS3004_REG_MCR2, &mcr2, WRITE_SHADOW);
+ 	tas3004_write_register(self, TAS3004_REG_DRC, drce_init, WRITE_SHADOW);
+ 
+-	INIT_WORK(&device_change, tas3004_device_change_handler, self);
++	INIT_WORK(&self->device_change, tas3004_device_change_handler);
+ 	return 0;
+ }
+ 
+--- linux-2.6.19.ppc/sound/oss/dmasound/tas3001c.c~	2006-11-29 21:57:37.000000000 +0000
++++ linux-2.6.19.ppc/sound/oss/dmasound/tas3001c.c	2006-12-13 16:38:10.000000000 +0000
+@@ -50,6 +50,7 @@ struct tas3001c_data_t {
+ 	int output_id;
+ 	int speaker_id;
+ 	struct tas_drce_t drce_state;
++	struct work_struct device_change;
+ };
+ 
+ 
+@@ -667,14 +668,13 @@ tas3001c_update_device_parameters(struct
+ }
+ 
+ static void
+-tas3001c_device_change_handler(void *self)
++tas3001c_device_change_handler(struct work_struct *work)
+ {
++	void *self = container_of(work, struct tas3001c_data_t, device_change);
+ 	if (self)
+ 		tas3001c_update_device_parameters(self);
+ }
+ 
+-static struct work_struct device_change;
+-
+ static int
+ tas3001c_output_device_change(	struct tas3001c_data_t *self,
+ 				int device_id,
+@@ -685,7 +685,7 @@ tas3001c_output_device_change(	struct ta
+ 	self->output_id=output_id;
+ 	self->speaker_id=speaker_id;
+ 
+-	schedule_work(&device_change);
++	schedule_work(&self->device_change);
+ 	return 0;
+ }
+ 
+@@ -823,7 +823,7 @@ tas3001c_init(struct i2c_client *client)
+ 			tas3001c_write_biquad_shadow(self, i, j,
+ 				&tas3001c_eq_unity);
+ 
+-	INIT_WORK(&device_change, tas3001c_device_change_handler, self);
++	INIT_WORK(&self->device_change, tas3001c_device_change_handler);
+ 	return 0;
+ }
+ 
+--- linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c~	2006-11-29 21:57:37.000000000 +0000
++++ linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c	2006-12-13 16:53:11.000000000 +0000
+@@ -43,9 +43,11 @@ void __spin_yield(raw_spinlock_t *lock)
+ 	if (firmware_has_feature(FW_FEATURE_ISERIES))
+ 		HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
+ 			((u64)holder_cpu << 32) | yield_count);
++#ifdef CONFIG_PPC_PSERIES
+ 	else
+ 		plpar_hcall_norets(H_CONFER,
+ 			get_hard_smp_processor_id(holder_cpu), yield_count);
++#endif
+ }
+ 
+ /*
+@@ -72,9 +74,11 @@ void __rw_yield(raw_rwlock_t *rw)
+ 	if (firmware_has_feature(FW_FEATURE_ISERIES))
+ 		HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
+ 			((u64)holder_cpu << 32) | yield_count);
++#ifdef CONFIG_PPC_PSERIES
+ 	else
+ 		plpar_hcall_norets(H_CONFER,
+ 			get_hard_smp_processor_id(holder_cpu), yield_count);
++#endif
+ }
+ #endif
+