linux.git/drivers/staging/android, branch v3.4-rc2

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-30T01:12:23+00:00

Pull x32 support for x86-64 from Ingo Molnar:
 "This tree introduces the X32 binary format and execution mode for x86:
  32-bit data space binaries using 64-bit instructions and 64-bit kernel
  syscalls.

  This allows applications whose working set fits into a 32 bits address
  space to make use of 64-bit instructions while using a 32-bit address
  space with shorter pointers, more compressed data structures, etc."

Fix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}

* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)
  x32: Fix alignment fail in struct compat_siginfo
  x32: Fix stupid ia32/x32 inversion in the siginfo format
  x32: Add ptrace for x32
  x32: Switch to a 64-bit clock_t
  x32: Provide separate is_ia32_task() and is_x32_task() predicates
  x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls
  x86/x32: Fix the binutils auto-detect
  x32: Warn and disable rather than error if binutils too old
  x32: Only clear TIF_X32 flag once
  x32: Make sure TS_COMPAT is cleared for x32 tasks
  fs: Remove missed ->fds_bits from cessation use of fd_set structs internally
  fs: Fix close_on_exec pointer in alloc_fdtable
  x32: Drop non-__vdso weak symbols from the x32 VDSO
  x32: Fix coding style violations in the x32 VDSO code
  x32: Add x32 VDSO support
  x32: Allow x32 to be configured
  x32: If configured, add x32 system calls to system call tables
  x32: Handle process creation
  x32: Signal-related system calls
  x86: Add #ifdef CONFIG_COMPAT to 
  ...

Staging: android: ram_console.c:

2012-03-15T23:38:14+00:00

Fix build error when CONFIG_PRINTK is not selected.

Reported-by: Randy Dunlap 
Acked-by: Randy Dunlap 
Signed-off-by: Greg Kroah-Hartman

Staging: android: binder: Fix use-after-free bug

2012-03-09T21:14:08+00:00

binder_update_page_range could read freed memory if the vma of the
selected process was freed right before the check that the vma
belongs to the mm struct it just locked.

If the vm_mm pointer in that freed vma struct had also been rewritten
with a value that matched the locked mm struct, then the code would
proceed and possibly modify the freed vma.

Signed-off-by: Arve Hjønnevåg 
Signed-off-by: Greg Kroah-Hartman

staging: ram_console: Fix section mismatches

2012-03-09T21:14:08+00:00

WARNING: vmlinux.o(.text+0xfcf6e): Section mismatch in reference
from the function ram_console_driver_probe() to the function
.init.text:persistent_ram_init_ringbuffer()
The function ram_console_driver_probe() references
the function __init persistent_ram_init_ringbuffer().
This is often because ram_console_driver_probe lacks a __init
annotation or the annotation of persistent_ram_init_ringbuffer is
wrong.

Move this driver to platform_driver_probe() because ram console
devices aren't going to be added and removed at runtime. Also
shorten the probe function name since driver is redundant and
makes the function name long.

Cc: Android Kernel Team 
Cc: John Stultz 
Signed-off-by: Stephen Boyd 
Signed-off-by: Greg Kroah-Hartman

staging: android: ram_console: honor dmesg_restrict

2012-03-08T17:37:10+00:00

The Linux kernel has a setting called dmesg_restrict. When true,
only processes with CAP_SYSLOG can view the kernel dmesg logs. This
helps prevent leaking of kernel information into user space.

On Android, it's possible to bypass these restrictions by viewing
/proc/last_kmsg.

This change makes /proc/last_kmsg require the same permissions as
dmesg.

CC: Android Kernel Team 
Signed-off-by: Nick Kralevich 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: android: ram_console: fix crash in ram_console_late_init

2012-03-08T17:37:09+00:00

If the persistent ram buffer is not available, ram_console_late_init
would crash when dereferencing ram_console_zone.  Return early if
ram console was not initialized.

CC: Android Kernel Team 
Signed-off-by: Colin Cross 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: android: persistent_ram: add notrace to persistent_ram_write

2012-03-08T17:36:08+00:00

Add the notrace attribute to persistent_ram_write and the
non-ecc functions that it calls to allow persistent_ram to
be used for ftracing (only when ecc is disabled).

CC: Greg KH 
CC: Android Kernel Team 
Signed-off-by: Colin Cross 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: android: persistent_ram: make persistent_ram_write atomic

2012-03-08T17:36:08+00:00

Allow persistent_ram_write to be called on multiple cpus at
the same time, as long as ecc is not in use.  Uses atomics
for the buffer->start and buffer->size counters.

[jstultz: Fix up some pr_info casting issues on 64bit]
CC: Greg KH 
CC: Android Kernel Team 
Signed-off-by: Colin Cross 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: android: persistent_ram: handle reserving and mapping memory

2012-03-08T17:36:08+00:00

Replace the ioremapped memory passed in from the drivers with
a memblock_reserve and vmap.  Adds a new function,
persistent_ram_early_init, designed to be called from the machine
init_early callback, that calls memblock_remove and saves the
provided persistent ram area layout.

Drivers only pass in their struct device * and ecc settings.
Locating and mapping the memory is now handled entirely within
persistent_ram.

Also, convert ram_console to the new persistent_ram_init
parameters that only take a struct device * and ecc settings.

[jstultz: Fix pr_info casting issues on 64bit, folded two
patches as the build breaks if they are apart. Also replaced
phys_to_page() w/ pfn_to_page(addr>>PAGE_SHIFT), as phys_to_page
is only on a few arches.]
CC: Greg KH 
CC: Android Kernel Team 
Signed-off-by: Colin Cross 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: android: persistent_ram: refactor ecc support

2012-03-08T17:36:08+00:00

Remove CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION and related
 #ifdefs.  Also allow persistent ram zones without ecc enabled.
For some use cases, like the data portion of the upcoming
persistent_vars patches, or a persistent ftrace ringbuffer,
ecc on every update is too expensive.

CC: Greg KH 
CC: Android Kernel Team 
Signed-off-by: Colin Cross 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman