linux-toradex.git/kernel/Makefile, branch v2.6.27.7

Merge branch 'linus' into core/generic-dma-coherent

2008-07-28T22:07:55+00:00

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar

build kernel/profile.o only when requested

2008-07-25T17:53:27+00:00

Build kernel/profile.o only if CONFIG_PROFILING is enabled.

This makes CONFIG_PROFILING=n kernels smaller.

As a bonus, some profile_tick() calls and one branch from schedule() are
now eliminated with CONFIG_PROFILING=n (but I doubt these are
measurable effects).

This patch changes the effects of CONFIG_PROFILING=n, but I don't think
having more than two choices would be the better choice.

This patch also adds the name of the first parameter to the prototypes
of profile_{hits,tick}() since I anyway had to add them for the dummy
functions.

Signed-off-by: Adrian Bunk 
Cc: Ingo Molnar 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge branch 'linus' into core/generic-dma-coherent

2008-07-18T19:13:20+00:00

Conflicts:

	kernel/Makefile

Signed-off-by: Ingo Molnar

Revert parts of "ftrace: do not trace scheduler functions"

2008-07-18T06:59:24+00:00

the removal of -mno-spe in the !ftrace case was not intended.

Signed-off-by: Ingo Molnar

ftrace: do not trace scheduler functions

2008-07-17T15:40:11+00:00

do not trace scheduler functions - it's still a bit fragile
and can lock up with:

  http://redhat.com/~mingo/misc/config-Thu_Jul_17_13_34_52_CEST_2008

Signed-off-by: Ingo Molnar

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15T19:55:59+00:00

Conflicts:

	arch/powerpc/Kconfig
	arch/s390/kernel/time.c
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/cpu/perfctr-watchdog.c
	arch/x86/kernel/i8259_64.c
	arch/x86/kernel/ldt.c
	arch/x86/kernel/nmi_64.c
	arch/x86/kernel/smpboot.c
	arch/x86/xen/smp.c
	include/asm-x86/hw_irq_32.h
	include/asm-x86/hw_irq_64.h
	include/asm-x86/mach-default/irq_vectors.h
	include/asm-x86/mach-voyager/irq_vectors.h
	include/asm-x86/smp.h
	kernel/Makefile

Signed-off-by: Ingo Molnar

Merge branch 'auto-ftrace-next' into tracing/for-linus

2008-07-14T14:11:52+00:00

Conflicts:

	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c
	arch/x86/lib/Makefile
	include/asm-x86/irqflags.h
	kernel/Makefile
	kernel/sched.c

Signed-off-by: Ingo Molnar

ftrace: trace schedule

2008-07-11T13:49:19+00:00

After the sched_clock code has been removed from sched.c we can now trace
the scheduler. The scheduler has a lot of functions that would be worth
tracing.

Signed-off-by: Steven Rostedt 
Cc: Steven Rostedt 
Cc: Peter Zijlstra 
Cc: Andrew Morton 
Signed-off-by: Ingo Molnar

generic: per-device coherent dma allocator

2008-06-30T10:51:05+00:00

Currently x86_32, sh and cris-v32 provide per-device coherent dma
memory allocator.

However their implementation is nearly identical. Refactor out
common code to be reused by them.

Signed-off-by: Dmitry Baryshkov 
Signed-off-by: Ingo Molnar

Add generic helpers for arch IPI function calls

2008-06-26T09:21:34+00:00

This adds kernel/smp.c which contains helpers for IPI function calls. In
addition to supporting the existing smp_call_function() in a more efficient
manner, it also adds a more scalable variant called smp_call_function_single()
for calling a given function on a single CPU only.

The core of this is based on the x86-64 patch from Nick Piggin, lots of
changes since then. "Alan D. Brunelle"  has
contributed lots of fixes and suggestions as well. Also thanks to
Paul E. McKenney  for reviewing RCU usage
and getting rid of the data allocation fallback deadlock.

Acked-by: Ingo Molnar 
Reviewed-by: Paul E. McKenney 
Signed-off-by: Jens Axboe