linux/drivers/char/ip2, branch v2.6.34

Merge branch 'for-next' into for-linus

2010-03-08T15:55:37Z

Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c

tty: declare MODULE_FIRMWARE in various drivers

2010-03-02T22:43:15Z

Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman

ip2: Add module parameter.

2010-03-02T22:43:14Z

Stephen Rothwell found the following warning (x86_64 allmodconfig): drivers/char/ip2/ip2main.c:511: warning: 'ip2_setup' defined but not used This patch adds module parameter to fix the above warning. Signed-off-by: Rakib Mullick Signed-off-by: Greg Kroah-Hartman

ip2: remove #ifdef MODULE from ip2main.c

2010-03-02T22:43:14Z

On the kernel command line we can pass "module parameters". So #ifdef MODULE is obsolute now. Remove it completely. When CONFIG_PCI=n and building ip2main.c then we are hit by the following warning. So move *pdev into #ifdef CONFIG_PCI. drivers/char/ip2/ip2main.c: In function `ip2_loadmain': drivers/char/ip2/ip2main.c:542: warning: unused variable `pdev' Signed-off-by: Rakib Mullick Acked-by: Michael H. Warfield Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman

tree-wide: Assorted spelling fixes

2010-02-09T10:13:56Z

In particular, several occurances of funny versions of 'success', 'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address', 'beginning', 'desirable', 'separate' and 'necessary' are fixed. Signed-off-by: Daniel Mack Cc: Joe Perches Cc: Junio C Hamano Signed-off-by: Jiri Kosina

tty: rewrite the ldisc locking

2009-06-11T15:51:01Z

There are several pretty much unfixable races in the old ldisc code, especially with respect to pty behaviour and also to hangup. It's easier to rewrite the code than simply try and patch it up. This patch - splits the ldisc from the tty (so we will be able to refcount it more cleanly later) - introduces a mutex lock for ldisc changing on an active device - fixes the complete mess that hangup caused - implements hopefully correct setldisc/close/hangup locking There are still some problems around pty pairs that have always been there but at least it is now possible to understand the code and fix further problems. This fixes the following known bugs - hang up can leak ldisc references - hang up may not call open/close on ldisc in a matched way - pty/tty pairs can deadlock during an ldisc change - reading the ldisc proc files can cause every ldisc to be loaded and probably a few other of the mysterious ldisc race reports. I'm sure it also adds the odd new one. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds

proc tty: switch ip2 to ->proc_fops

2009-04-01T15:59:08Z

Signed-off-by: Alexey Dobriyan Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

device create: char: convert device_create_drvdata to device_create

2008-10-16T16:24:42Z

Now that device_create() has been audited, rename things back to the original call to be sane. Signed-off-by: Greg Kroah-Hartman

tty: kref the tty driver object

2008-10-13T16:51:42Z

Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds

ip2: avoid add_timer with pending timer

2008-10-13T16:51:39Z

add_timer() is not supposed to be called when the timer is pending. ip2 driver attempts to avoid that condition by setting and resetting a flag (TimerOn) in timer function. But there is some gap between add_timer() and setting TimerOn. This patch fix this problem by using mod_timer() and remove TimerOn which has been unnecessary by this change. Signed-off-by: Akinobu Mita Signed-off-by: Jiri Slaby Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds