The arguments to shrink functions have changed, update
ashmem_shrink to match.
Signed-off-by: NColin Cross <ccross@android.com>
[jstultz: tweaked commit subject]
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: NBjorn Bringert <bringert@android.com>
[jstultz: tweaked commit subject]
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: NColin Cross <ccross@google.com>
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: NArve Hjønnevåg <arve@android.com>
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: NBjorn Bringert <bringert@android.com>
[jstultz: Tweaked commit subject]
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

The anonymous shared memory (ashmem) subsystem provides a
Unix-y,file-based shared memory interface to user-space. It
works like anonymous memory (e.g. mmapping fd=0) except if
you share the file descriptor via the usual means, you will
share the mapping. The shared memory can be accessed via both
mmap or file I/O. The backing store is a simple shmem file.

Additionally, ashmem introduces the concept of page pinning.
Pinned pages (the default) behave like any anonymous memory.
Unpinned pages are available to the kernel for eviction during
VM pressure. When repinning the pages, the return value
instructs user-space as to any eviction. In this manner,
user-space processes may implement caching and similar
resource management that efficiently integrates with kernel
memory management.
Signed-off-by: NRobert Love <rlove@google.com>

ashmem: Don't install fault handler for private mmaps.

Ashmem is used to create named private heaps. If this heap is backed
by a tmpfs file it will allocate two pages for every page touched.
In 2.6.27, the extra page would later be freed, but 2.6.29 does not
scan anonymous pages when running without swap so the memory is not
freed while the file is referenced. This change changes the behavior
of private ashmem mmaps to match /dev/zero instead tmpfs.
Signed-off-by: NArve Hjønnevåg <arve@android.com>

ashmem: Add common prefix to name reported in /proc/pid/maps
Signed-off-by: NArve Hjønnevåg <arve@android.com>

ashmem: don't require a page aligned size

This makes ashmem more similar to shmem and mmap, by
not requiring the specified size to be page aligned,
instead rounding it internally as needed.
Signed-off-by: NMarco Nelissen <marcone@android.com>
[jstultz: Improved commit subject and included patch description
from rlove. Also moved ashmem files to staging dir, and reworked
code to avoid touching mm/shmem.c while we're in staging.]
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This adds the Android pmem driver to the staging tree.

[At this point in time, it is dependent on the ARM platform, due to some
build issues that require it. - gregkh]
Signed-off-by: NRebecca Schultz <rschultz@google.com>
Signed-off-by: NRebecca Schultz Zavin <rebecca@android.com>
Signed-off-by: NDima Zavin <dima@android.com>
Signed-off-by: NJamie Gennis <jgennis@google.com>
Cc: Brian Swetland <swetland@google.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Colin Cross <ccross@android.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This fixes a number of minor space issues in the Android switch code.
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This adds the Android switch driver code to the staging tree.

[Note, this code was located in drivers/switch/ in the Android kernel
releases, but as that api wasn't generally accepted, and the interface
is working toward changing to the newly proposed extcon inteface, this
driver was placed here until the extcon code is merged into mainline and
the Android userspace code is converted over to using it. - gregkh]
Signed-off-by: NArve Hjønnevåg <arve@android.com>
Signed-off-by: NMike Lockwood <lockwood@android.com>
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Donggeun Kim <dg77.kim@samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: MyungJoo Ham <myungjoo.ham@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: NeilBrown <neilb@suse.de>
Cc: Morten CHRISTIANSEN <morten.christiansen@stericsson.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Right now just a tiler_map file to dump a 2d map of which areas in
tiler/dmm have pinned buffers (or reservations).  In the future more
could be added.
Signed-off-by: NRob Clark <rob@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

omap_gem_roll() could be called by fbcon in atomic context or when
struct_mutext is held.  Avoid aquiring mutex (deadlock), or calling
tiler_pin() (which itself is not safe for atomic context) in these
cases.
Signed-off-by: NRob Clark <rob@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Can be set at boot or module load time to prevent YWRAP scrolling from
being enabled.
Signed-off-by: NRob Clark <rob@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

The rtllib and rtllib_crypt drivers are both required for a fully
functional rtllib. Make sure both are always available by having
rtllib select rtllib_crypt.
Reported-by: NRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: NSean MacLennan <seanm@seanm.ca>
Acked-by: NRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This field moved into the trigger_ops structure a while back, but somehow
never quite got cleared up.  This clears the last few drivers to set it
(nothing uses it) and gets rid of it entirely.
Signed-off-by: NJonathan Cameron <jic23@kernel.org>
Acked-by: NLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

The core needs the owner field to prevent module removal whilst in use and
uses it without confirming that the trigger_ops structure actually exists.
Signed-off-by: NJonathan Cameron <jic23@kernel.org>
Acked-by: NLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: NMichael Hennerich <michael.hennerich@analog.com>
Acked-by: NJonathan Cameron <jic23@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: NMichael Hennerich <michael.hennerich@analog.com>
Acked-by: NJonathan Cameron <jic23@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Add missing scale attributes.
Temperature data is presented as 10-bit, twos complement number.
Therefore use singed and shift accordingly.
Signed-off-by: NMichael Hennerich <michael.hennerich@analog.com>
Acked-by: NJonathan Cameron <jic23@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Changed whitespaces in comedi/*.c to tabs where necessary. All .c
files within comedi now have no obvious style problems as reported by
checkpatch.pl
Signed-off-by: NFlorian Schmaus <fschmaus@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Fix comments style on structs and enums
Break long lines.
Signed-off-by: NJorgyano Vieira <jorgyano@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This patch fixes some space-before-tabs warnings found by checkpatch tool on the staging android driver file logger.c
Signed-off-by: NMarco Navarra <fromenglish@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the contec_pci_dio.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printk to dev_<levels>.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Included KERN_facility levels for printk.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the cb_pcidas64.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels> and Removed unnecessary
printk statements.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the cb_pcidas64.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels> and Removed unnecessary
printk statements.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the cb_pcidas.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels>..
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the cb_pcidas.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg()..
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Coverted printks to dev_<levels>.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the daqboard2000.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels>.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the ni_at_a2150.c file that fixes up a brace
warning found by the checkpatch.pl tool.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the jr3_pci.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_<levels> and Removed unnecessary
printk statements.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the jr3_pci.c file that fixes up a
printk warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the daqboard2000.c file that fixes up a printk
warning found by the checkpatch.pl tool.

converted printks to dev_printk and Removed unnecessary
printk statements.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the daqboard2000.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_dbg().
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_functions.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.

Converted printks to dev_functions.
Signed-off-by: NRavishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>