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

[fedora-cvs-commits redhat com]

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fixen de jour


linux-2.6-compile-fixes.patch:
 b/include/asm-i386/bitops.h                 |   14 ++++++--------
 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             |    7 ++++++-
 42 files changed, 78 insertions(+), 54 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-compile-fixes.patch	27 Jul 2005 19:47:02 -0000	1.10
+++ linux-2.6-compile-fixes.patch	29 Jul 2005 18:35:34 -0000	1.11
@@ -557,19 +557,46 @@
  	}
  #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>
+On Fri, 29 Jul 2005, Cal Peake wrote:
+> 
+> Thanks Andrew! Indeed your suspicions are correct. Adding in all the 
+> debugging moved the problem around, it now shows itself when probing 
+> parport. Upon further investigation reverting the commit below seems to 
+> have nixed the problem.
+
+Thanks. Just out of interest, does this patch fix it instead?
+
+		Linus
+
+----
+diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h
+--- a/include/asm-i386/bitops.h
++++ b/include/asm-i386/bitops.h
+@@ -335,14 +335,13 @@ static inline unsigned long __ffs(unsign
+ static inline int find_first_bit(const unsigned long *addr, unsigned size)
+ {
+ 	int x = 0;
+-	do {
+-		if (*addr)
+-			return __ffs(*addr) + x;
+-		addr++;
+-		if (x >= size)
+-			break;
 +
- #define EBX 0
- #define ECX 1
- #define EDX 2
++	while (x < size) {
++		unsigned long val = *addr++;
++		if (val)
++			return __ffs(val) + x;
+ 		x += (sizeof(*addr)<<3);
+-	} while (1);
++	}
+ 	return x;
+ }
+ 
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo vger kernel org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
+