]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.bak.git/.git/log
people/ssmith/netchannel2-pvops.bak.git/.git
15 years agoFix up checksum offload for the newer interfaces. master netchannel2-forklift
Steven Smith [Wed, 20 May 2009 12:40:07 +0000 (13:40 +0100)]
Fix up checksum offload for the newer interfaces.

15 years agoFix all of our calls to gnttab_end_foreign_access{,_ref} to not give
Steven Smith [Tue, 19 May 2009 14:43:46 +0000 (15:43 +0100)]
Fix all of our calls to gnttab_end_foreign_access{,_ref} to not give
the readonly parameter, now its disappeared from the grant_table.h
prototype.

15 years agoUpdate grant table interface for cset 53481eed0801 of
Steven Smith [Wed, 22 Apr 2009 13:06:31 +0000 (14:06 +0100)]
Update grant table interface for cset 53481eed0801 of

xen-unstable.hg.

15 years agoRemove a worrying but harmless printk.
Steven Smith [Wed, 22 Apr 2009 13:04:42 +0000 (14:04 +0100)]
Remove a worrying but harmless printk.

15 years agoGet the autobypass stuff working again. This turned out to
Steven Smith [Mon, 20 Apr 2009 13:38:09 +0000 (14:38 +0100)]
Get the autobypass stuff working again. This turned out to

be surprisingly trivial.

15 years agoGet bypass support working on the pvops kernel.
Steven Smith [Mon, 20 Apr 2009 13:20:28 +0000 (14:20 +0100)]
Get bypass support working on the pvops kernel.

15 years agoGet the backend working.
Steven Smith [Thu, 16 Apr 2009 15:32:24 +0000 (16:32 +0100)]
Get the backend working.

15 years agoTurn receiver-map support back on. May or may not actually work.
Steven Smith [Thu, 16 Apr 2009 13:43:32 +0000 (14:43 +0100)]
Turn receiver-map support back on. May or may not actually work.

15 years agoActually do something with the context parameter to live map start_tracking.
Steven Smith [Thu, 16 Apr 2009 13:33:58 +0000 (14:33 +0100)]
Actually do something with the context parameter to live map start_tracking.

15 years agoSlightly nicer way of checking whether a page is currently tracked.
Steven Smith [Thu, 16 Apr 2009 13:30:37 +0000 (14:30 +0100)]
Slightly nicer way of checking whether a page is currently tracked.

15 years agoAdd a context to the live map track entries.
Steven Smith [Thu, 16 Apr 2009 13:13:16 +0000 (14:13 +0100)]
Add a context to the live map track entries.

15 years agoAfter a page has been copy map-broken, it's still considered foreign
Steven Smith [Thu, 16 Apr 2009 13:10:14 +0000 (14:10 +0100)]
After a page has been copy map-broken, it's still considered foreign

from the point of view of PageForeign(), even though there aren't really
any grant references backing it.  Make sure we don't try to do a grant-to-grant
copy on it.

15 years agoPull in the live maps stuff.
Steven Smith [Thu, 16 Apr 2009 13:03:57 +0000 (14:03 +0100)]
Pull in the live maps stuff.

15 years agoMake the frontend work again.
Steven Smith [Thu, 16 Apr 2009 12:19:55 +0000 (13:19 +0100)]
Make the frontend work again.

15 years agoForklift in the netchannel2 from the 2.6.18 tree.
Steven Smith [Wed, 15 Apr 2009 13:26:58 +0000 (14:26 +0100)]
Forklift in the netchannel2 from the 2.6.18 tree.

I'll tidy it up shortly.

15 years agoAdd support for v2 grant tables.
Steven Smith [Wed, 15 Apr 2009 13:02:12 +0000 (14:02 +0100)]
Add support for v2 grant tables.

15 years agoxen: fix use irq_to_desc_alloc_cpu -> irq_to_desc_alloc_node xen-tip/next
Jeremy Fitzhardinge [Thu, 14 May 2009 22:02:54 +0000 (15:02 -0700)]
xen: fix use irq_to_desc_alloc_cpu -> irq_to_desc_alloc_node

