GitHub/MotorolaMobilityLLC/kernel-slsi.git
14 years agoStaging: et131x: extract the eeprom setup logic from initpci
Alan Cox [Tue, 6 Oct 2009 14:47:22 +0000 (15:47 +0100)]
Staging: et131x: extract the eeprom setup logic from initpci

This puts all the eeprom handling in one place and cleans up the interfaces

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: et131x: tidy eeprom code up
Alan Cox [Tue, 6 Oct 2009 14:46:59 +0000 (15:46 +0100)]
Staging: et131x: tidy eeprom code up

Turn this one into something resembling a clean Linux driver

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: et131x: kill SUCCESS and FAILURE defines
Alan Cox [Tue, 6 Oct 2009 14:46:24 +0000 (15:46 +0100)]
Staging: et131x: kill SUCCESS and FAILURE defines

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: slicoss: remove duplicate structure field initialization
Julia Lawall [Sat, 19 Sep 2009 19:49:03 +0000 (21:49 +0200)]
Staging: slicoss: remove duplicate structure field initialization

The definition of slic_netdev_ops has initializations of a local function
and eth_mac_addr for its ndo_set_mac_address field.  This change uses only
the local function.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r@
identifier I, s, fld;
position p0,p;
expression E;
@@

struct I s =@p0 { ... .fld@p = E, ...};

@s@
identifier I, s, r.fld;
position r.p0,p;
expression E;
@@

struct I s =@p0 { ... .fld@p = E, ...};

@script:python@
p0 << r.p0;
fld << r.fld;
ps << s.p;
pr << r.p;
@@

if int(ps[0].line)!=int(pr[0].line) or int(ps[0].column)!=int(pr[0].column):
  cocci.print_main(fld,p0)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: iio: Fix up the module build.
Paul Mundt [Thu, 5 Nov 2009 06:09:00 +0000 (15:09 +0900)]
Staging: iio: Fix up the module build.

Both the max1363 and lis3l02dq modules rely on IIO trigger support in
their ring buffer implementations, which is presently a separate config
option. In the case of IIO_RING_BUFFER=y and IIO_TRIGGER=n, we end up
with the following:

