Thu May 21 22:12:45 UTC 2009

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5864

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-generic config-x86-generic 
	config-x86_64-generic kernel.spec sources upstream 
	xen.pvops.patch xen.pvops.post.patch xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.30-rc6-git6.bz2.sign patch-2.6.30-rc6.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	increase-MAX_LOCKDEP_ENTRIES.patch 
	patch-2.6.30-rc4-git3.bz2.sign patch-2.6.30-rc4.bz2.sign 
Log Message:
Update pvops patch to latest xen-tip/next version

--- NEW FILE patch-2.6.30-rc6-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKFJpUyGugalF9Dw4RAmLYAJ9UimMhmtYI1rI7e1mmArbgCzmfvwCfVIdJ
8PVEf7+lNsL6bhvuuYQ22kw=
=EHx4
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.30-rc6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKDkOJyGugalF9Dw4RAiVhAJ46hITgwYcVYl2JLIETWQQmeegT+gCfWXAW
iCy5Kf2zlU0ynEQuMgo5umg=
=UaAX
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.12
retrieving revision 1.1014.2.13
diff -u -p -r1.1014.2.12 -r1.1014.2.13
--- .cvsignore	6 May 2009 21:48:44 -0000	1.1014.2.12
+++ .cvsignore	21 May 2009 22:11:56 -0000	1.1014.2.13
@@ -5,6 +5,5 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.29
 linux-2.6.29.tar.bz2
-patch-2.6.29-git15.bz2
-patch-2.6.30-rc4.bz2
-patch-2.6.30-rc4-git3.bz2
+patch-2.6.30-rc6.bz2
+patch-2.6.30-rc6-git6.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.19
retrieving revision 1.238.6.20
diff -u -p -r1.238.6.19 -r1.238.6.20
--- config-generic	6 May 2009 21:48:44 -0000	1.238.6.19
+++ config-generic	21 May 2009 22:11:56 -0000	1.238.6.20
@@ -3975,3 +3975,5 @@ CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_XEN_PCI_PASSTHROUGH=y
 # CONFIG_XEN_PCI_PASSTHROUGH_DEBUG is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_X86_DS_SELFTEST is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.9
retrieving revision 1.68.6.10
diff -u -p -r1.68.6.9 -r1.68.6.10
--- config-x86-generic	7 May 2009 17:47:09 -0000	1.68.6.9
+++ config-x86-generic	21 May 2009 22:11:56 -0000	1.68.6.10
@@ -363,6 +363,9 @@ CONFIG_LGUEST=m
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
+
+# PARAVIRT_SPINLOCKS has a 5% perf hit
+# CONFIG_PARAVIRT_SPINLOCKS is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_LGUEST_GUEST=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.8
retrieving revision 1.68.2.9
diff -u -p -r1.68.2.8 -r1.68.2.9
--- config-x86_64-generic	2 May 2009 18:00:24 -0000	1.68.2.8
+++ config-x86_64-generic	21 May 2009 22:11:56 -0000	1.68.2.9
@@ -32,7 +32,7 @@ CONFIG_EDD=m
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_DMAR=y
-CONFIG_DMAR_GFX_WA=y
+# CONFIG_DMAR_GFX_WA is not set
 CONFIG_DMAR_FLOPPY_WA=y
 # CONFIG_DMAR_DEFAULT_ON is not set
 
@@ -55,6 +55,8 @@ CONFIG_I2O_BUS=m
 
 CONFIG_SECCOMP=y
 
+CONFIG_CAPI_EICON=y
+
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_SUSPEND=y
@@ -280,6 +282,8 @@ CONFIG_KVM_TRACE=y
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
+# PARAVIRT_SPINLOCKS has a 5% perf hit
+# CONFIG_PARAVIRT_SPINLOCKS is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.25
retrieving revision 1.1294.2.26
diff -u -p -r1.1294.2.25 -r1.1294.2.26
--- kernel.spec	7 May 2009 17:47:09 -0000	1.1294.2.25
+++ kernel.spec	21 May 2009 22:11:56 -0000	1.1294.2.26
@@ -57,9 +57,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 4
+%define rcrev 6
 # The git snapshot level
