linux/drivers/staging/android, branch v3.13

staging: ashmem: Fix ASHMEM_PURGE_ALL_CACHES return value

2013-10-25T05:22:39Z

Hopefully this isn't too late for 3.12. In commit 7dc19d5aff (convert shrinkers to new count/scan API) the return value to PURGE_ALL_CACHES was dropped, causing -EPERM to always be returned. This patch re-adds the ret assignment, setting it to the the ashmem_shrink_count(), which is the lru_count. (Sorry this was missed in the review!) Fixes: 7dc19d5affd7 ("convert shrinkers to new count/scan API") Cc: Colin Cross Cc: Android Kernel Team Cc: Glauber Costa Reported-by: YongQin Liu Signed-off-by: John Stultz Cc: stable # 3.12 Acked-by: Dave Chinner Signed-off-by: Greg Kroah-Hartman

staging/android: Add kerneldoc to one function in alarm-dev.c

2013-09-17T14:47:40Z

Sorry. I thought that this would be a nice easy class to document fully. Turns out I was very wrong - I will have to research the Linux alarm and timer subsystem one day next week and try again. Here is what I started out with, anyway. It's not much, but it's better than nothing! Signed-off-by: Cruz Julian Bishop Signed-off-by: Greg Kroah-Hartman

staging/android: Add some more kerneldoc to ashmem.c

2013-09-17T14:47:40Z

I am sorry if I have interpreted anything incorrectly here. This is my second day really attempting to understand the Ashmem system. I can not finish documenting this class at this stage - There is still more that I have to learn. For now, however, it will have to do. Signed-off-by: Cruz Julian Bishop Signed-off-by: Greg Kroah-Hartman

staging/android: Initial partial kernel-doc for ashmem.c

2013-09-17T14:47:40Z

I am beginning to understand the core concepts at play here. I am nowhere near finished with this class - However, it is better if I commit what I have documented so far tonight - That way, if I mess up tomorrow morning, I can just roll back to here. Sorry if this clutters things up. In the end, once *everything* is documented, it will make understanding the Android staging driver easier to understand as a programmer - Hopefully for both new developers and current ones. Signed-off-by: Cruz Julian Bishop Signed-off-by: Greg Kroah-Hartman

staging/android: Persistent formatting of help Kconfig entries

2013-09-17T14:47:40Z

Three entries were recently added with help listed as "help", while all previous entries were listed as "---help---" to make it more noticeable. This commit fixes that. Sorry that it is so trivial, but it's been bugging me for a while. Signed-off-by: Cruz Julian Bishop Signed-off-by: Greg Kroah-Hartman

Staging: android: Remove extern from function prototypes in .h files

2013-09-17T14:47:39Z

checkpatch.pl complains that extern prototypes should be avoided in .h files Signed-off-by: Bojan Prtvar Signed-off-by: Greg Kroah-Hartman

drivers: staging: android: Kconfig: add depends on MMU for ANDROID_BINDER_IPC

2013-09-17T14:47:39Z

ANDROID_BINDER_IPC used the functions which need depend on MMU, so need let it depend on MMU too, or compiling fails. The related error: drivers/built-in.o: In function `binder_update_page_range': drivers/staging/android/binder.c:599: undefined reference to `map_vm_area' drivers/staging/android/binder.c:626: undefined reference to `zap_page_range' drivers/built-in.o: In function `binder_mmap': drivers/staging/android/binder.c:2744: undefined reference to `get_vm_area' Signed-off-by: Chen Gang Signed-off-by: Greg Kroah-Hartman

Staging: android: Mark local functions in binder.c as static

2013-09-17T14:47:39Z

This fixes the following sparse warnings drivers/staging/android/binder.c:1703:5: warning: symbol 'binder_thread_write' was not declared. Should it be static? drivers/staging/android/binder.c:2058:6: warning: symbol 'binder_stat_br' was not declared. Should it be static? Signed-off-by: Bojan Prtvar Signed-off-by: Greg Kroah-Hartman

Staging: android: add __user annotation in binder.c

2013-09-17T14:47:39Z

This fixes the following sparse error drivers/staging/android/binder.c:1795:36: error: incompatible types in comparison expression (different address spaces) Signed-off-by: Bojan Prtvar Signed-off-by: Greg Kroah-Hartman

Merge git://git.kvack.org/~bcrl/aio-next

2013-09-13T17:55:58Z

Pull aio changes from Ben LaHaise: "First off, sorry for this pull request being late in the merge window. Al had raised a couple of concerns about 2 items in the series below. I addressed the first issue (the race introduced by Gu's use of mm_populate()), but he has not provided any further details on how he wants to rework the anon_inode.c changes (which were sent out months ago but have yet to be commented on). The bulk of the changes have been sitting in the -next tree for a few months, with all the issues raised being addressed" * git://git.kvack.org/~bcrl/aio-next: (22 commits) aio: rcu_read_lock protection for new rcu_dereference calls aio: fix race in ring buffer page lookup introduced by page migration support aio: fix rcu sparse warnings introduced by ioctx table lookup patch aio: remove unnecessary debugging from aio_free_ring() aio: table lookup: verify ctx pointer staging/lustre: kiocb->ki_left is removed aio: fix error handling and rcu usage in "convert the ioctx list to table lookup v3" aio: be defensive to ensure request batching is non-zero instead of BUG_ON() aio: convert the ioctx list to table lookup v3 aio: double aio_max_nr in calculations aio: Kill ki_dtor aio: Kill ki_users aio: Kill unneeded kiocb members aio: Kill aio_rw_vect_retry() aio: Don't use ctx->tail unnecessarily aio: io_cancel() no longer returns the io_event aio: percpu ioctx refcount aio: percpu reqs_available aio: reqs_active -> reqs_available aio: fix build when migration is disabled ...