rpms/kernel/devel linux-2.6-debug-latency-tracing.patch,1.5,1.6

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	linux-2.6-debug-latency-tracing.patch 
Log Message:
build fix


linux-2.6-debug-latency-tracing.patch:
 linux-2.6.14/arch/powerpc/xmon/xmon.c                     |   10 
 linux-2.6.14/include/asm-x86_64/unistd.h                  |    1 
 linux-2.6.14/kernel/latency.c                             |    2 
 linux-latency-tracing.q/Makefile                          |   10 
 linux-latency-tracing.q/arch/arm/boot/compressed/head.S   |   13 
 linux-latency-tracing.q/arch/arm/kernel/calls.S           |    6 
 linux-latency-tracing.q/arch/arm/kernel/entry-common.S    |  111 
 linux-latency-tracing.q/arch/arm/kernel/fiq.c             |    4 
 linux-latency-tracing.q/arch/arm/kernel/irq.c             |    4 
 linux-latency-tracing.q/arch/arm/kernel/traps.c           |    2 
 linux-latency-tracing.q/arch/arm/mm/copypage-v4mc.c       |    4 
 linux-latency-tracing.q/arch/arm/mm/copypage-xscale.c     |    4 
 linux-latency-tracing.q/arch/arm/mm/fault.c               |   14 
 linux-latency-tracing.q/arch/i386/Kconfig                 |    2 
 linux-latency-tracing.q/arch/i386/boot/compressed/misc.c  |    8 
 linux-latency-tracing.q/arch/i386/kernel/Makefile         |    1 
 linux-latency-tracing.q/arch/i386/kernel/entry.S          |   41 
 linux-latency-tracing.q/arch/i386/kernel/irq.c            |    8 
 linux-latency-tracing.q/arch/i386/kernel/mcount-wrapper.S |   27 
 linux-latency-tracing.q/arch/ppc/boot/Makefile            |    9 
 linux-latency-tracing.q/arch/ppc/kernel/entry.S           |   82 
 linux-latency-tracing.q/arch/x86_64/kernel/entry.S        |   48 
 linux-latency-tracing.q/arch/x86_64/kernel/vsyscall.c     |    2 
 linux-latency-tracing.q/fs/proc/proc_misc.c               |   17 
 linux-latency-tracing.q/include/asm-arm/pgalloc.h         |    4 
 linux-latency-tracing.q/include/asm-arm/timex.h           |   10 
 linux-latency-tracing.q/include/asm-arm/unistd.h          |    3 
 linux-latency-tracing.q/include/asm-i386/system.h         |    8 
 linux-latency-tracing.q/include/linux/interrupt.h         |   10 
 linux-latency-tracing.q/include/linux/latency_hist.h      |   32 
 linux-latency-tracing.q/include/linux/linkage.h           |    2 
 linux-latency-tracing.q/include/linux/preempt.h           |   20 
 linux-latency-tracing.q/include/linux/sched.h             |   86 
 linux-latency-tracing.q/init/main.c                       |    9 
 linux-latency-tracing.q/kernel/Makefile                   |    3 
 linux-latency-tracing.q/kernel/latency.c                  | 2390 ++++++++++++++
 linux-latency-tracing.q/kernel/latency_hist.c             |  267 +
 linux-latency-tracing.q/kernel/sched.c                    |  103 
 linux-latency-tracing.q/kernel/sysctl.c                   |   77 
 linux-latency-tracing.q/kernel/time.c                     |   19 
 linux-latency-tracing.q/lib/Kconfig.debug                 |  149 
 linux/arch/arm/boot/compressed/misc.c                     |    1 
 linux/arch/arm26/boot/compressed/misc.c                   |    1 
 linux/arch/i386/boot/compressed/misc.c                    |    1 
 linux/arch/ppc/boot/lib/Makefile                          |   48 
 linux/arch/x86_64/boot/compressed/misc.c                  |    1 
 linux/lib/inflate.c                                       |   44 
 linux/lib/zlib_inflate/inftrees.c                         |   45 
 48 files changed, 3658 insertions(+), 105 deletions(-)

Index: linux-2.6-debug-latency-tracing.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-latency-tracing.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-latency-tracing.patch	30 Dec 2005 02:16:56 -0000	1.5
+++ linux-2.6-debug-latency-tracing.patch	30 Dec 2005 03:50:32 -0000	1.6
@@ -4770,3 +4770,38 @@
  #ifndef __NO_STUBS
  
  /* user-visible error numbers are in the range -1 - -4095 */
+--- linux-2.6.14/arch/powerpc/xmon/xmon.c~	2005-12-29 22:49:47.000000000 -0500
++++ linux-2.6.14/arch/powerpc/xmon/xmon.c	2005-12-29 22:50:02.000000000 -0500
+@@ -2062,7 +2062,7 @@ print_address(unsigned long addr)
+ static unsigned long mdest;		/* destination address */
+ static unsigned long msrc;		/* source address */
+ static unsigned long mval;		/* byte value to set memory to */
+-static unsigned long mcount;		/* # bytes to affect */
++static unsigned long mcount2;		/* # bytes to affect */
+ static unsigned long mdiffs;		/* max # differences to print */
+ 
+ void
+@@ -2074,19 +2074,19 @@ memops(int cmd)
+ 	scanhex((void *)(cmd == 's'? &mval: &msrc));
+ 	if( termch != '\n' )
+ 		termch = 0;
+-	scanhex((void *)&mcount);
++	scanhex((void *)&mcount2);
+ 	switch( cmd ){
+ 	case 'm':
+-		memmove((void *)mdest, (void *)msrc, mcount);
++		memmove((void *)mdest, (void *)msrc, mcount2);
+ 		break;
+ 	case 's':
+-		memset((void *)mdest, mval, mcount);
++		memset((void *)mdest, mval, mcount2);
+ 		break;
+ 	case 'd':
+ 		if( termch != '\n' )
+ 			termch = 0;
+ 		scanhex((void *)&mdiffs);
+-		memdiffs((unsigned char *)mdest, (unsigned char *)msrc, mcount, mdiffs);
++		memdiffs((unsigned char *)mdest, (unsigned char *)msrc, mcount2, mdiffs);
+ 		break;
+ 	}
+ }