Compile fix with rename of this function.

[ Impact: compile fix ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
15 years agoMerge commit 'tip/master' into xen-tip/next
Jeremy Fitzhardinge [Thu, 14 May 2009 22:02:42 +0000 (15:02 -0700)]
Merge commit 'tip/master' into xen-tip/next

* commit 'tip/master': (1150 commits)
  xen: use header for EXPORT_SYMBOL_GPL
  sched: avoid flexible array member inside struct (gcc extension)
  perf_counter: fix print debug irq disable
  genirq: fix comment to say IRQ_WAKE_THREAD
  lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS
  lockdep: increase MAX_LOCKDEP_ENTRIES
  lockdep: increase MAX_LOCKDEP_ENTRIES
  perf_counter: call hw_perf_save_disable/restore around group_sched_in
  x86: make sparse mem work in non-NUMA mode
  x86: process.c, remove useless headers
  x86: process.c, remove useless headers
  x86: make sparse mem work in non-NUMA mode
  x86: merge process.c a bit
  x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic
  ntp: fix comment typos
  ring-buffer: move code around to remove some branches
  ring-buffer: use internal time stamp function
  ring-buffer: small optimizations
  x86, 32-bit: fix kernel_trap_sp()
  sched: Don't export sched_mc_power_savings on multi-socket single core system
  ...

Conflicts:
arch/x86/Kconfig
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
arch/x86/kernel/traps.c
arch/x86/mm/init.c
arch/x86/mm/pgtable.c
include/linux/ring_buffer.h
kernel/sysctl.c
kernel/trace/ring_buffer.c
mm/page_alloc.c

15 years agoMerge branch 'x86/urgent'
Ingo Molnar [Wed, 13 May 2009 13:44:03 +0000 (15:44 +0200)]
Merge branch 'x86/urgent'

15 years agoxen: use header for EXPORT_SYMBOL_GPL
Randy Dunlap [Tue, 12 May 2009 20:31:40 +0000 (13:31 -0700)]
xen: use header for EXPORT_SYMBOL_GPL

mmu.c needs to #include module.h to prevent these warnings:

 arch/x86/xen/mmu.c:239: warning: data definition has no type or storage class
 arch/x86/xen/mmu.c:239: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
 arch/x86/xen/mmu.c:239: warning: parameter names (without types) in function declaration

[ Impact: cleanup ]

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'sched/urgent'
Ingo Molnar [Wed, 13 May 2009 13:17:12 +0000 (15:17 +0200)]
Merge branch 'sched/urgent'

15 years agosched: avoid flexible array member inside struct (gcc extension)
Rusty Russell [Wed, 13 May 2009 06:49:12 +0000 (16:19 +0930)]
sched: avoid flexible array member inside struct (gcc extension)

struct sched_group and struct sched_domain end in 'unsigned long
cpumask[]' which Jeff Garzik notes is not legal C to place inside
another struct.  It upsets sparse and clang (LLVM's C front end).

Al Viro pointed out that a union is the Right Way to do this.

[ Impact: use more standard C code ]

Reported-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jeff Garzik <jeff@garzik.org>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
LKML-Reference: <200905131619.12880.rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'perfcounters/core'
Ingo Molnar [Wed, 13 May 2009 06:17:59 +0000 (08:17 +0200)]
Merge branch 'perfcounters/core'

15 years agoMerge branch 'irq/urgent'
Ingo Molnar [Wed, 13 May 2009 06:17:57 +0000 (08:17 +0200)]
Merge branch 'irq/urgent'

15 years agoperf_counter: fix print debug irq disable
Peter Zijlstra [Wed, 13 May 2009 06:12:51 +0000 (08:12 +0200)]
perf_counter: fix print debug irq disable

inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
bash/15802 [HC0[0]:SC0[0]:HE1:SE1] takes:
 (sysrq_key_table_lock){?.....},

Don't unconditionally enable interrupts in the perf_counter_print_debug()
path.

[ Impact: fix potential deadlock pointed out by lockdep ]

LKML-Reference: <new-submission>
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
15 years agogenirq: fix comment to say IRQ_WAKE_THREAD
Steven Rostedt [Tue, 12 May 2009 18:35:54 +0000 (14:35 -0400)]
genirq: fix comment to say IRQ_WAKE_THREAD

Trying to implement a driver to use threaded irqs, I was confused when the
return value to use that was described in the comment above
request_threaded_irq was not defined.

Turns out that the enum is IRQ_WAKE_THREAD where as the comment said
IRQ_THREAD_WAKE.

[Impact: do not confuse developers with wrong comments ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <alpine.DEB.2.00.0905121431020.13338@gandalf.stny.rr.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
15 years agoMerge branch 'core/urgent'
Ingo Molnar [Tue, 12 May 2009 18:00:09 +0000 (20:00 +0200)]
Merge branch 'core/urgent'

15 years agolockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS
Ingo Molnar [Tue, 12 May 2009 14:29:13 +0000 (16:29 +0200)]
lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS

Now that lockdep coverage has increased it has become easier to
run out of entries:

[   21.401387] BUG: MAX_LOCKDEP_ENTRIES too low!
[   21.402007] turning off the locking correctness validator.
[   21.402007] Pid: 1555, comm: S99local Not tainted 2.6.30-rc5-tip #2
[   21.402007] Call Trace:
[   21.402007]  [<ffffffff81069789>] add_lock_to_list+0x53/0xba
[   21.402007]  [<ffffffff810eb615>] ? lookup_mnt+0x19/0x53
[   21.402007]  [<ffffffff8106be14>] check_prev_add+0x14b/0x1c7
[   21.402007]  [<ffffffff8106c304>] validate_chain+0x474/0x52a
[   21.402007]  [<ffffffff8106c6fc>] __lock_acquire+0x342/0x3c7
[   21.402007]  [<ffffffff8106c842>] lock_acquire+0xc1/0xe5
[   21.402007]  [<ffffffff810eb615>] ? lookup_mnt+0x19/0x53
[   21.402007]  [<ffffffff8153aedc>] _spin_lock+0x31/0x66

Double the size - as we've done in the past.

[ Impact: allow lockdep to cover more locks ]

Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'core/urgent'
Ingo Molnar [Tue, 12 May 2009 14:32:34 +0000 (16:32 +0200)]
Merge branch 'core/urgent'

15 years agolockdep: increase MAX_LOCKDEP_ENTRIES
Ingo Molnar [Tue, 12 May 2009 14:29:13 +0000 (16:29 +0200)]
lockdep: increase MAX_LOCKDEP_ENTRIES

Now that lockdep coverage has increased it has become easier to
run out of entries:

[   21.401387] BUG: MAX_LOCKDEP_ENTRIES too low!
[   21.402007] turning off the locking correctness validator.
[   21.402007] Pid: 1555, comm: S99local Not tainted 2.6.30-rc5-tip #2
[   21.402007] Call Trace:
[   21.402007]  [<ffffffff81069789>] add_lock_to_list+0x53/0xba
[   21.402007]  [<ffffffff810eb615>] ? lookup_mnt+0x19/0x53
[   21.402007]  [<ffffffff8106be14>] check_prev_add+0x14b/0x1c7
[   21.402007]  [<ffffffff8106c304>] validate_chain+0x474/0x52a
[   21.402007]  [<ffffffff8106c6fc>] __lock_acquire+0x342/0x3c7
[   21.402007]  [<ffffffff8106c842>] lock_acquire+0xc1/0xe5
[   21.402007]  [<ffffffff810eb615>] ? lookup_mnt+0x19/0x53
[   21.402007]  [<ffffffff8153aedc>] _spin_lock+0x31/0x66

Double the size - as we've done in the past.

[ Impact: allow lockdep to cover more locks ]

Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'core/urgent'
Ingo Molnar [Tue, 12 May 2009 14:31:24 +0000 (16:31 +0200)]
Merge branch 'core/urgent'

15 years agolockdep: increase MAX_LOCKDEP_ENTRIES
Ingo Molnar [Tue, 12 May 2009 14:29:13 +0000 (16:29 +0200)]
lockdep: increase MAX_LOCKDEP_ENTRIES

Now that lockdep coverage has increased it has become easier to
run out of entries:

[   21.401387] BUG: MAX_LOCKDEP_ENTRIES too low!
[   21.402007] turning off the locking correctness validator.
[   21.402007] Pid: 1555, comm: S99local Not tainted 2.6.30-rc5-tip #2
[   21.402007] Call Trace:
[   21.402007]  [<ffffffff81069789>] add_lock_to_list+0x53/0xba
[   21.402007]  [<ffffffff810eb615>] ? lookup_mnt+0x19/0x53
[   21.402007]  [<ffffffff8106be14>] check_prev_add+0x14b/0x1c7
[   21.402007]  [<ffffffff8106c304>] validate_chain+0x474/0x52a
[   21.402007]  [<ffffffff8106c6fc>] __lock_acquire+0x342/0x3c7
[   21.402007]  [<ffffffff8106c842>] lock_acquire+0xc1/0xe5
[   21.402007]  [<ffffffff810eb615>] ? lookup_mnt+0x19/0x53
[   21.402007]  [<ffffffff8153aedc>] _spin_lock+0x31/0x66

Double the size - as we've done in the past.

[ Impact: allow lockdep to cover more locks ]

Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'perfcounters/core'
Ingo Molnar [Tue, 12 May 2009 13:31:13 +0000 (15:31 +0200)]
Merge branch 'perfcounters/core'

15 years agoperf_counter: call hw_perf_save_disable/restore around group_sched_in
Paul Mackerras [Tue, 12 May 2009 11:59:01 +0000 (21:59 +1000)]
perf_counter: call hw_perf_save_disable/restore around group_sched_in

I noticed that when enabling a group via the PERF_COUNTER_IOC_ENABLE
ioctl on the group leader, the counters weren't enabled and counting
immediately on return from the ioctl, but did start counting a little
while later (presumably after a context switch).

The reason was that __perf_counter_enable calls group_sched_in which
calls hw_perf_group_sched_in, which on powerpc assumes that the caller
has called hw_perf_save_disable already.  Until commit 46d686c6
("perf_counter: put whole group on when enabling group leader") it was
true that all callers of group_sched_in had called
hw_perf_save_disable first, and the powerpc hw_perf_group_sched_in
relies on that (there isn't an x86 version).

This fixes the problem by putting calls to hw_perf_save_disable /
hw_perf_restore around the calls to group_sched_in and
counter_sched_in in __perf_counter_enable.  Having the calls to
hw_perf_save_disable/restore around the counter_sched_in call is
harmless and makes this call consistent with the other call sites
of counter_sched_in, which have all called hw_perf_save_disable first.

[ Impact: more precise counter group disable/enable functionality ]

Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
LKML-Reference: <18953.25733.53359.147452@cargo.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'linus'
Ingo Molnar [Tue, 12 May 2009 11:22:30 +0000 (13:22 +0200)]
Merge branch 'linus'

15 years agoMerge branch 'x86/mm'
Ingo Molnar [Tue, 12 May 2009 09:27:22 +0000 (11:27 +0200)]
Merge branch 'x86/mm'

15 years agox86: make sparse mem work in non-NUMA mode
Shaohua Li [Tue, 12 May 2009 08:40:00 +0000 (16:40 +0800)]
x86: make sparse mem work in non-NUMA mode

With sparse memory, holes should not be marked present for memmap.
This patch makes sure sparsemem really works on SMP mode (!NUMA).

[ Impact: use less memory to map fragmented RAM, avoid boot-OOM/crash ]

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Sheng Yang <sheng.yang@intel.com>
LKML-Reference: <1242117600.22431.0.camel@sli10-desk.sh.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agox86: process.c, remove useless headers
Amerigo Wang [Tue, 12 May 2009 03:29:09 +0000 (23:29 -0400)]
x86: process.c, remove useless headers

<stdarg.h> is not needed by these files, remove them.

[ Impact: cleanup ]

Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: akpm@linux-foundation.org
LKML-Reference: <20090512032956.5040.77055.sendpatchset@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'x86/mm'
Ingo Molnar [Tue, 12 May 2009 09:17:16 +0000 (11:17 +0200)]
Merge branch 'x86/mm'

15 years agox86: process.c, remove useless headers
Amerigo Wang [Tue, 12 May 2009 03:29:09 +0000 (23:29 -0400)]
x86: process.c, remove useless headers

<stdarg.h> is not needed by these files, remove them.

[ Impact: cleanup ]

Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: akpm@linux-foundation.org
LKML-Reference: <20090512032956.5040.77055.sendpatchset@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'x86/mm'
Ingo Molnar [Tue, 12 May 2009 09:14:03 +0000 (11:14 +0200)]
Merge branch 'x86/mm'

15 years agox86: make sparse mem work in non-NUMA mode
Shaohua Li [Tue, 12 May 2009 08:40:00 +0000 (16:40 +0800)]
x86: make sparse mem work in non-NUMA mode

With sparse memory, holes should not be marked present for memmap.
This patch makes sure sparsemem really works on SMP mode (!NUMA).

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Sheng Yang <sheng.yang@intel.com>
LKML-Reference: <1242117600.22431.0.camel@sli10-desk.sh.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agox86: merge process.c a bit
Amerigo Wang [Tue, 12 May 2009 02:05:28 +0000 (22:05 -0400)]
x86: merge process.c a bit

Merge arch_align_stack() and arch_randomize_brk(), since
they are the same.

Tested on x86_64.

[ Impact: cleanup ]

Signed-off-by: Amerigo Wang <amwang@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'x86/microcode'
Ingo Molnar [Tue, 12 May 2009 08:39:21 +0000 (10:39 +0200)]
Merge branch 'x86/microcode'

15 years agoMerge branch 'tracing/core'
Ingo Molnar [Tue, 12 May 2009 08:39:19 +0000 (10:39 +0200)]
Merge branch 'tracing/core'

15 years agoMerge branch 'timers/ntp'
Ingo Molnar [Tue, 12 May 2009 08:39:16 +0000 (10:39 +0200)]
Merge branch 'timers/ntp'

15 years agox86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup...
Dmitry Adamushko [Mon, 11 May 2009 21:48:27 +0000 (23:48 +0200)]
x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic

* Solve issues described in 6f66cbc63081fd70e3191b4dbb796746780e5ae1
  in a way that doesn't resort to set_cpus_allowed();

* in fact, only collect_cpu_info and apply_microcode callbacks
  must run on a target cpu, others will do just fine on any other.
  smp_call_function_single() (as suggested by Ingo) is used to run
  these callbacks on a target cpu.

* cleanup of synchronization logic of the 'microcode_core' part

  The generic 'microcode_core' part guarantees that only a single cpu
  (be it a full-fledged cpu, one of the cores or HT)
  is being updated at any particular moment of time.

  In general, there is no need for any additional sync. mechanism in
  arch-specific parts (the patch removes existing spinlocks).

  See also the "Synchronization" section in microcode_core.c.

* return -EINVAL instead of -1 (which is translated into -EPERM) in
  microcode_write(), reload_cpu() and mc_sysdev_add(). Other suggestions
  for an error code?

* use 'enum ucode_state' as return value of request_microcode_{fw, user}
  to gain more flexibility by distinguishing between real error cases
  and situations when an appropriate ucode was not found (which is not an
  error per-se).

* some minor cleanups

Thanks a lot to Hugh Dickins for review/suggestions/testing!

   Reference: http://marc.info/?l=linux-kernel&m=124025889012541&w=2

[ Impact: refactor and clean up microcode driver locking code ]

Signed-off-by: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Acked-by: Hugh Dickins <hugh@veritas.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Peter Oruba <peter.oruba@amd.com>
Cc: Arjan van de Ven <arjan@infradead.org>
LKML-Reference: <1242078507.5560.9.camel@earth>
[ did some more cleanups ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 arch/x86/include/asm/microcode.h  |   25 ++
 arch/x86/kernel/microcode_amd.c   |   58 ++----
 arch/x86/kernel/microcode_core.c  |  326 +++++++++++++++++++++-----------------
 arch/x86/kernel/microcode_intel.c |   92 +++-------
 4 files changed, 261 insertions(+), 240 deletions(-)

(~20 new comment lines)

15 years agontp: fix comment typos
john stultz [Tue, 12 May 2009 01:13:13 +0000 (18:13 -0700)]
ntp: fix comment typos

Bernhard Schiffner noticed I had a few comment typos in this patch,
(note: to save embarrassment, when making typos, avoid copying and
pasting them) so this patch corrects them.

[ Impact: cleanup ]

Reported-by: Bernhard Schiffner <bernhard@schiffner-limbach.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: riel@redhat.com
Cc: akpm@linux-foundation.org
LKML-Reference: <1242090794.7214.131.camel@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'auto-latest'
Ingo Molnar [Tue, 12 May 2009 08:24:47 +0000 (10:24 +0200)]
Merge branch 'auto-latest'

15 years agoMerge branch 'auto-perfcounters-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:26:58 +0000 (09:26 +0200)]
Merge branch 'auto-perfcounters-next' into auto-latest

Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c

15 years agoMerge branch 'auto-warnings-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:53 +0000 (09:25 +0200)]
Merge branch 'auto-warnings-next' into auto-latest

15 years agoMerge branch 'auto-iommu-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:51 +0000 (09:25 +0200)]
Merge branch 'auto-iommu-next' into auto-latest

15 years agoMerge branch 'auto-sparseirq-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:49 +0000 (09:25 +0200)]
Merge branch 'auto-sparseirq-next' into auto-latest

15 years agoMerge branch 'auto-oprofile-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:46 +0000 (09:25 +0200)]
Merge branch 'auto-oprofile-next' into auto-latest

15 years agomanual merge of auto-kmemcheck-next
Ingo Molnar [Tue, 12 May 2009 07:25:29 +0000 (09:25 +0200)]
manual merge of auto-kmemcheck-next

Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'auto-safe-poison-pointers-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:24 +0000 (09:25 +0200)]
Merge branch 'auto-safe-poison-pointers-next' into auto-latest

15 years agoMerge branch 'auto-core-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:20 +0000 (09:25 +0200)]
Merge branch 'auto-core-next' into auto-latest

15 years agoMerge branch 'auto-genirq-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:18 +0000 (09:25 +0200)]
Merge branch 'auto-genirq-next' into auto-latest

15 years agoMerge branch 'auto-timers-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:17 +0000 (09:25 +0200)]
Merge branch 'auto-timers-next' into auto-latest

15 years agoMerge branch 'auto-tracing-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:15 +0000 (09:25 +0200)]
Merge branch 'auto-tracing-next' into auto-latest

15 years agoMerge branch 'auto-sched-next' into auto-latest
Ingo Molnar [Tue, 12 May 2009 07:25:14 +0000 (09:25 +0200)]
Merge branch 'auto-sched-next' into auto-latest

15 years agoMerge branch 'irq/numa' into auto-genirq-next
Ingo Molnar [Tue, 12 May 2009 07:24:30 +0000 (09:24 +0200)]
Merge branch 'irq/numa' into auto-genirq-next

15 years agoMerge branch 'irq/genirq' into auto-genirq-next
Ingo Molnar [Tue, 12 May 2009 07:24:28 +0000 (09:24 +0200)]
Merge branch 'irq/genirq' into auto-genirq-next

15 years agoMerge branch 'linus' into out-of-tree
Ingo Molnar [Tue, 12 May 2009 07:16:27 +0000 (09:16 +0200)]
Merge branch 'linus' into out-of-tree

15 years agoMerge branch 'kmemcheck' into auto-kmemcheck-next
Ingo Molnar [Tue, 12 May 2009 07:11:22 +0000 (09:11 +0200)]
Merge branch 'kmemcheck' into auto-kmemcheck-next

15 years agoMerge commit 'v2.6.30-rc5' into kmemcheck
Ingo Molnar [Tue, 12 May 2009 07:07:41 +0000 (09:07 +0200)]
Merge commit 'v2.6.30-rc5' into kmemcheck

Conflicts:
arch/x86/mm/init.c
kernel/sysctl.c

Merge reason: refresh the branch to .30-rc5 and resolve conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
15 years agoMerge branch 'timers/core' into auto-timers-next
Ingo Molnar [Tue, 12 May 2009 07:05:46 +0000 (09:05 +0200)]
Merge branch 'timers/core' into auto-timers-next

15 years agoMerge branch 'timers/ntp' into auto-timers-next
Ingo Molnar [Tue, 12 May 2009 07:05:38 +0000 (09:05 +0200)]
Merge branch 'timers/ntp' into auto-timers-next

15 years agoMerge branch 'timers/clocksource' into auto-timers-next
Ingo Molnar [Tue, 12 May 2009 07:05:31 +0000 (09:05 +0200)]
Merge branch 'timers/clocksource' into auto-timers-next

15 years agoMerge branch 'timers/clockevents' into auto-timers-next
Ingo Molnar [Tue, 12 May 2009 07:05:30 +0000 (09:05 +0200)]
Merge branch 'timers/clockevents' into auto-timers-next

15 years agoMerge branch 'sched/docs' into auto-sched-next
Ingo Molnar [Tue, 12 May 2009 07:05:25 +0000 (09:05 +0200)]
Merge branch 'sched/docs' into auto-sched-next

15 years agoMerge branch 'core/rcu' into auto-sched-next
Ingo Molnar [Tue, 12 May 2009 07:05:05 +0000 (09:05 +0200)]
Merge branch 'core/rcu' into auto-sched-next

15 years agoMerge branch 'sched/core' into auto-sched-next
Ingo Molnar [Tue, 12 May 2009 07:05:04 +0000 (09:05 +0200)]
Merge branch 'sched/core' into auto-sched-next

15 years agoMerge branch 'sched/urgent' into auto-sched-next
Ingo Molnar [Tue, 12 May 2009 07:05:03 +0000 (09:05 +0200)]
Merge branch 'sched/urgent' into auto-sched-next

15 years agoMerge branch 'perfcounters/core' into auto-perfcounters-next
Ingo Molnar [Tue, 12 May 2009 07:04:55 +0000 (09:04 +0200)]
Merge branch 'perfcounters/core' into auto-perfcounters-next

15 years agoMerge branch 'oprofile' into auto-oprofile-next
Ingo Molnar [Tue, 12 May 2009 07:04:44 +0000 (09:04 +0200)]
Merge branch 'oprofile' into auto-oprofile-next

15 years agoMerge branch 'core/iommu' into auto-iommu-next
Ingo Molnar [Tue, 12 May 2009 07:04:37 +0000 (09:04 +0200)]
Merge branch 'core/iommu' into auto-iommu-next

15 years agoMerge branch 'core/rcu' into auto-core-next
Ingo Molnar [Tue, 12 May 2009 07:03:14 +0000 (09:03 +0200)]
Merge branch 'core/rcu' into auto-core-next

15 years agoMerge branch 'core/signal' into auto-core-next
Ingo Molnar [Tue, 12 May 2009 07:03:09 +0000 (09:03 +0200)]
Merge branch 'core/signal' into auto-core-next

15 years agoMerge branch 'core/futexes' into auto-core-next
Ingo Molnar [Tue, 12 May 2009 07:02:59 +0000 (09:02 +0200)]
Merge branch 'core/futexes' into auto-core-next

15 years agoMerge branch 'core/printk' into auto-core-next
Ingo Molnar [Tue, 12 May 2009 07:02:49 +0000 (09:02 +0200)]
Merge branch 'core/printk' into auto-core-next

15 years agoMerge branch 'core/percpu' into auto-core-next
Ingo Molnar [Tue, 12 May 2009 07:02:47 +0000 (09:02 +0200)]
Merge branch 'core/percpu' into auto-core-next

15 years agoMerge branch 'core/locking' into auto-core-next
Ingo Molnar [Tue, 12 May 2009 07:02:45 +0000 (09:02 +0200)]
Merge branch 'core/locking' into auto-core-next

15 years agoMerge branch 'tracing/mm' into auto-tracing-next
Ingo Molnar [Tue, 12 May 2009 07:02:11 +0000 (09:02 +0200)]
Merge branch 'tracing/mm' into auto-tracing-next

15 years agoMerge branch 'tracing/core' into auto-tracing-next
Ingo Molnar [Tue, 12 May 2009 07:01:48 +0000 (09:01 +0200)]
Merge branch 'tracing/core' into auto-tracing-next

15 years agoMerge branch 'x86/kbuild-phys' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:52:53 +0000 (08:52 +0200)]
Merge branch 'x86/kbuild-phys' into auto-x86-next

15 years agoMerge branch 'x86/kbuild' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:52:51 +0000 (08:52 +0200)]
Merge branch 'x86/kbuild' into auto-x86-next

15 years agoMerge branch 'x86/asm' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:52:43 +0000 (08:52 +0200)]
Merge branch 'x86/asm' into auto-x86-next

15 years agoMerge branch 'x86/cpufeature' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:52:36 +0000 (08:52 +0200)]
Merge branch 'x86/cpufeature' into auto-x86-next

15 years agoMerge branch 'x86/mm' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:52:35 +0000 (08:52 +0200)]
Merge branch 'x86/mm' into auto-x86-next

