]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 22 Mar 2013 01:18:51 +0000 (12:18 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:11:17 +0000 (12:11 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:09:42 +0000 (12:09 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:07:56 +0000 (12:07 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:00:35 +0000 (12:00 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Fri, 22 Mar 2013 00:59:00 +0000 (11:59 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:57:27 +0000 (11:57 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:55:50 +0000 (11:55 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:51:56 +0000 (11:51 +1100)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:47:20 +0000 (11:47 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:47:10 +0000 (11:47 +1100)]
Merge remote-tracking branch 'dmaengine/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
Stephen Rothwell [Fri, 22 Mar 2013 00:43:04 +0000 (11:43 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:41:18 +0000 (11:41 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:39:08 +0000 (11:39 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:37:18 +0000 (11:37 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:35:48 +0000 (11:35 +1100)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:34:02 +0000 (11:34 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 22 Mar 2013 00:33:47 +0000 (11:33 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:31:56 +0000 (11:31 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/media/platform/Kconfig
Stephen Rothwell [Fri, 22 Mar 2013 00:30:29 +0000 (11:30 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:29:05 +0000 (11:29 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:27:40 +0000 (11:27 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:26:10 +0000 (11:26 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:24:37 +0000 (11:24 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:23:12 +0000 (11:23 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:21:07 +0000 (11:21 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:19:38 +0000 (11:19 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:17:50 +0000 (11:17 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:16:20 +0000 (11:16 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:14:56 +0000 (11:14 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:13:31 +0000 (11:13 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 22 Mar 2013 00:12:02 +0000 (11:12 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 22 Mar 2013 00:10:34 +0000 (11:10 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:10:31 +0000 (11:10 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:09:04 +0000 (11:09 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:07:42 +0000 (11:07 +1100)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:06:19 +0000 (11:06 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 22 Mar 2013 00:04:56 +0000 (11:04 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 22 Mar 2013 00:02:27 +0000 (11:02 +1100)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:01:04 +0000 (11:01 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 21 Mar 2013 23:54:10 +0000 (10:54 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:52:45 +0000 (10:52 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Thu, 21 Mar 2013 23:51:22 +0000 (10:51 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:50:00 +0000 (10:50 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:48:37 +0000 (10:48 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 21 Mar 2013 23:47:04 +0000 (10:47 +1100)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 21 Mar 2013 23:47:02 +0000 (10:47 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'
Conflicts:
arch/arm/mach-zynq/common.c
Stephen Rothwell [Thu, 21 Mar 2013 23:45:32 +0000 (10:45 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:44:09 +0000 (10:44 +1100)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:44 +0000 (10:41 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:33 +0000 (10:41 +1100)]
Merge remote-tracking branch 'dwmw2/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:33 +0000 (10:41 +1100)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:31 +0000 (10:41 +1100)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:25 +0000 (10:41 +1100)]
Merge remote-tracking branch 'md-current/for-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:21 +0000 (10:41 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:21 +0000 (10:41 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:20 +0000 (10:41 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:19 +0000 (10:41 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:18 +0000 (10:41 +1100)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:16 +0000 (10:41 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:14 +0000 (10:41 +1100)]
Merge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:13 +0000 (10:41 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:11 +0000 (10:41 +1100)]
Merge remote-tracking branch 'arc-current/for-curr'
Johan Hovold [Tue, 19 Mar 2013 08:21:26 +0000 (09:21 +0100)]
USB: ti_usb_3410_5052: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:25 +0000 (09:21 +0100)]
USB: ssu100: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:24 +0000 (09:21 +0100)]
USB: spcp8x5: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:23 +0000 (09:21 +0100)]
USB: quatech2: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:22 +0000 (09:21 +0100)]
USB: pl2303: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:21 +0000 (09:21 +0100)]
USB: oti6858: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:20 +0000 (09:21 +0100)]
USB: mos7840: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:19 +0000 (09:21 +0100)]
USB: mos7840: fix broken TIOCMIWAIT
Make sure waiting processes are woken on modem-status changes.
Currently processes are only woken on termios changes regardless of
whether the modem status has changed.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:18 +0000 (09:21 +0100)]
USB: mct_u232: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:17 +0000 (09:21 +0100)]
USB: io_ti: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:16 +0000 (09:21 +0100)]
USB: io_edgeport: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:15 +0000 (09:21 +0100)]
USB: ftdi_sio: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
When switching to tty ports, some lifetime assumptions were changed.
Specifically, close can now be called before the final tty reference is
dropped as part of hangup at device disconnect. Even with the ftdi
private-data refcounting this means that the port private data can be
freed while a process is sleeping on modem-status changes and thus
cannot be relied on to detect disconnects when woken up.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:14 +0000 (09:21 +0100)]
USB: f81232: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:13 +0000 (09:21 +0100)]
USB: cypress_m8: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Also remove bogus test for private data pointer being NULL as it is
never assigned in the loop.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:12 +0000 (09:21 +0100)]
USB: ch341: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:11 +0000 (09:21 +0100)]
USB: ark3116: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:10 +0000 (09:21 +0100)]
USB: serial: add modem-status-change wait queue
Add modem-status-change wait queue to struct usb_serial_port that
subdrivers can use to implement TIOCMIWAIT.
Currently subdrivers use a private wait queue which may have been
released when waking up after device disconnected.
Note that we're adding a new wait queue rather than reusing the tty-port
one as we do not want to get woken up at hangup (yet).
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:09 +0000 (09:21 +0100)]
USB: serial: fix interface refcounting
Make sure the interface is not released before our serial device.
Note that drivers are still not allowed to access the interface in
any way that may interfere with another driver that may have gotten
bound to the same interface after disconnect returns.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:08 +0000 (09:21 +0100)]
USB: io_ti: fix get_icount for two port adapters
Add missing get_icount field to two-port driver.
The two-port driver was not updated when switching to the new icount
interface in commit
0bca1b913aff ("tty: Convert the USB drivers to the
new icount interface").
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:07 +0000 (09:21 +0100)]
USB: garmin_gps: fix memory leak on disconnect
Remove bogus disconnect test introduced by
95bef012e ("USB: more serial
drivers writing after disconnect") which prevented queued data from
being freed on disconnect.
The possible IO it was supposed to prevent is long gone.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:06 +0000 (09:21 +0100)]
USB: cdc-acm: fix device unregistration
Unregister tty device in disconnect as is required by the USB stack.
By deferring unregistration to when the last tty reference is dropped,
the parent interface device can get unregistered before the child
resulting in broken hotplug events being generated when the tty is
finally closed:
KERNEL[2290.798128] remove /devices/pci0000:00/0000:00:1d.7/usb2/2-1/2-1:3.1 (usb)
KERNEL[2290.804589] remove /devices/pci0000:00/0000:00:1d.7/usb2/2-1 (usb)
KERNEL[2294.554799] remove /2-1:3.1/tty/ttyACM0 (tty)
The driver must deal with tty callbacks after disconnect by checking the
disconnected flag. Specifically, further opens must be prevented and
this is already implemented.
Cc: stable <stable@vger.kernel.org>
Cc: Oliver Neukum <oneukum@suse.de>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alexey Khoroshilov [Fri, 15 Mar 2013 21:30:32 +0000 (01:30 +0400)]
usb: cdc-acm: fix error handling in acm_probe()
acm_probe() ignores errors in tty_port_register_device()
and leaves intfdata pointing to freed memory on alloc_fail7
error path. The patch fixes the both issues.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stephen Rothwell [Thu, 21 Mar 2013 22:48:15 +0000 (09:48 +1100)]
Revert "KVM: allow host header to be included even for !CONFIG_KVM"
This reverts commit
f445f11eb2cc265dd47da5b2e864df46cd6e5a82 .
Sergei Shtylyov [Thu, 21 Mar 2013 22:59:00 +0000 (01:59 +0300)]
sh_eth: fix unused variable warning
Commit
d5e07e69218fd9aa21d6c8c5ccc629d92bdb9b0f (sh_eth: use managed device API)
has caused this warning (due to my overlook):
drivers/net/ethernet/renesas/sh_eth.c: In function `sh_eth_drv_remove':
drivers/net/ethernet/renesas/sh_eth.c:2482:25: warning: unused variable `mdp'
[-Wunused-variable]
Kill the darn variable now...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Daniel Borkmann [Thu, 21 Mar 2013 21:22:03 +0000 (22:22 +0100)]
filter: bpf_jit_comp: refactor and unify BPF JIT image dump output
If bpf_jit_enable > 1, then we dump the emitted JIT compiled image
after creation. Currently, only SPARC and PowerPC has similar output
as in the reference implementation on x86_64. Make a small helper
function in order to reduce duplicated code and make the dump output
uniform across architectures x86_64, SPARC, PPC, ARM (e.g. on ARM
flen, pass and proglen are currently not shown, but would be
interesting to know as well), also for future BPF JIT implementations
on other archs.
Cc: Mircea Gherzan <mgherzan@gmail.com>
Cc: Matt Evans <matt@ozlabs.org>
Cc: Eric Dumazet <eric.dumazet@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Sergei Shtylyov [Thu, 21 Mar 2013 10:41:11 +0000 (10:41 +0000)]
sh_eth: use managed device API
Switch the driver to the managed device API by replacing ioremap() calls with
devm_ioremap_resource() (that will also result in calling request_mem_region()
which the driver forgot to do until now) and k[mz]alloc() with devm_kzalloc() --
this permits to simplify driver's probe()/remove() method cleanup. We can now
remove the ioremap() error messages since the error messages are printed by
devm_ioremap_resource() itself. We can also remove the 'bitbang' field from
'struct sh_eth_private' as we don't need it anymore in order to free the memory
behind it...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Sergei Shtylyov [Thu, 21 Mar 2013 10:39:22 +0000 (10:39 +0000)]
sh_eth: kill unneeded typecast in sh_eth_drv_probe()
sh_eth_drv_probe() does cast from 'void *' when assigning to the 'pd' variable
which is automatic anyway. Turn the assignment into initializer, while removing
the cast...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Sergei Shtylyov [Thu, 21 Mar 2013 10:37:54 +0000 (10:37 +0000)]
sh_eth: use PIR_* bits
sh_mdio_init() uses the bare numbers instead of the PHY interface bits, despite
these are declared in sh_eth.h as 'enum PIR_BIT'...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Mark Brown [Thu, 21 Mar 2013 20:39:06 +0000 (21:39 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Mark Brown [Thu, 21 Mar 2013 20:39:05 +0000 (21:39 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Mark Brown [Thu, 21 Mar 2013 20:39:03 +0000 (21:39 +0100)]
Merge remote-tracking branch 'asoc/topic/wm8903' into asoc-next
Mark Brown [Thu, 21 Mar 2013 20:39:03 +0000 (21:39 +0100)]
Merge remote-tracking branch 'asoc/topic/wm-hubs' into asoc-next
Mark Brown [Thu, 21 Mar 2013 20:39:02 +0000 (21:39 +0100)]
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
Mark Brown [Thu, 21 Mar 2013 20:39:01 +0000 (21:39 +0100)]
Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
Mark Brown [Thu, 21 Mar 2013 20:39:00 +0000 (21:39 +0100)]
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next
Mark Brown [Thu, 21 Mar 2013 20:39:00 +0000 (21:39 +0100)]
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
Mark Brown [Thu, 21 Mar 2013 20:38:59 +0000 (21:38 +0100)]
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next