[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fix build maybe?


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       |   20 +++++++++-----------
 42 files changed, 76 insertions(+), 57 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-compile-fixes.patch	30 Jun 2005 19:25:47 -0000	1.2
+++ linux-2.6-compile-fixes.patch	1 Jul 2005 22:02:18 -0000	1.3
@@ -556,3 +556,42 @@
  	if (!user_srbcmd) {
  		dprintk((KERN_DEBUG"aacraid: Could not make a copy of the srb\n"));
  		rcode = -ENOMEM;
+--- linux-2.6.12/include/asm-i386/mmzone.h~	2005-07-01 17:59:22.000000000 -0400
++++ linux-2.6.12/include/asm-i386/mmzone.h	2005-07-01 18:01:44.000000000 -0400
+@@ -8,20 +8,15 @@
+ 
+ #include <asm/smp.h>
+ 
+-#if CONFIG_NUMA
++#ifdef CONFIG_NUMA
+ extern struct pglist_data *node_data[];
+ #define NODE_DATA(nid)	(node_data[nid])
+ 
+-#ifdef CONFIG_NUMA
+-	#ifdef CONFIG_X86_NUMAQ
+-		#include <asm/numaq.h>
+-	#else	/* summit or generic arch */
+-		#include <asm/srat.h>
+-	#endif
+-#else /* !CONFIG_NUMA */
+-	#define get_memcfg_numa get_memcfg_numa_flat
+-	#define get_zholes_size(n) (0)
+-#endif /* CONFIG_NUMA */
++#ifdef CONFIG_X86_NUMAQ
++	#include <asm/numaq.h>
++#else	/* summit or generic arch */
++	#include <asm/srat.h>
++#endif
+ 
+ extern int get_memcfg_numa_flat(void );
+ /*
+@@ -42,6 +37,9 @@ static inline void get_memcfg_numa(void)
+ 	get_memcfg_numa_flat();
+ }
+ 
++#else /* !CONFIG_NUMA */
++#define get_memcfg_numa get_memcfg_numa_flat
++#define get_zholes_size(n) (0)
+ #endif /* CONFIG_NUMA */
+ 
+ #ifdef CONFIG_DISCONTIGMEM


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]