15 years agoMerge branch 'x86/fpu' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:51:44 +0000 (08:51 +0200)]
Merge branch 'x86/fpu' into auto-x86-next

15 years agoMerge branch 'x86/setup' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:50:46 +0000 (08:50 +0200)]
Merge branch 'x86/setup' into auto-x86-next

15 years agoMerge branch 'x86/xen' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:50:45 +0000 (08:50 +0200)]
Merge branch 'x86/xen' into auto-x86-next

15 years agoMerge branch 'x86/cpu' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:50:27 +0000 (08:50 +0200)]
Merge branch 'x86/cpu' into auto-x86-next

15 years agoMerge branch 'x86/cleanups' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:50:23 +0000 (08:50 +0200)]
Merge branch 'x86/cleanups' into auto-x86-next

15 years agoMerge branch 'x86/apic' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:50:17 +0000 (08:50 +0200)]
Merge branch 'x86/apic' into auto-x86-next

15 years agoMerge branch 'x86/urgent' into auto-x86-next
Ingo Molnar [Tue, 12 May 2009 06:50:12 +0000 (08:50 +0200)]
Merge branch 'x86/urgent' into auto-x86-next

15 years agoring-buffer: move code around to remove some branches
Steven Rostedt [Tue, 12 May 2009 02:11:05 +0000 (22:11 -0400)]
ring-buffer: move code around to remove some branches

This is a bit of micro-optimizations. But since the ring buffer is used
in tracing every function call, it is an extreme hot path. Every nanosecond
counts.

This change shows over 5% improvement in the ring-buffer-benchmark.

[ Impact: more efficient code ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
15 years agoring-buffer: use internal time stamp function
Steven Rostedt [Mon, 11 May 2009 20:28:23 +0000 (16:28 -0400)]
ring-buffer: use internal time stamp function

The ring_buffer_time_stamp that is exported adds a little more overhead
than is needed for using it internally. This patch adds an internal
timestamp function that can be inlined (a single line function)
and used internally for the ring buffer.

[ Impact: a little less overhead to the ring buffer ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
15 years agoring-buffer: small optimizations
Steven Rostedt [Mon, 11 May 2009 20:08:00 +0000 (16:08 -0400)]
ring-buffer: small optimizations

Doing some small changes in the fast path of the ring buffer recording
saves over 3% in the ring-buffer-benchmark test.

[ Impact: a little faster ring buffer recording ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>