rpms/kernel/devel linux-2.6-compile-fixes.patch,1.9,1.10

[fedora-cvs-commits redhat com]

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
compile 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/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/net/skge.c             |    2 +-
 linux-2.6.12/include/asm-i386/ptrace.h      |    2 ++
 42 files changed, 69 insertions(+), 46 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-compile-fixes.patch	13 Jul 2005 06:16:42 -0000	1.9
+++ linux-2.6-compile-fixes.patch	27 Jul 2005 19:47:02 -0000	1.10
@@ -556,3 +556,20 @@
  		pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
  	}
  #endif
+
+include/asm/ptrace.h: In function 'user_mode_vm':
+include/asm/ptrace.h:67: error: 'VM_MASK' undeclared (first use in this function)
+include/asm/ptrace.h:67: error: (Each undeclared identifier is reported only once
+include/asm/ptrace.h:67: error: for each function it appears in.)
+
+--- linux-2.6.12/include/asm-i386/ptrace.h~	2005-07-27 15:45:39.000000000 -0400
++++ linux-2.6.12/include/asm-i386/ptrace.h	2005-07-27 15:45:58.000000000 -0400
+@@ -1,6 +1,8 @@
+ #ifndef _I386_PTRACE_H
+ #define _I386_PTRACE_H
+ 
++#include <asm/vm86.h>
++
+ #define EBX 0
+ #define ECX 1
+ #define EDX 2