rpms/kernel/devel linux-2.6-compile-fixes.patch,1.17,1.18

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
see if we can do without this fix.


linux-2.6-compile-fixes.patch:
 linux-10000/arch/i386/Makefile              |    4 ++--
 linux-10000/arch/i386/kernel/Makefile       |    6 +++---
 linux-10000/arch/i386/kernel/nmi.c          |    2 +-
 linux-10000/arch/x86_64/ia32/sys_ia32.c     |    1 -
 linux-10000/arch/x86_64/mm/init.c           |    2 --
 linux-10000/drivers/net/acenic.c            |    2 +-
 linux-10000/drivers/pci/search.c            |    2 +-
 linux-10000/drivers/usb/storage/scsiglue.c  |    2 +-
 linux-10000/fs/open.c                       |    1 -
 linux-10000/fs/proc/generic.c               |    2 +-
 linux-10000/include/linux/config.h          |    4 +++-
 linux-10000/include/linux/delay.h           |   17 ++++++++---------
 linux-10000/include/linux/gfp.h             |    2 +-
 linux-10000/include/linux/namei.h           |    2 +-
 linux-10000/init/Kconfig                    |    2 +-
 linux-10000/kernel/pid.c                    |    2 +-
 linux-10000/scripts/reference_discarded.pl  |    3 ++-
 linux-10000/scripts/reference_init.pl       |    1 +
 linux-10000/sound/core/oss/pcm_oss.c        |    7 +++++++
 linux-10001/arch/ppc/kernel/head.S          |    2 +-
 linux-10001/arch/ppc/kernel/misc.S          |    2 +-
 linux-10001/arch/ppc/mm/hashtable.S         |    4 ++--
 linux-10001/arch/ppc/platforms/pmac_sleep.S |    2 +-
 linux-10001/arch/ppc64/Makefile             |    2 +-
 linux-10001/arch/ppc64/boot/main.c          |    1 +
 linux-10001/crypto/Makefile                 |    2 ++
 linux-10001/drivers/md/Makefile             |    2 ++
 linux-10001/include/asm-ppc/ppc_asm.h       |    2 +-
 linux-10001/include/linux/config.h          |    2 +-
 linux-10001/scripts/kconfig/Makefile        |    2 +-
 linux-10001/scripts/reference_discarded.pl  |    1 +
 linux-10001/sound/core/oss/Makefile         |    1 +
 linux-2.6.11/Makefile                       |    2 +-
 linux-2.6.11/drivers/char/agp/hp-agp.c      |    3 +--
 linux-2.6.11/drivers/scsi/ide-scsi.c        |    7 ++++++-
 linux-2.6.11/drivers/usb/storage/usb.c      |    2 +-
 linux-2.6.12/arch/ppc64/kernel/setup.c      |    1 +
 linux-2.6.12/drivers/net/sk98lin/skge.c     |    2 ++
 linux-2.6.12/drivers/net/skge.c             |    2 +-
 39 files changed, 64 insertions(+), 44 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-compile-fixes.patch	9 Aug 2005 21:39:12 -0000	1.17
+++ linux-2.6-compile-fixes.patch	15 Aug 2005 01:50:46 -0000	1.18
@@ -81,18 +81,19 @@
  	if (!iommu_aperture &&
  	    (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
  	       swiotlb = 1;
-diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/acpi/ec.c linux-10000/drivers/acpi/ec.c
---- linux-3022/drivers/acpi/ec.c
-+++ linux-10000/drivers/acpi/ec.c
-@@ -640,7 +640,7 @@ acpi_ec_add (
- 	
- 		acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit, &acpi_ec_gpe_handler);
- 
--		kfree(ec_ecdt);
-+//		kfree(ec_ecdt);
- 	}
- 
- 	/* Get GPE bit assignment (EC events). */
+# bz 113555. Still needed ?
+#diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/acpi/ec.c linux-10000/drivers/acpi/ec.c
+#--- linux-3022/drivers/acpi/ec.c
+#+++ linux-10000/drivers/acpi/ec.c
+#@@ -640,7 +640,7 @@ acpi_ec_add (
+# 	
+# 		acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit, &acpi_ec_gpe_handler);
+# 
+#-		kfree(ec_ecdt);
+#+//		kfree(ec_ecdt);
+# 	}
+# 
+# 	/* Get GPE bit assignment (EC events). */
 diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/net/acenic.c linux-10000/drivers/net/acenic.c
 --- linux-3022/drivers/net/acenic.c
 +++ linux-10000/drivers/net/acenic.c