git.karo-electronics.de Git - karo-tx-linux.git/log

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:22:01 +0000 (11:22 +1100)]

Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-cpu9krea.c
arch/arm/mach-at91/board-cpuat91.c
arch/arm/mach-at91/board-snapper9260.c
arch/arm/mach-at91/include/mach/board.h
arch/arm/mach-at91/setup.c
drivers/net/ethernet/cadence/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:20:46 +0000 (11:20 +1100)]

Merge remote-tracking branch 'arm-perf/for-next/perf'

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:19:28 +0000 (11:19 +1100)]

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/tools/mach-types
drivers/net/ethernet/cadence/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:18:08 +0000 (11:18 +1100)]

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:12:18 +0000 (11:12 +1100)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:10:01 +0000 (11:10 +1100)]

Merge remote-tracking branch 'crypto-current/master'

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:09:54 +0000 (11:09 +1100)]

Merge remote-tracking branch 'sound-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:09:53 +0000 (11:09 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Fri, 25 Nov 2011 00:09:50 +0000 (11:09 +1100)]

Merge remote-tracking branch 'arm-current/fixes'

commit | commitdiff | tree

Sasha Levin [Wed, 23 Nov 2011 10:13:59 +0000 (12:13 +0200)]

iio: Fix build error in industrialio-core.c

The error was introduced in commit b4641336 ("iio: fix a leak due to
improper use of anon_inode_getfd()").

Looks like the code wasn't even compile tested. Instead of just fixing the
error I changed the function a bit to make it nicer.

Cc: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-iio@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>

commit | commitdiff | tree

Rafael J. Wysocki [Thu, 24 Nov 2011 23:45:31 +0000 (00:45 +0100)]

Merge branch 'pm-freezer' into linux-next

* pm-freezer:
Freezer: fix more fallout from the thaw_process rename

commit | commitdiff | tree

Stephen Rothwell [Thu, 24 Nov 2011 23:44:55 +0000 (00:44 +0100)]

Freezer: fix more fallout from the thaw_process rename

Commit 944e192db53c "freezer: rename thaw_process() to __thaw_task()
and simplify the implementation" did not create a !CONFIG_FREEZER version
of __thaw_task().

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

commit | commitdiff | tree

Jacek Galowicz [Thu, 24 Nov 2011 23:13:15 +0000 (10:13 +1100)]

lguest: switch segment-voodoo-numbers to readable symbols

When studying lguest's x86 segment descriptor code, it is not longer
necessary to have the Intel x86 architecture manual open on the page
with the segment descriptor illustration to understand the crazy
numbers assigned to both descriptor structure halves a/b.
Now the struct desc_struct's fields, like suggested by
Glauber de Oliveira Costa in 2008, are used.

Signed-off-by: Jacek Galowicz <jacek@galowicz.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Kevin Cernekee [Thu, 24 Nov 2011 23:13:15 +0000 (10:13 +1100)]

module: Fix performance regression on modules with large symbol tables

Looking at /proc/kallsyms, one starts to ponder whether all of the extra
strtab-related complexity in module.c is worth the memory savings.

Instead of making the add_kallsyms() loop even more complex, I tried the
other route of deleting the strmap logic and naively copying each string
into core_strtab with no consideration for consolidating duplicates.

Performance on an "already exists" insmod of nvidia.ko (runs
add_kallsyms() but does not actually initialize the module):

Original scheme: 1.230s
With naive copying: 0.058s

Extra space used: 35k (of a 408k module).

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
LKML-Reference: <73defb5e4bca04a6431392cc341112b1@localhost>

commit | commitdiff | tree

Kevin Cernekee [Sun, 13 Nov 2011 03:08:55 +0000 (19:08 -0800)]

module: Add comments describing how the "strmap" logic works

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Thu, 24 Nov 2011 23:13:14 +0000 (10:13 +1100)]

virtio: add debugging if driver doesn't kick.

Under the existing #ifdef DEBUG, check that they don't have more than
1/10 of a second between an add_buf() and a
virtqueue_notify()/virtqueue_kick_prepare() call.

We could get false positives on a really busy system, but good for
development.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Thu, 24 Nov 2011 23:13:14 +0000 (10:13 +1100)]

virtio: expose added descriptors immediately.

A virtio driver does virtqueue_add_buf() multiple times before finally
calling virtqueue_kick(); previously we only exposed the added buffers
in the virtqueue_kick() call. This means we don't need a memory
barrier in virtqueue_add_buf(), but it reduces concurrency as the
device (ie. host) can't see the buffers until the kick.

In the unusual (but now possible) case where a driver does add_buf()
and get_buf() without doing a kick, we do need to insert one before
our counter wraps. Otherwise we could wrap num_added, and later on
not realize that we have passed the marker where we should have
kicked.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Thu, 24 Nov 2011 23:13:13 +0000 (10:13 +1100)]

virtio: avoid modulus operation.

Since we know vq->vring.num is a power of 2, modulus is lazy (it's asserted
in vring_new_virtqueue()).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Thu, 24 Nov 2011 23:13:13 +0000 (10:13 +1100)]

virtio: support unlocked queue kick

Based on patch by Christoph for virtio_blk speedup:

Split virtqueue_kick to be able to do the actual notification
outside the lock protecting the virtqueue. This patch was
originally done by Stefan Hajnoczi, but I can't find the
original one anymore and had to recreated it from memory.
Pointers to the original or corrections for the commit message
are welcome.

Stefan's patch was here:

https://github.com/stefanha/linux/commit/a6d06644e3a58e57a774e77d7dc34c4a5a2e7496
http://www.spinics.net/lists/linux-virtualization/msg14616.html

Third time's the charm!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Thu, 24 Nov 2011 23:13:12 +0000 (10:13 +1100)]

virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf

Remove wrapper functions. This makes the allocation type explicit in
all callers; I used GPF_KERNEL where it seemed obvious, left it at
GFP_ATOMIC otherwise.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>

Linux kernel for KaRo TX COM modules

RSS Atom