Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca493d17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: poch: fix verification of memory area
  Staging: usbip: usbip_start_threads(): handle kernel_thread failure
  staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h>
  Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal
  Staging: android: Add lowmemorykiller documentation.
  Staging: android: fix build error on 64bit boxes
  Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25.
  Staging: android: binder: fix arm build errors
  Staging: meilhaus: fix Kbuild
  Staging: comedi: fix Kbuild
parents 5488ace4 dcbbcefb

drivers/staging/agnx/agnx.h

+2 −0
Original line number Diff line number Diff line 
#ifndef AGNX_H_

#define AGNX_H_



#include <linux/io.h>



#include "xmit.h"



#define PFX				KBUILD_MODNAME ": "

drivers/staging/android/binder.c

+8 −8
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ int task_get_unused_fd_flags(struct task_struct *tsk, int flags) 
	int fd, error;

	struct fdtable *fdt;

	unsigned long rlim_cur;

	unsigned long irqs;



	if (files == NULL)

		return -ESRCH;
@@ -335,12 +336,11 @@ int task_get_unused_fd_flags(struct task_struct *tsk, int flags) 
	 * N.B. For clone tasks sharing a files structure, this test

	 * will limit the total number of files that can be opened.

	 */

	rcu_read_lock();

	if (tsk->signal)

		rlim_cur = tsk->signal->rlim[RLIMIT_NOFILE].rlim_cur;

	else

	rlim_cur = 0;

	rcu_read_unlock();

	if (lock_task_sighand(tsk, &irqs)) {

		rlim_cur = tsk->signal->rlim[RLIMIT_NOFILE].rlim_cur;

		unlock_task_sighand(tsk, &irqs);

	}

	if (fd >= rlim_cur)

		goto out;
@@ -2649,14 +2649,14 @@ static void binder_vma_open(struct vm_area_struct *vma) 
{

	struct binder_proc *proc = vma->vm_private_data;

	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);

		printk(KERN_INFO "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot));

	dump_stack();

}

static void binder_vma_close(struct vm_area_struct *vma)

{

	struct binder_proc *proc = vma->vm_private_data;

	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);

		printk(KERN_INFO "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot));

	proc->vma = NULL;

}
@@ -2677,7 +2677,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma) 
		vma->vm_end = vma->vm_start + SZ_4M;



	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);

		printk(KERN_INFO "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot));



	if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) {

		ret = -EPERM;

drivers/staging/android/lowmemorykiller.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
The lowmemorykiller driver lets user-space specify a set of memory thresholds

where processes with a range of oom_adj values will get killed. Specify the

minimum oom_adj values in /sys/module/lowmemorykiller/parameters/adj and the

number of free pages in /sys/module/lowmemorykiller/parameters/minfree. Both

files take a comma separated list of numbers in ascending order.



For example, write "0,8" to /sys/module/lowmemorykiller/parameters/adj and

"1024,4096" to /sys/module/lowmemorykiller/parameters/minfree to kill processes

with a oom_adj value of 8 or higher when the free memory drops below 4096 pages

and kill processes with a oom_adj value of 0 or higher when the free memory

drops below 1024 pages.



The driver considers memory used for caches to be free, but if a large

percentage of the cached memory is locked this can be very inaccurate

and processes may not get killed until the normal oom killer is triggered.

drivers/staging/android/timed_gpio.c

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/platform_device.h>

#include <linux/hrtimer.h>

#include <linux/err.h>

#include <asm/arch/gpio.h>

#include <linux/gpio.h>



#include "timed_gpio.h"
@@ -49,7 +49,8 @@ static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *att 


	if (hrtimer_active(&gpio_data->timer)) {

		ktime_t r = hrtimer_get_remaining(&gpio_data->timer);

		remaining = r.tv.sec * 1000 + r.tv.nsec / 1000000;

		struct timeval t = ktime_to_timeval(r);

		remaining = t.tv_sec * 1000 + t.tv_usec;

	} else

		remaining = 0;

drivers/staging/comedi/Kconfig

+1 −0
Original line number Diff line number Diff line 
config COMEDI

	tristate "Data Acquision support (comedi)"

	default N

	depends on m

	---help---

	  Enable support a wide range of data acquision devices

	  for Linux.