STAGING patches for 2.6-git
PATCH 1/1 STAGING patches for 2.6-git
Here are some tiny staging patches that fix some build errors and common Kconfig problems that people have reported. There are also a few other minor, "obvious" bugfixes to some of the drivers as well and a documentation update.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/
All but one of these have been in the -next releases with no known build errors. The one that wasn't was pointed out to me by Randy Dunlap and fixes a build issue on 64bit boxes that he found.
The patches will be sent as a follow-on to this message to lkml for people to see.
thanks,
greg k-h
--------------
drivers/staging/agnx/agnx.h | 2 ++ drivers/staging/android/binder.c | 16 ++++++++-------- drivers/staging/android/lowmemorykiller.txt | 16 ++++++++++++++++ drivers/staging/android/timed_gpio.c | 5 +++-- drivers/staging/comedi/Kconfig | 1 + drivers/staging/meilhaus/Kconfig | 21 +++++++++++---------- drivers/staging/poch/poch.c | 2 +- drivers/staging/usbip/usbip_common.c | 16 ++++++++++++++-- 8 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 drivers/staging/android/lowmemorykiller.txt
---------------
Arve Hjønnevåg (3):
Staging: android: binder: fix arm build errors
Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25.
Staging: android: Add lowmemorykiller documentation.
Geert Uytterhoeven (1):
staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h>
Greg Kroah-Hartman (3):
Staging: comedi: fix Kbuild
Staging: meilhaus: fix Kbuild
Staging: android: fix build error on 64bit boxes
Oleg Nesterov (1):
Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal
Roel Kluin (2):
Staging: usbip: usbip_start_threads(): handle kernel_thread failure
Staging: poch: fix verification of memory area
PATCH 1/10 Staging: comedi: fix Kbuild
comedi doesn't like being built into the kernel right now, so force it to be a module.
--- drivers/staging/comedi/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/staging/comedi/Kconfig +1 -0
@@ -1,6 +1,7 @@ config COMEDI tristate "Data Acquision support (comedi)" default N + depends on m ---help--- Enable support a wide range of data acquision devices for Linux.
Signature · 1 line
1.6.0.2
PATCH 2/10 Staging: meilhaus: fix Kbuild
In reply to Greg KHThe Meilhaus drivers do not like being built into the kernel right now, so force them to be a module.
--- drivers/staging/meilhaus/Kconfig | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-)
drivers/staging/meilhaus/Kconfig +11 -10
@@ -4,6 +4,7 @@ menuconfig MEILHAUS tristate "Meilhaus support" + depends on m ---help--- If you have a Meilhaus card, say Y (or M) here.
@@ -18,7 +19,7 @@ if MEILHAUS config ME0600 tristate "Meilhaus ME-600 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-600 family of boards that do data collection and multipurpose I/O.
@@ -29,7 +30,7 @@ config ME0600 config ME0900 tristate "Meilhaus ME-900 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-900 family of boards that do data collection and multipurpose I/O.
@@ -40,7 +41,7 @@ config ME0900 config ME1000 tristate "Meilhaus ME-1000 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-1000 family of boards that do data collection and multipurpose I/O.
@@ -51,7 +52,7 @@ config ME1000 config ME1400 tristate "Meilhaus ME-1400 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-1400 family of boards that do data collection and multipurpose I/O.
@@ -62,7 +63,7 @@ config ME1400 config ME1600 tristate "Meilhaus ME-1600 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-1600 family of boards that do data collection and multipurpose I/O.
@@ -73,7 +74,7 @@ config ME1600 config ME4600 tristate "Meilhaus ME-4600 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-4600 family of boards that do data collection and multipurpose I/O.
@@ -84,7 +85,7 @@ config ME4600 config ME6000 tristate "Meilhaus ME-6000 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-6000 family of boards that do data collection and multipurpose I/O.
@@ -95,7 +96,7 @@ config ME6000 config ME8100 tristate "Meilhaus ME-8100 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-8100 family of boards that do data collection and multipurpose I/O.
@@ -106,7 +107,7 @@ config ME8100 config ME8200 tristate "Meilhaus ME-8200 support" default n - depends on PCI + depends on PCI && m help This driver supports the Meilhaus ME-8200 family of boards that do data collection and multipurpose I/O.
@@ -117,7 +118,7 @@ config ME8200 config MEDUMMY tristate "Meilhaus dummy driver" default n - depends on PCI + depends on PCI && m help This provides a dummy driver for the Meilhaus driver package
Signature · 1 line
1.6.0.2
PATCH 3/10 Staging: android: binder: fix arm build errors
In reply to Greg KHFrom: Arve Hjønnevåg <[email protected]>
--- drivers/staging/android/binder.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/android/binder.c +3 -3
@@ -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 ;
Signature · 1 line
1.6.0.2
PATCH 4/10 Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25.
In reply to Greg KHFrom: Arve Hjønnevåg <[email protected]>
--- drivers/staging/android/timed_gpio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/android/timed_gpio.c +1 -1
@@ -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"
Signature · 1 line
1.6.0.2
PATCH 5/10 Staging: android: fix build error on 64bit boxes
In reply to Greg KHktime_t isn't ment to directly access on all arches, so use the proper conversion functions instead to figure out what time is remaining.
--- drivers/staging/android/timed_gpio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/staging/android/timed_gpio.c +2 -1
@@ -49,7 +49,8 @@ static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *attif (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 ;
Signature · 1 line
1.6.0.2
PATCH 6/10 Staging: android: Add lowmemorykiller documentation.
In reply to Greg KHFrom: Arve Hjønnevåg <[email protected]>
--- drivers/staging/android/lowmemorykiller.txt | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 drivers/staging/android/lowmemorykiller.txt
drivers/staging/android/lowmemorykiller.txt new file +16 -0
@@ -0,0 +1,16 @@ +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. +
Signature · 1 line
1.6.0.2
PATCH 7/10 Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal
In reply to Greg KHFrom: Oleg Nesterov <[email protected]>
Compile tested.
task_struct->signal is not protected by RCU, the code is bogus. Change the code to take ->siglock to pin ->signal.
--- drivers/staging/android/binder.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/android/binder.c +5 -5
@@ -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 @@ repeat:* 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 =0 ; +if (lock_task_sighand (tsk, &irqs)) { rlim_cur = tsk->signal->rlim[RLIMIT_NOFILE ].rlim_cur; -else - rlim_cur =0 ; -rcu_read_unlock (); +unlock_task_sighand (tsk, &irqs); + }if (fd >= rlim_cur) goto out;
Signature · 1 line
1.6.0.2
PATCH 8/10 staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h>
In reply to Greg KHFrom: Geert Uytterhoeven <[email protected]>
On m68k:drivers/staging/agnx/agnx.h: In function 'agnx_read32':drivers/staging/agnx/agnx.h:10: error: implicit declaration of function 'ioread32' drivers/staging/agnx/agnx.h: In function 'agnx_write32':drivers/staging/agnx/agnx.h:15: error: implicit declaration of function 'iowrite32' drivers/staging/agnx/sta.c: In function 'get_sta_power':drivers/staging/agnx/sta.c:94: error: implicit declaration of function 'memcpy_fromio' drivers/staging/agnx/sta.c: In function 'set_sta_power':drivers/staging/agnx/sta.c:103: error: implicit declaration of function 'memcpy_toio'
--- drivers/staging/agnx/agnx.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/staging/agnx/agnx.h +2 -0
@@ -1,6 +1,8 @@#ifndef AGNX_H_ #define AGNX_H_ +#include <linux/io.h> +#include "xmit.h" #define PFX KBUILD_MODNAME ": "
Signature · 1 line
1.6.0.2
PATCH 9/10 Staging: usbip: usbip_start_threads(): handle kernel_thread failure
In reply to Greg KHFrom: Roel Kluin <[email protected]>
kernel_thread may fail, notice this.
--- drivers/staging/usbip/usbip_common.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-)
drivers/staging/usbip/usbip_common.c +14 -2
@@ -406,8 +406,20 @@ void usbip_start_threads(struct usbip_device *ud)/* * threads are invoked per one device (per one connection). */ -kernel_thread (usbip_thread, (void *)&ud->tcp_rx,0 ); -kernel_thread (usbip_thread, (void *)&ud->tcp_tx,0 ); +int retval; + + retval =kernel_thread (usbip_thread, (void *)&ud->tcp_rx,0 ); +if (retval <0 ) { +printk (KERN_ERR "Creating tcp_rx thread for ud %p failed.\n" , + ud); +return ; + } + retval =kernel_thread (usbip_thread, (void *)&ud->tcp_tx,0 ); +if (retval <0 ) { +printk (KERN_ERR "Creating tcp_tx thread for ud %p failed.\n" , + ud); +return ; + }/* confirm threads are starting */ wait_for_completion (&ud->tcp_rx.thread_done);
Signature · 1 line
1.6.0.2
PATCH 10/10 Staging: poch: fix verification of memory area
In reply to Greg KHFrom: Roel Kluin <[email protected]>
fix verification of memory area
--- drivers/staging/poch/poch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/poch/poch.c +1 -1
@@ -1026,7 +1026,7 @@ static int poch_ioctl(struct inode *inode, struct file *filp, }break ;case POCH_IOC_GET_COUNTERS : -if (access_ok (VERIFY_WRITE , argp,sizeof (struct poch_counters ))) +if (!access_ok (VERIFY_WRITE , argp,sizeof (struct poch_counters )))return -EFAULT ;spin_lock_irq (&channel->counters_lock);
Signature · 1 line
1.6.0.2