-%define gitrev 3
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -622,9 +622,6 @@ Patch451: linux-2.6-input-fix-toshiba-ho
 
 Patch460: linux-2.6-serial-460800.patch
 
-# 8192 too low
-Patch480: increase-MAX_LOCKDEP_ENTRIES.patch
-
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
@@ -1124,7 +1121,7 @@ ApplyPatch linux-2.6-execshield.patch
 #
 
 # ext4
-ApplyPatch linux-2.6-ext4-prealloc-fixes.patch
+#ApplyPatch linux-2.6-ext4-prealloc-fixes.patch
 
 # xfs
 
@@ -1176,8 +1173,6 @@ ApplyPatch linux-2.6-input-fix-toshiba-h
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 
-ApplyPatch increase-MAX_LOCKDEP_ENTRIES.patch
-
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
 
@@ -1831,6 +1826,36 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Thu May 21 2009 Michael Young <m.a.young at durham.ac.uk>
+- upadte pvops patch to latest xen-tip/next version
+
+* Thu May 21 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc6-git6
+
+* Wed May 20 2009  Chuck Ebbert <cebbert at redhat.com>
+- Enable Divas (formerly Eicon) ISDN drivers on x86_64. (#480837)
+
+* Wed May 20 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc6-git5
+
+* Mon May 18 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc6-git3
+
+* Sun May 17 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc6-git2
+
+* Sat May 16 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc6
+
+* Mon May 11 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.30-rc5-git1
+
+* Fri May 08 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.30-rc5
+
+* Fri May 08 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.30-rc4-git4
+
 * Thu May 07 2009 Michael Young <m.a.young at durham.ac.uk>
 - i686 CONFIG_CC_STACKPROTECTOR is still broken so disable it
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.13
retrieving revision 1.976.2.14
diff -u -p -r1.976.2.13 -r1.976.2.14
--- sources	6 May 2009 21:48:45 -0000	1.976.2.13
+++ sources	21 May 2009 22:11:57 -0000	1.976.2.14
@@ -1,3 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
-1672a3064a2bfe049715a1103f03561c  patch-2.6.30-rc4.bz2
-f04330e41b862632d60568dfd32ded6c  patch-2.6.30-rc4-git3.bz2
+a83e42a8cd5d7b9d7b6703429cba4c73  patch-2.6.30-rc6.bz2
+78311c587593f514bfb7b61e0235f50b  patch-2.6.30-rc6-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.12
retrieving revision 1.888.2.13
diff -u -p -r1.888.2.12 -r1.888.2.13
--- upstream	6 May 2009 21:48:45 -0000	1.888.2.12
+++ upstream	21 May 2009 22:11:57 -0000	1.888.2.13
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
-patch-2.6.30-rc4.bz2
-patch-2.6.30-rc4-git3.bz2
+patch-2.6.30-rc6.bz2
+patch-2.6.30-rc6-git6.bz2

xen.pvops.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -p -N -r 1.1.2.19 -r 1.1.2.20 xen.pvops.patch
Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -p -r1.1.2.19 -r1.1.2.20
--- xen.pvops.patch	6 May 2009 21:48:45 -0000	1.1.2.19
+++ xen.pvops.patch	21 May 2009 22:11:57 -0000	1.1.2.20
@@ -22,6 +22,115 @@ index 0000000..175bb4f
 +		for formatting information and other details on the
 +		cache index disable.
 +Users:    joachim.deguara at amd.com
+diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
+index b1eb661..9632444 100644
+--- a/Documentation/DocBook/Makefile
++++ b/Documentation/DocBook/Makefile
+@@ -13,7 +13,8 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
+ 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
+ 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
+ 	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
+-	    alsa-driver-api.xml writing-an-alsa-driver.xml
++	    alsa-driver-api.xml writing-an-alsa-driver.xml \
++	    tracepoint.xml
+ 
+ ###
+ # The build process is as follows (targets):
+diff --git a/Documentation/DocBook/tracepoint.tmpl b/Documentation/DocBook/tracepoint.tmpl
+new file mode 100644
+index 0000000..b0756d0
+--- /dev/null
++++ b/Documentation/DocBook/tracepoint.tmpl
+@@ -0,0 +1,89 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
++	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
++
++<book id="Tracepoints">
++ <bookinfo>
++  <title>The Linux Kernel Tracepoint API</title>
++
++  <authorgroup>
++   <author>
++    <firstname>Jason</firstname>
++    <surname>Baron</surname>
++    <affiliation>
++     <address>
++      <email>jbaron at redhat.com</email>
++     </address>
++    </affiliation>
++   </author>
++  </authorgroup>
++
++  <legalnotice>
++   <para>
++     This documentation is free software; you can redistribute
++     it and/or modify it under the terms of the GNU General Public
++     License as published by the Free Software Foundation; either
++     version 2 of the License, or (at your option) any later
++     version.
++   </para>
++
++   <para>
++     This program is distributed in the hope that it will be
++     useful, but WITHOUT ANY WARRANTY; without even the implied
++     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++     See the GNU General Public License for more details.
++   </para>
++
++   <para>
++     You should have received a copy of the GNU General Public
++     License along with this program; if not, write to the Free
++     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++     MA 02111-1307 USA
++   </para>
++
++   <para>
++     For more details see the file COPYING in the source
++     distribution of Linux.
++   </para>
++  </legalnotice>
++ </bookinfo>
++
++ <toc></toc>
++  <chapter id="intro">
++   <title>Introduction</title>
++   <para>
++     Tracepoints are static probe points that are located in strategic points
++     throughout the kernel. 'Probes' register/unregister with tracepoints
++     via a callback mechanism. The 'probes' are strictly typed functions that
++     are passed a unique set of parameters defined by each tracepoint.
++   </para>
++
++   <para>
++     From this simple callback mechanism, 'probes' can be used to profile, debug,
++     and understand kernel behavior. There are a number of tools that provide a
++     framework for using 'probes'. These tools include Systemtap, ftrace, and
++     LTTng.
++   </para>
++
++   <para>
++     Tracepoints are defined in a number of header files via various macros. Thus,
++     the purpose of this document is to provide a clear accounting of the available
++     tracepoints. The intention is to understand not only what tracepoints are
++     available but also to understand where future tracepoints might be added.
++   </para>
++
++   <para>
++     The API presented has functions of the form:
++     <function>trace_tracepointname(function parameters)</function>. These are the
++     tracepoints callbacks that are found throughout the code. Registering and
++     unregistering probes with these callback sites is covered in the
++     <filename>Documentation/trace/*</filename> directory.
++   </para>
++  </chapter>
++
++  <chapter id="irq">
++   <title>IRQ</title>
++!Iinclude/trace/events/irq.h
++  </chapter>
++
++</book>
 diff --git a/Documentation/RCU/trace.txt b/Documentation/RCU/trace.txt
 index 0688482..02cced1 100644
 --- a/Documentation/RCU/trace.txt
@@ -154,11 +263,148 @@ index 0688482..02cced1 100644
 +	readers will note that the rcu "nn" number for a given CPU very
 +	closely matches the rcu_bh "np" number for that same CPU.  This
 +	is due to short-circuit evaluation in rcu_pending().
+diff --git a/Documentation/futex-requeue-pi.txt b/Documentation/futex-requeue-pi.txt
+new file mode 100644
+index 0000000..9dc1ff4
+--- /dev/null
++++ b/Documentation/futex-requeue-pi.txt
+@@ -0,0 +1,131 @@
++Futex Requeue PI
++----------------
++
++Requeueing of tasks from a non-PI futex to a PI futex requires
++special handling in order to ensure the underlying rt_mutex is never
++left without an owner if it has waiters; doing so would break the PI
++boosting logic [see rt-mutex-desgin.txt] For the purposes of
++brevity, this action will be referred to as "requeue_pi" throughout
++this document.  Priority inheritance is abbreviated throughout as
++"PI".
++
++Motivation
++----------
++
++Without requeue_pi, the glibc implementation of
++pthread_cond_broadcast() must resort to waking all the tasks waiting
++on a pthread_condvar and letting them try to sort out which task
++gets to run first in classic thundering-herd formation.  An ideal
++implementation would wake the highest-priority waiter, and leave the
++rest to the natural wakeup inherent in unlocking the mutex
++associated with the condvar.
++
++Consider the simplified glibc calls:
++
++/* caller must lock mutex */
++pthread_cond_wait(cond, mutex)
++{
++	lock(cond->__data.__lock);
++	unlock(mutex);
++	do {
++	   unlock(cond->__data.__lock);
++	   futex_wait(cond->__data.__futex);
++	   lock(cond->__data.__lock);
++	} while(...)
++	unlock(cond->__data.__lock);
++	lock(mutex);
++}
++
++pthread_cond_broadcast(cond)
++{
++	lock(cond->__data.__lock);
++	unlock(cond->__data.__lock);
++	futex_requeue(cond->data.__futex, cond->mutex);
++}
++
++Once pthread_cond_broadcast() requeues the tasks, the cond->mutex
++has waiters. Note that pthread_cond_wait() attempts to lock the
++mutex only after it has returned to user space.  This will leave the
++underlying rt_mutex with waiters, and no owner, breaking the
++previously mentioned PI-boosting algorithms.
++
++In order to support PI-aware pthread_condvar's, the kernel needs to
++be able to requeue tasks to PI futexes.  This support implies that
++upon a successful futex_wait system call, the caller would return to
++user space already holding the PI futex.  The glibc implementation
++would be modified as follows:
++
++
++/* caller must lock mutex */
++pthread_cond_wait_pi(cond, mutex)
++{
++	lock(cond->__data.__lock);
++	unlock(mutex);
++	do {
++	   unlock(cond->__data.__lock);
++	   futex_wait_requeue_pi(cond->__data.__futex);
[...42344 lines suppressed...]
 diff --git a/samples/trace_events/trace-events-sample.c b/samples/trace_events/trace-events-sample.c
 new file mode 100644
-index 0000000..f33b3ba
+index 0000000..aabc4e9
 --- /dev/null
 +++ b/samples/trace_events/trace-events-sample.c
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,52 @@
 +#include <linux/module.h>
 +#include <linux/kthread.h>
 +
@@ -61865,10 +82501,6 @@ index 0000000..f33b3ba
 +	set_current_state(TASK_INTERRUPTIBLE);
 +	schedule_timeout(HZ);
 +	trace_foo_bar("hello", cnt);
-+
-+	if (!(cnt % 10))
-+		/* It is really important that I say "hi!" */
-+		printk(KERN_EMERG "hi!\n");
 +}
 +
 +static int simple_thread(void *arg)
@@ -61905,10 +82537,10 @@ index 0000000..f33b3ba
 +MODULE_LICENSE("GPL");
 diff --git a/samples/trace_events/trace-events-sample.h b/samples/trace_events/trace-events-sample.h
 new file mode 100644
-index 0000000..eab4644
+index 0000000..128a897
 --- /dev/null
 +++ b/samples/trace_events/trace-events-sample.h
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,129 @@
 +/*
 + * Notice that this file is not protected like a normal header.
 + * We also must allow for rereading of this file. The
@@ -61942,7 +82574,7 @@ index 0000000..eab4644
 + *
 + */
 +#undef TRACE_SYSTEM
-+#define TRACE_SYSTEM trace-events-sample
++#define TRACE_SYSTEM sample
 +
 +/*
 + * The TRACE_EVENT macro is broken up into 5 parts.
@@ -62031,8 +82663,146 @@ index 0000000..eab4644
 + * result.
 + */
 +#undef TRACE_INCLUDE_PATH
++#undef TRACE_INCLUDE_FILE
 +#define TRACE_INCLUDE_PATH .
++/*
++ * TRACE_INCLUDE_FILE is not needed if the filename and TRACE_SYSTEM are equal
++ */
++#define TRACE_INCLUDE_FILE trace-events-sample
 +#include <trace/define_trace.h>
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index cba61ca..2b70661 100644
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -188,20 +188,34 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
+ # ---------------------------------------------------------------------------
+ 
+ quiet_cmd_gzip = GZIP    $@
+-cmd_gzip = gzip -f -9 < $< > $@
++cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
++	(rm -f $@ ; false)
+ 
+ 
+ # Bzip2
+ # ---------------------------------------------------------------------------
+ 
+-# Bzip2 does not include size in file... so we have to fake that
+-size_append=$(CONFIG_SHELL) $(srctree)/scripts/bin_size
+-
+-quiet_cmd_bzip2 = BZIP2    $@
+-cmd_bzip2 = (bzip2 -9 < $< && $(size_append) $<) > $@ || (rm -f $@ ; false)
++# Bzip2 and LZMA do not include size in file... so we have to fake that;
++# append the size as a 32-bit littleendian number as gzip does.
++size_append = echo -ne $(shell						\
++dec_size=0;								\
++for F in $1; do								\
++	fsize=$$(stat -c "%s" $$F);					\
++	dec_size=$$(expr $$dec_size + $$fsize);				\
++done;									\
++printf "%08x" $$dec_size |						\
++	sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g'	\
++)
++
++quiet_cmd_bzip2 = BZIP2   $@
++cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
++	bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	(rm -f $@ ; false)
+ 
+ # Lzma
+ # ---------------------------------------------------------------------------
+ 
+ quiet_cmd_lzma = LZMA    $@
+-cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
++cmd_lzma = (cat $(filter-out FORCE,$^) | \
++	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
++	(rm -f $@ ; false)
+diff --git a/scripts/bin_size b/scripts/bin_size
+deleted file mode 100644
+index 43e1b36..0000000
+--- a/scripts/bin_size
++++ /dev/null
+@@ -1,10 +0,0 @@
+-#!/bin/sh
+-
+-if [ $# = 0 ] ; then
+-   echo Usage: $0 file
+-fi
+-
+-size_dec=`stat -c "%s" $1`
+-size_hex_echo_string=`printf "%08x" $size_dec |
+-     sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g'`
+-/bin/echo -ne $size_hex_echo_string
+diff --git a/scripts/kernel-doc b/scripts/kernel-doc
+index 3208a3a..acd8c4a 100755
+--- a/scripts/kernel-doc
++++ b/scripts/kernel-doc
+@@ -1828,6 +1828,25 @@ sub reset_state {
+     $state = 0;
+ }
+ 
++sub tracepoint_munge($) {
++	my $file = shift;
++	my $tracepointname = 0;
++	my $tracepointargs = 0;
++
++	if($prototype =~ m/TRACE_EVENT\((.*?),/) {
++		$tracepointname = $1;
++	}
++	if($prototype =~ m/TP_PROTO\((.*?)\)/) {
++		$tracepointargs = $1;
++	}
++	if (($tracepointname eq 0) || ($tracepointargs eq 0)) {
++		print STDERR "Warning(${file}:$.): Unrecognized tracepoint format: \n".
++			     "$prototype\n";
++	} else {
++		$prototype = "static inline void trace_$tracepointname($tracepointargs)";
++	}
++}
++
+ sub syscall_munge() {
+ 	my $void = 0;
+ 
+@@ -1882,6 +1901,9 @@ sub process_state3_function($$) {
+ 	if ($prototype =~ /SYSCALL_DEFINE/) {
+ 		syscall_munge();
+ 	}
++	if ($prototype =~ /TRACE_EVENT/) {
++		tracepoint_munge($file);
++	}
+ 	dump_function($prototype, $file);
+ 	reset_state();
+     }
+diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
+index 409596e..0fae7da 100755
+--- a/scripts/recordmcount.pl
++++ b/scripts/recordmcount.pl
+@@ -26,7 +26,7 @@
+ # which will also be the location of that section after final link.
+ # e.g.
+ #
+-#  .section ".text.sched"
++#  .section ".sched.text", "ax"
+ #  .globl my_func
+ #  my_func:
+ #        [...]
+@@ -39,7 +39,7 @@
+ #        [...]
+ #
+ # Both relocation offsets for the mcounts in the above example will be
+-# offset from .text.sched. If we make another file called tmp.s with:
++# offset from .sched.text. If we make another file called tmp.s with:
+ #
+ #  .section __mcount_loc
+ #  .quad  my_func + 0x5
+@@ -51,7 +51,7 @@
+ # But this gets hard if my_func is not globl (a static function).
+ # In such a case we have:
+ #
+-#  .section ".text.sched"
++#  .section ".sched.text", "ax"
+ #  my_func:
+ #        [...]
+ #        call mcount  (offset: 0x5)
 diff --git a/security/capability.c b/security/capability.c
 index 21b6cea..9820a25 100644
 --- a/security/capability.c
@@ -62221,7 +82991,7 @@ index fec0493..8042a34 100644
  }
 +
 diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
-index 809b233..b1487c9 100644
+index 1ef58c5..d15108a 100644
 --- a/sound/pci/via82xx.c
 +++ b/sound/pci/via82xx.c
 @@ -2431,7 +2431,7 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,

xen.pvops.post.patch:

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.13 -r1.1.2.14
--- xen.pvops.post.patch	2 May 2009 21:34:23 -0000	1.1.2.13
+++ xen.pvops.post.patch	21 May 2009 22:12:01 -0000	1.1.2.14
@@ -60,6 +60,75 @@ Test some patches to get STACKPROTECTOR 
  	INIT_IDS							\
  	INIT_PERF_COUNTERS(tsk)						\
  	INIT_TRACE_IRQFLAGS						\
+diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
+index 7727aa8..5d6083c 100644
+--- a/arch/x86/include/asm/paravirt_types.h
++++ b/arch/x86/include/asm/paravirt_types.h
+@@ -138,6 +138,9 @@ struct pv_cpu_ops {
+ 	void (*store_gdt)(struct desc_ptr *);
+ 	void (*store_idt)(struct desc_ptr *);
+ 	void (*set_ldt)(const void *desc, unsigned entries);
++#ifdef CONFIG_X86_32
++	void (*load_user_cs_desc)(int cpu, struct mm_struct *mm);
++#endif /*CONFIG_X86_32*/
+ 	unsigned long (*store_tr)(void);
+ 	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
+ #ifdef CONFIG_X86_64
+diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
+index 76f8f84..4118f17 100644
+--- a/arch/x86/kernel/process_32.c
++++ b/arch/x86/kernel/process_32.c
+@@ -356,6 +364,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+ 	preload_fpu = tsk_used_math(next_p) && next_p->fpu_counter > 5;
+ 
+ 	__unlazy_fpu(prev_p);
++	if (next_p->mm)
++		load_user_cs_desc(cpu, next_p->mm);
+ 
+ 	/* we're going to use this soon, after a few expensive things */
+ 	if (preload_fpu)
+@@ -509,3 +518,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+ 	return 0;
+ }
+ 
++
++static void modify_cs(struct mm_struct *mm, unsigned long limit)
++{
++	mm->context.exec_limit = limit;
++	set_user_cs(&mm->context.user_cs, limit);
++	if (mm == current->mm) {
++		int cpu;
++
++		cpu = get_cpu();
++		load_user_cs_desc(cpu, mm);
++		put_cpu();
++	}
++}
++
++void arch_add_exec_range(struct mm_struct *mm, unsigned long limit)
++{
++	if (limit > mm->context.exec_limit)
++		modify_cs(mm, limit);
++}
++
++void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end)
++{
++	struct vm_area_struct *vma;
++	unsigned long limit = PAGE_SIZE;
++
++	if (old_end == mm->context.exec_limit) {
++		for (vma = mm->mmap; vma; vma = vma->vm_next)
++			if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
++				limit = vma->vm_end;
++		modify_cs(mm, limit);
++	}
++}
++
++void arch_flush_exec_range(struct mm_struct *mm)
++{
++	mm->context.exec_limit = 0;
++	set_user_cs(&mm->context.user_cs, 0);
++}
 --- a/localversion-tip	2009-02-17 19:49:34.000000000 +0000
 +++ /dev/null	2009-02-17 18:08:14.005240123 +0000
 @@ -1 +0,0 @@
@@ -108,13 +177,3 @@ Test some patches to get STACKPROTECTOR 
  
  obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
  obj-y			+= proc.o capflags.o powerflags.o common.o
---- a/arch/x86/xen/Kconfig	2009-05-02 17:25:29.000000000 +0100
-+++ b/arch/x86/xen/Kconfig	2009-05-02 22:25:30.000000000 +0100
-@@ -42,6 +42,7 @@
-        bool "Enable support for Xen PCI passthrough devices"
-        depends on XEN && PCI
-        select PCI_XEN
-+       select XEN_XENBUS_FRONTEND
-        help
-          Enable support for passing PCI devices through to
- 	 unprivileged domains. (COMPLETELY UNTESTED)

xen.pvops.pre.patch:

Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -p -r1.1.2.10 -r1.1.2.11
--- xen.pvops.pre.patch	24 Apr 2009 22:27:21 -0000	1.1.2.10
+++ xen.pvops.pre.patch	21 May 2009 22:12:01 -0000	1.1.2.11
@@ -1,6 +1,6 @@
 temporarily revert various Fedora changes so that the pvops patch applies cleanly
 Affected patches;
-more linux-2.6-execshield.patch - arch/x86/mm/init.c arch/x86/mm/init_32.c include/linux/sched.h mm/mmap.c
+more linux-2.6-execshield.patch - arch/x86/mm/init.c arch/x86/mm/init_32.c include/linux/sched.h mm/mmap.c arch/x86/include/asm/paravirt.h arch/x86/kernel/process_32.c
 linux-2.6-defaults-pci_no_msi.patch - drivers/pci/pci.h
 linux-2.6-utrace.patch - include/linux/init_task.h
 
@@ -96,3 +96,73 @@ linux-2.6-utrace.patch - include/linux/i
  	INIT_IDS							\
  	INIT_TRACE_IRQFLAGS						\
  	INIT_LOCKDEP							\
+diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
+index 7727aa8..5d6083c 100644
+--- a/arch/x86/include/asm/paravirt.h
++++ b/arch/x86/include/asm/paravirt.h
+@@ -138,9 +138,6 @@ struct pv_cpu_ops {
+ 	void (*store_gdt)(struct desc_ptr *);
+ 	void (*store_idt)(struct desc_ptr *);
+ 	void (*set_ldt)(const void *desc, unsigned entries);
+-#ifdef CONFIG_X86_32
+-	void (*load_user_cs_desc)(int cpu, struct mm_struct *mm);
+-#endif /*CONFIG_X86_32*/
+ 	unsigned long (*store_tr)(void);
+ 	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
+ #ifdef CONFIG_X86_64
+diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
+index 76f8f84..4118f17 100644
+--- a/arch/x86/kernel/process_32.c
++++ b/arch/x86/kernel/process_32.c
+@@ -364,8 +356,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+ 	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
+ 
+ 	__unlazy_fpu(prev_p);
+-	if (next_p->mm)
+-		load_user_cs_desc(cpu, next_p->mm);
++
+ 
+ 	/* we're going to use this soon, after a few expensive things */
+ 	if (next_p->fpu_counter > 5)
+@@ -518,41 +509,3 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+ 	unsigned long range_end = mm->brk + 0x02000000;
+ 	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+ }
+-
+-static void modify_cs(struct mm_struct *mm, unsigned long limit)
+-{
+-	mm->context.exec_limit = limit;
+-	set_user_cs(&mm->context.user_cs, limit);
+-	if (mm == current->mm) {
+-		int cpu;
+-
+-		cpu = get_cpu();
+-		load_user_cs_desc(cpu, mm);
+-		put_cpu();
+-	}
+-}
+-
+-void arch_add_exec_range(struct mm_struct *mm, unsigned long limit)
+-{
+-	if (limit > mm->context.exec_limit)
+-		modify_cs(mm, limit);
+-}
+-
+-void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end)
+-{
+-	struct vm_area_struct *vma;
+-	unsigned long limit = PAGE_SIZE;
+-
+-	if (old_end == mm->context.exec_limit) {
+-		for (vma = mm->mmap; vma; vma = vma->vm_next)
+-			if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
+-				limit = vma->vm_end;
+-		modify_cs(mm, limit);
+-	}
+-}
+-
+-void arch_flush_exec_range(struct mm_struct *mm)
+-{
+-	mm->context.exec_limit = 0;
+-	set_user_cs(&mm->context.user_cs, 0);
+-}


--- increase-MAX_LOCKDEP_ENTRIES.patch DELETED ---


--- patch-2.6.30-rc4-git3.bz2.sign DELETED ---


--- patch-2.6.30-rc4.bz2.sign DELETED ---