ERROR: "iio_trigger_attach_poll_func" [drivers/staging/iio/adc/max1363.ko] undefined!
ERROR: "iio_trigger_dettach_poll_func" [drivers/staging/iio/adc/max1363.ko] undefined!
ERROR: "iio_trigger_unregister" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
ERROR: "iio_trigger_notify_done" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
ERROR: "iio_trigger_read_name" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
ERROR: "iio_trigger_poll" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
ERROR: "iio_trigger_attach_poll_func" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
ERROR: "iio_trigger_register" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
ERROR: "iio_free_trigger" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
ERROR: "iio_trigger_dettach_poll_func" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
ERROR: "iio_allocate_trigger" [drivers/staging/iio/accel/lis3l02dq.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

This adds an IIO_TRIGGER select for these two drivers conditional on
IIO ring buffer support. Caught with an SH randconfig in -next.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: iio: lots of doc fixes
Randy Dunlap [Mon, 5 Oct 2009 02:34:02 +0000 (19:34 -0700)]
Staging: iio: lots of doc fixes

Fix iio header files kernel-doc notation errors, spelling, typos,
indentation, grammar, etc.

It would also be good if these function names were spelled
correctly, but I didn't change them:
  iio_push_or_escallate_ring_event()
  iio_trigger_dettach_poll_func()

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: iio: kconfig and make edits
Randy Dunlap [Mon, 5 Oct 2009 02:32:27 +0000 (19:32 -0700)]
Staging: iio: kconfig and make edits

Fix spelling, typos, indentation in iio Kconfig files.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: phison: adding __init/__exit macros
Peter Huewe [Mon, 28 Sep 2009 23:53:16 +0000 (01:53 +0200)]
Staging: phison: adding __init/__exit macros

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of drivers/staging/phison/phison.c

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: p9auth: adding __init/__exit macros
Peter Huewe [Mon, 28 Sep 2009 23:49:00 +0000 (01:49 +0200)]
Staging: p9auth: adding __init/__exit macros

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of drivers/staging/p9auth/p9auth.c

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: cx25821: adding __init/__exit macros
Peter Huewe [Mon, 28 Sep 2009 23:40:59 +0000 (01:40 +0200)]
Staging: cx25821: adding __init/__exit macros

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of ./staging/cx25821/cx25821-core.c

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: et131x: adding __init/__exit macros
Peter Huewe [Mon, 28 Sep 2009 23:34:14 +0000 (01:34 +0200)]
Staging: et131x: adding __init/__exit macros

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of ./staging/et131x/et131x_initpci.c

Greg, please have a look at the small patch and either pull it through
your staging tree, or please ack' it so Jiri can pull it through the trivial tree.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: ramzswap: add TODO file
Nitin Gupta [Tue, 22 Sep 2009 10:02:33 +0000 (15:32 +0530)]
Staging: ramzswap: add TODO file

TODO file for ramzswap.

Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: ramzswap: documentation
Nitin Gupta [Tue, 22 Sep 2009 04:56:54 +0000 (10:26 +0530)]
Staging: ramzswap: documentation

Short guide on how to setup and use ramzswap.

Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: virtual block device driver (ramzswap)
Nitin Gupta [Tue, 22 Sep 2009 04:56:53 +0000 (10:26 +0530)]
Staging: virtual block device driver (ramzswap)

Creates RAM based block devices (/dev/ramzswapX) which can be
used (only) as swap disks. Pages swapped to these are compressed
and stored in memory itself.

The module is called ramzswap.ko. It depends on:
 - xvmalloc memory allocator (compiled with this driver)
 - lzo_compress.ko
 - lzo_decompress.ko

See ramzswap.txt for usage details.

Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: xvmalloc memory allocator
Nitin Gupta [Tue, 22 Sep 2009 04:56:52 +0000 (10:26 +0530)]
Staging: xvmalloc memory allocator

* Features:
 - Low metadata overhead (just 4 bytes per object)
 - O(1) Alloc/Free - except when we have to call system page allocator to
   get additional memory.
 - Very low fragmentation: In all tests, xvmalloc memory usage is within 12%
   of "Ideal".
 - Pool based allocator: Each pool can grow and shrink.
 - It maps pages only when required. So, it does not hog vmalloc area which
   is very small on 32-bit systems.

SLUB allocator could not be used due to fragmentation issues:
http://code.google.com/p/compcache/wiki/AllocatorsComparison
Data here shows kmalloc using ~43% more memory than TLSF and xvMalloc
is showed ~2% more space efficiency than TLSF (due to smaller metadata).
Creating various kmem_caches can reduce space efficiency gap but still
problem of being limited to low memory exists. Also, it depends on
allocating higher order pages to reduce fragmentation - this is not
acceptable for ramzswap as it is used under memory crunch (its a swap
device!).

SLOB allocator could not be used do to reasons mentioned here:
http://lkml.org/lkml/2009/3/18/210

* Implementation:
It uses two-level bitmap search to find free list containing block of
correct size. This idea is taken from TLSF (Two-Level Segregate Fit)
allocator and is well explained in its paper (see [Links] below).

* Limitations:
 - Poor scalability: No per-cpu data structures (work in progress).

[Links]
1. Details and Performance data:
http://code.google.com/p/compcache/wiki/xvMalloc
http://code.google.com/p/compcache/wiki/xvMallocPerformance

2. TLSF memory allocator:
home: http://rtportal.upv.es/rtmalloc/
paper: http://rtportal.upv.es/rtmalloc/files/MRBC_2008.pdf

Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: pcl816: update convert_src mask for AI cmdtest
Ian Abbott [Fri, 20 Nov 2009 11:32:38 +0000 (11:32 +0000)]
Staging: comedi: pcl816: update convert_src mask for AI cmdtest

The COMEDI_CMDTEST ioctl needs to clear unsupported bits in the
struct comedi_cmd's convert_src and other *_src members.  This
needs fixing in the pcl816 driver's AI cmdtest.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: initialize divisor variables
Ian Abbott [Fri, 20 Nov 2009 11:32:37 +0000 (11:32 +0000)]
Staging: comedi: initialize divisor variables

The i8253_cascade_ns_to_timer_2div() function (and
i8253_cascade_ns_to_timer macro) checks the old values *d1 and *d2
for correctness as a heuristic before calculating new values.  Don't
call the function with uninitialized values in *d1 and *d2.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: serial2002: decrease stack usage
Ian Abbott [Fri, 20 Nov 2009 11:32:36 +0000 (11:32 +0000)]
Staging: comedi: serial2002: decrease stack usage

512 bytes of stack can be saved in serial_2002_open() by modifying
'struct config_t'.  A short int suffices for the 'kind' and 'bits'
members.  (Actually, a char would suffice, but wouldn't save any more
stack than a short int.)

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: fix usbdux timeout bug
Bernd Porr [Mon, 16 Nov 2009 01:12:02 +0000 (01:12 +0000)]
Staging: comedi: fix usbdux timeout bug

I've fixed a bug in the USBDUX driver which caused timeouts while
sending commands to the boards. This was mainly because of one bulk
transfer which had a timeout of 1ms (!). I've now set all timeouts to
1000ms.

From: Bernd Porr <BerndPorr@f2s.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ke_counter: fix style issues
Dirk Hohndel [Wed, 21 Oct 2009 08:05:50 +0000 (01:05 -0700)]
Staging: comedi: ke_counter: fix style issues

80 char limit (where useful)
braces around single line block
KERN_ facility for printk

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ii_pci_20kc: fix style printk
Dirk Hohndel [Wed, 21 Oct 2009 08:05:49 +0000 (01:05 -0700)]
Staging: comedi: ii_pci_20kc: fix style printk

add KERN_ facility to printk (mostly KERN_INFO, some KERN_WARNING)
I think I found a bug - commented on it but didn't change as it's just
in a printk (off by 1 error in output)

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ii_pci20kc: white space fixes
Dirk Hohndel [Wed, 21 Oct 2009 08:05:48 +0000 (01:05 -0700)]
Staging: comedi: ii_pci20kc: white space fixes

No code changes - left some 80 char violations alone as
folding those lines would have made code less readable

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: icp_multi: don't init static
Dirk Hohndel [Wed, 21 Oct 2009 08:05:47 +0000 (01:05 -0700)]
Staging: comedi: icp_multi: don't init static

don't initialize static variable to 0

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: icp_multi: fix style issue printk
Dirk Hohndel [Wed, 21 Oct 2009 08:05:46 +0000 (01:05 -0700)]
Staging: comedi: icp_multi: fix style issue printk

add KERN_ facility to printk (mostly KERN_DEBUG, some KERN_WARNING)

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: icp_multi: white space style fixes
Dirk Hohndel [Wed, 21 Oct 2009 08:05:45 +0000 (01:05 -0700)]
Staging: comedi: icp_multi: white space style fixes

no code changes, just fixing white space, line length, etc

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: gsc_hdpi: style fixes static function
Dirk Hohndel [Wed, 21 Oct 2009 08:05:44 +0000 (01:05 -0700)]
Staging: comedi: gsc_hdpi: style fixes static function

Convert external function to static

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: gsc_hpdi: Fix style issues
Dirk Hohndel [Wed, 21 Oct 2009 08:05:43 +0000 (01:05 -0700)]
Staging: comedi: gsc_hpdi: Fix style issues

Style cleanup in staging based on Greg's tutorial / checkpatch
Fix 80 char line length (where useful) - includes two changes to code
to make it more logical / readable
Remove {} around single line blocks

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: gsc_hpdi: style fixes printk
Dirk Hohndel [Wed, 21 Oct 2009 08:05:42 +0000 (01:05 -0700)]
Staging: comedi: gsc_hpdi: style fixes printk

Style cleanup in staging based on Greg's tutorial / checkpatch
Add printk KERN_ facility level (KERN_WARNING seemed appropriate for all)

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: drivers: ni_6527: fixup checkpatch.pl warnings
Klaas van Gend [Wed, 28 Oct 2009 01:01:08 +0000 (02:01 +0100)]
Staging: comedi: drivers: ni_6527: fixup checkpatch.pl warnings

This patch fixes all warnings as issued by checkpatch.pl.
Note that I had to modify some of the logging messages to make that possible.

Signed-off-by: Klaas van Gend <klaas.van.gend@mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: comedi_fc: checkpatch.pl fixes
Klaas van Gend [Wed, 28 Oct 2009 01:01:07 +0000 (02:01 +0100)]
Staging: comedi: comedi_fc: checkpatch.pl fixes

This patch fixes all warnings as issued by checkpatch.pl.

Signed-off-by: Klaas van Gend <klaas.van.gend@mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: pcl726: fix coding style issues
Kevyn-Alexandre Paré [Fri, 23 Oct 2009 21:34:17 +0000 (17:34 -0400)]
Staging: comedi: pcl726: fix coding style issues

Signed-off-by: Kevyn-Alexandre Paré <kevyn.alexandre.pare@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: addi-data: Cleanup redundant tests on unsigned
Roel Kluin [Fri, 23 Oct 2009 10:26:25 +0000 (12:26 +0200)]
Staging: comedi: addi-data: Cleanup redundant tests on unsigned

The variables are unsigned so the test `>= 0' is always true,
In these cases the other part of the test catch wrapped values.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: comedi: multiq3: add KERN_
Klaas van Gend [Thu, 22 Oct 2009 05:51:00 +0000 (07:51 +0200)]
staging: comedi: multiq3: add KERN_

Add KERN_ to printk statements to reduce the number of warnings
shown by checkpatch.pl.

Signed-off-by: Klaas van Gend <klaas.van.gend@mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: comedi: multiq3: remove warning on braces
Klaas van Gend [Thu, 22 Oct 2009 05:50:59 +0000 (07:50 +0200)]
staging: comedi: multiq3: remove warning on braces

Remove braces in if statements to make the file exhibit less warnings
when checked using checkpatch.pl.

Signed-off-by: Klaas van Gend <klaas.van.gend@mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: adl_pci8164 coding style fixes
BRAGA, Bruno [Thu, 22 Oct 2009 02:55:36 +0000 (11:55 +0900)]
Staging: comedi: adl_pci8164 coding style fixes

Corrected coding style:
- excessive curly braces
- printk without KERN_* logging
- 80+ chars per line of code

Signed-off-by: BRAGA, Bruno <bruno.braga@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: remove EXTERN macro since it is not used
Shawn Bohrer [Sun, 18 Oct 2009 20:32:19 +0000 (15:32 -0500)]
Staging: comedi: remove EXTERN macro since it is not used

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: remove __cplusplus check
Shawn Bohrer [Sun, 18 Oct 2009 20:32:18 +0000 (15:32 -0500)]
Staging: comedi: remove __cplusplus check

c++ isn't supported in the kernel.

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: Don't check for -ENOIOCTLCMD
Shawn Bohrer [Sun, 18 Oct 2009 20:32:17 +0000 (15:32 -0500)]
Staging: comedi: Don't check for -ENOIOCTLCMD

unlocked_ioctl() never returns -ENOIOCTLCMD so remove the check.

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: remove check for HAVE_COMPAT_IOCTL
Shawn Bohrer [Sun, 18 Oct 2009 20:32:16 +0000 (15:32 -0500)]
Staging: comedi: remove check for HAVE_COMPAT_IOCTL

All new kernels have support for compat_ioctl so remove the check and support
for older kernels.

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: comedi: Remove check for HAVE_UNLOCKED_IOCTL
Shawn Bohrer [Sun, 18 Oct 2009 20:32:15 +0000 (15:32 -0500)]
staging: comedi: Remove check for HAVE_UNLOCKED_IOCTL

All new kernels have unlocked_ioctl so we don't need to check.

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: pcmmio: more coding style cleanup
Daniel Patrick Johnson [Wed, 14 Oct 2009 02:04:24 +0000 (02:04 +0000)]
Staging: comedi: pcmmio: more coding style cleanup

Signed-off-by: Daniel Patrick Johnson <teknotus@teknot.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: pcmmio: Coding style cleanup
Daniel Patrick Johnson [Wed, 14 Oct 2009 02:04:23 +0000 (02:04 +0000)]
Staging: comedi: pcmmio: Coding style cleanup

Signed-off-by: Daniel Patrick Johnson <teknotus@teknot.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: Comedi: pcm_common: Fixed all checkpatch issues
Daniel Patrick Johnson [Wed, 14 Oct 2009 02:04:21 +0000 (02:04 +0000)]
Staging: Comedi: pcm_common: Fixed all checkpatch issues

Signed-off-by: Daniel Patrick Johnson <teknotus@teknot.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_mio_cs.c: coding style cleanup
Daniel Patrick Johnson [Wed, 7 Oct 2009 23:52:25 +0000 (23:52 +0000)]
Staging: comedi: ni_mio_cs.c: coding style cleanup

Signed-off-by: Daniel Patrick Johnson <teknotus@teknot.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: trivial fix of a very frequent spelling mistake
Dirk Hohndel [Tue, 29 Sep 2009 09:23:44 +0000 (11:23 +0200)]
Staging: comedi: trivial fix of a very frequent spelling mistake

something-bility is spelled as something-blity so a grep for 'blit'
would find these lines

this is so trivial that I didn't split it by subsystem / copy additional
maintainers - all changes are to comments The only purpose is to get
fewer false positives when grepping around the kernel sources.

Signed-off-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: amplc_pc263.c: more coding style fixes
Kevyn-Alexandre Paré [Sat, 26 Sep 2009 02:32:17 +0000 (19:32 -0700)]
Staging: comedi: amplc_pc263.c: more coding style fixes

Signed-off-by: Kevyn-Alexandre Paré <kevyn.alexandre.pare@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: amplc_pc263.c: fix coding style issues
Kevyn-Alexandre Paré [Sat, 26 Sep 2009 02:32:16 +0000 (19:32 -0700)]
Staging: comedi: amplc_pc263.c: fix coding style issues

Signed-off-by: Kevyn-Alexandre Paré <kevyn.alexandre.pare@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: adl_pci7432: coding style cleanup
Bruce Jones [Tue, 29 Sep 2009 17:56:57 +0000 (10:56 -0700)]
Staging: comedi: adl_pci7432: coding style cleanup

Correct coding style problems in this file.

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: adl_pci7296: CodingStyle cleanup
Bruce Jones [Tue, 29 Sep 2009 17:43:29 +0000 (10:43 -0700)]
Staging: comedi: adl_pci7296: CodingStyle cleanup

Fix up printk's and other simple coding style issues.

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: acl7225b.c: CodingStyle printk fixups
Bruce Jones [Tue, 29 Sep 2009 17:26:29 +0000 (10:26 -0700)]
Staging: comedi: acl7225b.c: CodingStyle printk fixups

Clean up the printk's in this driver.

Signed-off-by: Bruce Jones <brucej@linux.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: comedi_compat32.h: Fixed checkpatch.pl issues
Shane Warden [Tue, 22 Sep 2009 23:13:03 +0000 (16:13 -0700)]
Staging: comedi: comedi_compat32.h: Fixed checkpatch.pl issues

Signed-off-by: Shane Warden <shane.warden@onyxneon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: vmk80xx: cleanup formatting
Bruce Jones [Thu, 24 Sep 2009 22:39:52 +0000 (15:39 -0700)]
Staging: comedi: vmk80xx: cleanup formatting

Clean up formatting of a struct initializer, as per the
standard conventions.

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_atmio16d: printk fixups
Bruce Jones [Thu, 24 Sep 2009 22:03:36 +0000 (15:03 -0700)]
Staging: comedi: ni_atmio16d: printk fixups

Fix improper use of printks in this driver.  Most are
debug messages under a DEBUG #ifdef, a few are info/warnings
that should get logged for driver error conditions.

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: nt_atmio16d: space and tab fixes
Bruce Jones [Thu, 24 Sep 2009 22:02:36 +0000 (15:02 -0700)]
Staging: comedi: nt_atmio16d: space and tab fixes

Turn spaces into tabs to keep scripts/checkpatch.pl happy.  The
actual changes here are in a comment, so the script is just
being silly.

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_atmio16d: brace fixes
Bruce Jones [Thu, 24 Sep 2009 22:01:35 +0000 (15:01 -0700)]
Staging: comedi: ni_atmio16d: brace fixes

Fix improper use of braces in drivers/staging/comedi/drivers/ni_atmio16d.c

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_atmio16d: fix formating errors
Bruce Jones [Thu, 24 Sep 2009 21:59:52 +0000 (14:59 -0700)]
Staging: comedi: ni_atmio16d: fix formating errors

Correct formatting errors - in this case line length and spaces before
parens.

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: mite.h: deletion of unused functions
matt mooney [Thu, 1 Oct 2009 02:25:02 +0000 (19:25 -0700)]
Staging: comedi: mite.h: deletion of unused functions

drivers/mite.h: removed declared but undefined functions mite_ll_from_kvmem
and mite_setregs

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: mite.c: fix coding style
matt mooney [Thu, 1 Oct 2009 02:24:00 +0000 (19:24 -0700)]
Staging: comedi: mite.c: fix coding style

- drivers/mite.c: added KERN_ facility level to printk
 - moved EXPORT_SYMBOL macro to follow function/variable

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comdi: ni_at_ao.c: fix coding style error
Allison Randal [Thu, 24 Sep 2009 07:19:43 +0000 (00:19 -0700)]
Staging: comdi: ni_at_ao.c: fix coding style error

The line was too long, used braces on single line for loop body.

Signed-off-by: Allison Randal <allison@parrot.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: comedidev.h: Fixed checkpatch.pl issues
Shane Warden [Tue, 22 Sep 2009 23:13:04 +0000 (16:13 -0700)]
Staging: comedi: comedidev.h: Fixed checkpatch.pl issues

Signed-off-by: Shane Warden <shane.warden@onyxneon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: comedi_compat32: Fixed checkpatch.pl issues
Shane Warden [Tue, 22 Sep 2009 23:13:02 +0000 (16:13 -0700)]
Staging: comedi: comedi_compat32: Fixed checkpatch.pl issues

Signed-off-by: Shane Warden <shane.warden@onyxneon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_labpc_cs: wrapped long comments
Bart Massey [Mon, 21 Sep 2009 18:48:52 +0000 (11:48 -0700)]
Staging: comedi: ni_labpc_cs: wrapped long comments

Signed-off-by: Bart Massey <bart@cs.pdx.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_labpc_cs: removed null check from kfree
Bart Massey [Mon, 21 Sep 2009 18:38:07 +0000 (11:38 -0700)]
Staging: comedi: ni_labpc_cs: removed null check from kfree

Signed-off-by: Bart Massey <bart@cs.pdx.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_labpc_cs: removed null initialization of static
Bart Massey [Mon, 21 Sep 2009 18:33:06 +0000 (11:33 -0700)]
Staging: comedi: ni_labpc_cs: removed null initialization of static

Signed-off-by: Bart Massey <bart@cs.pdx.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_labbc_cs: cleaned up debug define a bit
Bart Massey [Mon, 21 Sep 2009 18:32:36 +0000 (11:32 -0700)]
Staging: comedi: ni_labbc_cs: cleaned up debug define a bit

Signed-off-by: Bart Massey <bart@cs.pdx.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: ni_labpc.h: Fixed line lengths of some trailing comments.
Shane Warden [Mon, 21 Sep 2009 18:51:44 +0000 (11:51 -0700)]
Staging: comedi: ni_labpc.h: Fixed line lengths of some trailing comments.

Signed-off-by: Shane Warden <shane.warden@onyxneon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: adl_pci6208: code styling fix
Vlatko Kosturjak [Mon, 21 Sep 2009 19:32:40 +0000 (21:32 +0200)]
Staging: comedi: adl_pci6208: code styling fix

Fix a checkpatch.pl errors.

Signed-off-by: Vlatko Kosturjak <kost@linux.hr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: drivers.c: checkpatch fix
Mithlesh Thukral [Mon, 21 Sep 2009 18:53:27 +0000 (11:53 -0700)]
Staging: comedi: drivers.c: checkpatch fix

Fix a checkpatch.pl error. Fix struct * foo to struct *foo

Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: 8255: Fix coding style error
Ben Kero [Wed, 23 Sep 2009 09:49:05 +0000 (02:49 -0700)]
Staging: comedi: 8255: Fix coding style error

EXPORT_SYMBOL's in the wrong place.  Unnecessary {}s

Signed-off-by: Ben Kero <ben.kero@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: comedi: 8253: fix coding style error
Greg Kroah-Hartman [Mon, 21 Sep 2009 18:35:45 +0000 (11:35 -0700)]
Staging: comedi: 8253: fix coding style error

The line was too long.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Convert simple_strtoul to strict_strtoul in midi.c
Shawn Bohrer [Mon, 16 Nov 2009 04:18:02 +0000 (22:18 -0600)]
staging: line6: Convert simple_strtoul to strict_strtoul in midi.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Convert simple_strtoul to strict_strtoul in pod.c
Shawn Bohrer [Mon, 16 Nov 2009 04:18:01 +0000 (22:18 -0600)]
staging: line6: Convert simple_strtoul to strict_strtoul in pod.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Convert simple_strtoul to strict_strtoul in variax.c
Shawn Bohrer [Mon, 16 Nov 2009 04:18:00 +0000 (22:18 -0600)]
staging: line6: Convert simple_strtoul to strict_strtoul in variax.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Convert simple_strtol to strict_strtol in toneport.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:59 +0000 (22:17 -0600)]
staging: line6: Convert simple_strtol to strict_strtol in toneport.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Lindent and fix some checkpatch warnings in toneport.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:58 +0000 (22:17 -0600)]
staging: line6: Lindent and fix some checkpatch warnings in toneport.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Fix checkpatch warnings in pcm.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:57 +0000 (22:17 -0600)]
staging: line6: Fix checkpatch warnings in pcm.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Convert simple_strtoul() to strict_strtoul in control.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:56 +0000 (22:17 -0600)]
staging: line6: Convert simple_strtoul() to strict_strtoul in control.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Fix some checkpatch warnings in control.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:55 +0000 (22:17 -0600)]
staging: line6: Fix some checkpatch warnings in control.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Lindent control.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:54 +0000 (22:17 -0600)]
staging: line6: Lindent control.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Fix checkpatch errors in capture.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:53 +0000 (22:17 -0600)]
staging: line6: Fix checkpatch errors in capture.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Lindent and fix checkpatch warnings in capture.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:52 +0000 (22:17 -0600)]
staging: line6: Lindent and fix checkpatch warnings in capture.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Fix checkpatch errors in playback.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:51 +0000 (22:17 -0600)]
staging: line6: Fix checkpatch errors in playback.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agostaging: line6: Lindent and fix checkpatch warnings in playback.c
Shawn Bohrer [Mon, 16 Nov 2009 04:17:50 +0000 (22:17 -0600)]
staging: line6: Lindent and fix checkpatch warnings in playback.c

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: line6: fix printk formats
Randy Dunlap [Thu, 12 Nov 2009 23:46:01 +0000 (15:46 -0800)]
Staging: line6: fix printk formats

Fix printk format warnings in line6/pod.c; sizeof() is of type
size_t, so use %zu.

drivers/staging/line6/pod.c:581: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
drivers/staging/line6/pod.c:693: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: line6 driver.c: factorize code and cleanups
Frederik Deweerdt [Tue, 15 Sep 2009 09:29:43 +0000 (09:29 +0000)]
Staging: line6 driver.c: factorize code and cleanups

- Factorize the code from line6_send_raw_message and line6_send_program into line6_send
- Minor style cleanups

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xprog.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: b3dfg: remove check for pci bus master
Vasilis Liaskovitis [Tue, 22 Sep 2009 06:11:56 +0000 (01:11 -0500)]
Staging: b3dfg: remove check for pci bus master

Remove unneccesary check for pci master in enable_transmission()

Signed-off-by: Vasilis Liaskovitis <vliaskov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: remove no longer needed rt3090 driver
Bartlomiej Zolnierkiewicz [Tue, 22 Sep 2009 18:44:33 +0000 (20:44 +0200)]
Staging: remove no longer needed rt3090 driver

rt2860 handles now all rt2860/rt3090 chipsets.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: rt2860: add RT3090 chipset support
Bartlomiej Zolnierkiewicz [Tue, 22 Sep 2009 18:44:24 +0000 (20:44 +0200)]
Staging: rt2860: add RT3090 chipset support

Add support for RT3090 chipset
(based on 2009_0612_RT3090_Linux_STA_V2.1.0.0_DPO).

Tested with RT2860.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: rt28x0: remove unused code from common/dfs.c
Bartlomiej Zolnierkiewicz [Tue, 22 Sep 2009 18:44:15 +0000 (20:44 +0200)]
Staging: rt28x0: remove unused code from common/dfs.c

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: rt28x0: updates from vendor's V2.1.0.0 drivers
Bartlomiej Zolnierkiewicz [Tue, 22 Sep 2009 18:44:07 +0000 (20:44 +0200)]
Staging: rt28x0: updates from vendor's V2.1.0.0 drivers

Port changes from:

* 2009_0420_RT2860_Linux_STA_V2.1.0.0
* 2009_0302_RT2870_Linux_STA_v2.1.0.0
* 2009_0525_RT3070_Linux_STA_v2.1.1.0

to in-kernel drivers.

From the RT2860 driver release note:

[2.1.0.0]
1. New generation schema for multiple OS porting
2. Fixed Ad-hoc ping failed in noisy environment. (Probe Response has too
    many retry packet then cause "not enough space in MgmtRing")
3. Fixed WPA(2)PSK issue when group cipher of AP is WEP40 or WEP104.
4. Modified iwpriv ra0 get_site_survey:
In scan list result: Security shows "NONE" when AP is OPEN/NONE,
shows "WEP" when AP is OPEN/WEP or SHARED/WEP, shows
"WPAPSK(WPA2PSK)/TKIP(AES)" when AP is WPAPSK(WPA2PSK)/TKIP(AES)
shows "WPA(WPA2)/TKIP(AES)" when AP is WPA(WPA2)/TKIP(AES)
5. Support kthread.
6. Add New A band channel list region 15 contains the whole channels in
   the A band region 4 and the new CE channel 167,169,171,173
7. Add New IEEE802.11r functionality.
8. Fixed WPA2-Enterprise failed when AP reboot or turn off then turn on.
9. Fixed STA cannot connect to 11B only AP when the setting of is PHY_11GN.

From the RT2870 driver release note:

[V2.1.0.0]
1. New generation schema for multiple OS porting.
2. Fixed Ad-hoc ping failed in noisy environment. (Probe Response has too
   many retry packet then cause "not enough space in MgmtRing").
3. Fixed WPS failed with D-Link DIR-628 in 5GHz.
4. Change FastRoaming in DAT file to AutoRoaming.
5. Support kthread.
6. Add New A band channel list region 15 contains the whole channels in
   the A band region and the new CE channel 167,169,171,173.
7. New IEEE802.11r functionality.

From the RT3070 driver release note:

Version V2.1.1.0
       1. Linux kernel 2.6.29 support.
       2. Fix eFuse write from BIN file bug.

Version 2.1.0.0
       1. New generation schema for multiple OS porting
       2. Fixed Ad-hoc ping failed in noisy environment.
       3. Modified iwpriv ra0 get_site_survey:
       4. Change FastRoaming in DAT file to AutoRoaming.
       5. Support kthread.
       6. New IEEE802.11r functionality.

Tested with RT2860 and RT3070 chipsets.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: rt3090: remove private ioctls
Bartlomiej Zolnierkiewicz [Tue, 22 Sep 2009 18:43:59 +0000 (20:43 +0200)]
Staging: rt3090: remove private ioctls

This makes rt3090 match other Ralink drivers.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: rt3090: remove private debugging ioctls
Bartlomiej Zolnierkiewicz [Tue, 22 Sep 2009 18:43:50 +0000 (20:43 +0200)]
Staging: rt3090: remove private debugging ioctls

This makes rt3090 match other Ralink drivers.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: rt3090: disable HAS_ANTENNA_DIVERSITY_SUPPORT option
Bartlomiej Zolnierkiewicz [Tue, 22 Sep 2009 18:43:39 +0000 (20:43 +0200)]
Staging: rt3090: disable HAS_ANTENNA_DIVERSITY_SUPPORT option

This makes rt3090 match other Ralink drivers and V2.2.0.0 vendor version.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoStaging: rt3090: disable HAS_ATE option
Bartlomiej Zolnierkiewicz [Tue, 22 Sep 2009 18:43:29 +0000 (20:43 +0200)]
Staging: rt3090: disable HAS_ATE option

Disable ATE debugging functionality.

This makes rt3090 match other Ralink drivers and V2.2.0.0 vendor version.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Linus Torvalds [Thu, 10 Dec 2009 17:35:44 +0000 (09:35 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/tj/wq

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Add debugobjects support

14 years agoMerge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
Linus Torvalds [Thu, 10 Dec 2009 17:35:02 +0000 (09:35 -0800)]
Merge branch 'bugfix' of git://git./linux/kernel/git/jeremy/xen

* 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen: try harder to balloon up under memory pressure.
  Xen balloon: fix totalram_pages counting.
  xen: explicitly create/destroy stop_machine workqueues outside suspend/resume region.
  xen: improve error handling in do_suspend.
  xen: don't leak IRQs over suspend/resume.
  xen: call clock resume notifier on all CPUs
  xen: use iret for return from 64b kernel to 32b usermode
  xen: don't call dpm_resume_noirq() with interrupts disabled.
  xen: register runstate info for boot CPU early
  xen: register runstate on secondary CPUs
  xen: register timer interrupt with IRQF_TIMER
  xen: correctly restore pfn_to_mfn_list_list after resume
  xen: restore runstate_info even if !have_vcpu_info_placement
  xen: re-register runstate area earlier on resume.
  xen: wait up to 5 minutes for device connetion
  xen: improvement to wait_for_devices()
  xen: fix is_disconnected_device/exists_disconnected_device
  xen/xenbus: make DEVICE_ATTR()s static

14 years agoMerge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
Linus Torvalds [Thu, 10 Dec 2009 17:34:40 +0000 (09:34 -0800)]
Merge branch 'xen/fbdev' of git://git./linux/kernel/git/jeremy/xen

* 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
  fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
  fb-defio: If FBINFO_VIRTFB is defined, do not set VM_IO flag.
  Fix toogle whether xenbus driver should be built as module or part of kernel.

14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
Linus Torvalds [Thu, 10 Dec 2009 17:33:59 +0000 (09:33 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/teigland/dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: always use GFP_NOFS

14 years agoMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Linus Torvalds [Thu, 10 Dec 2009 17:33:29 +0000 (09:33 -0800)]
Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (47 commits)
  ext4: Fix potential fiemap deadlock (mmap_sem vs. i_data_sem)
  ext4: Do not override ext2 or ext3 if built they are built as modules
  jbd2: Export jbd2_log_start_commit to fix ext4 build
  ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT
  ext4: Wait for proper transaction commit on fsync
  ext4: fix incorrect block reservation on quota transfer.
  ext4: quota macros cleanup
  ext4: ext4_get_reserved_space() must return bytes instead of blocks
  ext4: remove blocks from inode prealloc list on failure
  ext4: wait for log to commit when umounting
  ext4: Avoid data / filesystem corruption when write fails to copy data
  ext4: Use ext4 file system driver for ext2/ext3 file system mounts
  ext4: Return the PTR_ERR of the correct pointer in setup_new_group_blocks()
  jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer()
  ext4: remove unused parameter wbc from __ext4_journalled_writepage()
  ext4: remove encountered_congestion trace
  ext4: move_extent_per_page() cleanup
  ext4: initialize moved_len before calling ext4_move_extents()
  ext4: Fix double-free of blocks with EXT4_IOC_MOVE_EXT
  ext4: use ext4_data_block_valid() in ext4_free_blocks()
  ...

14 years agoMerge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Linus Torvalds [Thu, 10 Dec 2009 17:32:24 +0000 (09:32 -0800)]
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: Multi-device mirror support
  exofs: Move all operations to an io_engine
  exofs: move osd.c to ios.c
  exofs: statfs blocks is sectors not FS blocks
  exofs: Prints on mount and unmout
  exofs: refactor exofs_i_info initialization into common helper
  exofs: dbg-print less
  exofs: More sane debug print
  trivial: some small fixes in exofs documentation