rpms/kernel/devel linux-2.6-compile-fixes.patch,1.3,1.4

[fedora-cvs-commits redhat com]

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
more fixing..


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/ppc64/Makefile              |    2 +-
 linux-10000/arch/ppc64/boot/Makefile         |    3 +++
 linux-10000/arch/x86_64/ia32/sys_ia32.c      |    1 -
 linux-10000/arch/x86_64/mm/init.c            |    2 --
 linux-10000/drivers/acpi/ec.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/Makefile                |    1 +
 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/drivers/scsi/aacraid/commctrl.c |    2 +-
 linux-2.6.12/include/asm-i386/mmzone.h       |   24 +++++++++++-------------
 42 files changed, 78 insertions(+), 59 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-compile-fixes.patch	1 Jul 2005 22:02:18 -0000	1.3
+++ linux-2.6-compile-fixes.patch	1 Jul 2005 22:31:38 -0000	1.4
@@ -595,3 +595,21 @@
  #endif /* CONFIG_NUMA */
  
  #ifdef CONFIG_DISCONTIGMEM
+--- linux-2.6.12/include/asm-i386/mmzone.h~	2005-07-01 18:30:14.000000000 -0400
++++ linux-2.6.12/include/asm-i386/mmzone.h	2005-07-01 18:30:30.000000000 -0400
+@@ -37,6 +37,8 @@ static inline void get_memcfg_numa(void)
+ 	get_memcfg_numa_flat();
+ }
+ 
++extern int early_pfn_to_nid(unsigned long pfn);
++
+ #else /* !CONFIG_NUMA */
+ #define get_memcfg_numa get_memcfg_numa_flat
+ #define get_zholes_size(n) (0)
+@@ -149,6 +151,4 @@ static inline int pfn_valid(int pfn)
+ 
+ #endif /* CONFIG_NEED_MULTIPLE_NODES */
+ 
+-extern int early_pfn_to_nid(unsigned long pfn);
+-
+ #endif /* _ASM_MMZONE_H_ */