Commits · cd1e40f0981e22018373307cd4087dc876b08fb0 · linux / linux-davinci

15 Jan, 2009 10 commits

When a break signal is detected, the next character should be ignored. · cd1e40f0

Mischa Jonker authored Jan 15, 2009

This was not implemented correctly for the pnx8xxx_uart driver.

[From further discussion:
Correct, you can look to it as two separate bugs:
a) the next character is not ignored while it should;
b) the status bits 31-8 are copied to the 'ch' variable while they shouldn't.

Both bugs prevent correct break signal handling (and therefore correct
behaviour of the magic SysRq key). Bug b didn't cause too much trouble
earlier because in most situations the status bits are all zero; for
this case they unfortunately aren't.
]
Signed-off-by: Mischa Jonker <mischa.jonker@nxp.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

cd1e40f0

serial: Add SupraExpress 336i PnP Voice Modem · 7fdd4f76

Daniel Gagnon authored Jan 15, 2009

Add SupraExpress 336i PnP Voice Modem

Tested and working with the following device: (output from lspnp -v)
01:01.00 SUP1381 (unknown)
    state = active
	io 0x2f8-0x2ff
	irq 3
Signed-off-by: Daniel Gagnon <daniel.gagnon@yahoo.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

7fdd4f76

8250_pci: add support for netmos 9835 IBM devices · 25cf9bc1

Jiri Slaby authored Jan 15, 2009

Most of netmos 9835 hardware is handled by parport-serial.  IBM introduces
a device which doesn't have any parallel ports and have screwed subdevice
PCI id (not corresponding to port numbers).

Handle this device (9710:9835 1014:0299) properly.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

25cf9bc1

tty: Fix race in the flush for some ldiscs · c0253eec

Alan Cox authored Jan 15, 2009

If you issue an ioctl to flush a tty as the line discipline is changing or
otherwise unplugged you can get a crash. The bug is very old but the rest
of the BKL lock dropping and some very "good" luck on Ingo's part caught
an example.

Use the correct ldisc_ref form so that we wait for the ldisc change to
complete and then flush
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

c0253eec

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5393f780

Linus Torvalds authored Jan 14, 2009

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (29 commits)
  powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/
  powerpc/83xx: Make serial ports work on MPC8315E-RDB w/ FSL U-Boots
  powerpc/e500mc: Doorbells need to be taken w/exceptions disabled
  powerpc: Enable PS3 options and QPACE in ppc64_defconfig
  powerpc/powermac: Fix occasional SMP boot failure
  powerpc/cacheinfo: Rename cache_dir per-cpu variable
  hvc_console: Use kzalloc() instead of kmalloc() + memset()
  hvc_console: Do not set low_latency when using interrupts
  hvc_console: Call free_irq() only if request_irq() was successful
  hvc_console: Change an mb() to smp_mb() and add some comments
  powerpc: Cleanup from l64 to ll64 change: drivers/net
  powerpc: Cleanup from l64 to ll64 change: drivers/char
  powerpc: Cleanup from l64 to ll64 change: arch code
  powerpc: Change u64/s64 to a long long integer type
  powerpc/kexec: Check crash_base for relocatable kernel
  powerpc: Make dummy section a valid note header
  Xilinx: SPI: updated driver for device tree
  drivers/of: Add the of_find_i2c_device_by_node function.
  powerpc/xsysace: add compatible string for non-ipcore instance
  powerpc/mpc52xx: remove dead code from GPIO driver
  ...

5393f780

Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · bca26856

Linus Torvalds authored Jan 14, 2009

* 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits)
  [CVE-2009-0029] s390 specific system call wrappers
  [CVE-2009-0029] System call wrappers part 33
  [CVE-2009-0029] System call wrappers part 32
  [CVE-2009-0029] System call wrappers part 31
  [CVE-2009-0029] System call wrappers part 30
  [CVE-2009-0029] System call wrappers part 29
  [CVE-2009-0029] System call wrappers part 28
  [CVE-2009-0029] System call wrappers part 27
  [CVE-2009-0029] System call wrappers part 26
  [CVE-2009-0029] System call wrappers part 25
  [CVE-2009-0029] System call wrappers part 24
  [CVE-2009-0029] System call wrappers part 23
  [CVE-2009-0029] System call wrappers part 22
  [CVE-2009-0029] System call wrappers part 21
  [CVE-2009-0029] System call wrappers part 20
  [CVE-2009-0029] System call wrappers part 19
  [CVE-2009-0029] System call wrappers part 18
  [CVE-2009-0029] System call wrappers part 17
  [CVE-2009-0029] System call wrappers part 16
  [CVE-2009-0029] System call wrappers part 15
  ...

bca26856

byteorder: make swab.h include asm/swab.h like a regular header · 74d96f01

Harvey Harrison authored Jan 13, 2009

Add swab.h to kbuild.asm and remove the individual entries from
each arch, mark as unifdef as some arches have some kernel-only
bits inside.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

74d96f01

cris: introduce asm/swab.h · aa0effbd

Harvey Harrison authored Jan 13, 2009

Adjust the arch overrides to the new names as well.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

aa0effbd

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 5bf431fa

Linus Torvalds authored Jan 14, 2009

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  [XFS] Update maintainers
  [XFS] use scalable vmap API
  [XFS] remove old vmap cache
  [XFS] make xfs_ino_t an unsigned long long
  [XFS] truncate readdir offsets to signed 32 bit values
  [XFS] fix compile of xfs_btree_readahead_lblock on m68k
  [XFS] Remove macro-to-function indirections in the mask code
  [XFS] Remove macro-to-function indirections in attr code
  [XFS] Remove several unused typedefs.
  [XFS] pass XFS_IGET_BULKSTAT to xfs_iget for handle operations

5bf431fa

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · c2919f2a

Linus Torvalds authored Jan 14, 2009

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  IDE: fix sparse signed-ness errors with host->host_busy
  ide: fix suspend regression
  tx4938ide: Fix build error due to read_sff_dma_status moving
  ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
  sl82c105: remove dead code
  via82cxxx: fix cable warning message
  ide: can't use SSD/non-rotational queue flag for all CFA devices
  it821x.c: use dev->revision instead of pci_read_config_byte
  it821x: Add ultra_mask quirk for Vortex86SX
  ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal

c2919f2a

14 Jan, 2009 30 commits

IDE: fix sparse signed-ness errors with host->host_busy · e720b9e4

Ben Dooks authored Jan 14, 2009

The host_busy field in struct ide_host defaults to a
signed-long, where most arch's test_and_set_bit_*
macros use an unsigned long.

Change to using an unsigned long, which on ARM removes
the following sparse errors:

drivers/ide/ide-io.c:681:8: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:681:8: expected unsigned long volatile *p
drivers/ide/ide-io.c:681:8: got long volatile *<noident>
drivers/ide/ide-io.c:681:8: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:681:8: expected unsigned long volatile *p
drivers/ide/ide-io.c:681:8: got long volatile *<noident>
drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p
drivers/ide/ide-io.c:695:3: got long volatile *<noident>
drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p
drivers/ide/ide-io.c:695:3: got long volatile *<noident>
drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p
drivers/ide/ide-io.c:695:3: got long volatile *<noident>
drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p
drivers/ide/ide-io.c:695:3: got long volatile *<noident>
drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p
drivers/ide/ide-io.c:695:3: got long volatile *<noident>
drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p
drivers/ide/ide-io.c:695:3: got long volatile *<noident>
drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p
drivers/ide/ide-io.c:695:3: got long volatile *<noident>
drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
drivers/ide/ide-io.c:695:3: expected unsigned long volatile *p
drivers/ide/ide-io.c:695:3: got long volatile *<noident>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

e720b9e4

ide: fix suspend regression · 2ea55210

Bartlomiej Zolnierkiewicz authored Jan 14, 2009

On Monday 12 January 2009, Simon Holm Thøgersen wrote:
> commit 295f0004 ("ide: don't execute the next queued command from the
> hard-IRQ context (v2)") breaks suspend to disk for me. On
> 'echo disk > /sys/power/state' the systems hangs, letting me switch
> virtual consoles, but not responding to Alt+SysRq

Restart the request queue early for REQ_TYPE_PM_RESUME requests
(though there is only one resume request for the whole resume
sequence it stays in the queue until is fully completed and now
depends on kblockd for processing consequential resume states).
Reported-and-bisected-by: Simon Holm Thøgersen <odie@cs.aau.dk>
Tested-by: Simon Holm Thøgersen <odie@cs.aau.dk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2ea55210

tx4938ide: Fix build error due to read_sff_dma_status moving · a294d977

Atsushi Nemoto authored Jan 14, 2009

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

a294d977

ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ · e86c1451
Bartlomiej Zolnierkiewicz authored Jan 14, 2009
```
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
```
e86c1451

sl82c105: remove dead code · cadb300a

Bartlomiej Zolnierkiewicz authored Jan 14, 2009

CONFIG_LOPEC and CONFIG_SANDPOINT config options are gone.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

cadb300a

via82cxxx: fix cable warning message · 4180e833

Bartlomiej Zolnierkiewicz authored Jan 14, 2009

Remove reference to the removed old-style kernel parameter.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4180e833

ide: can't use SSD/non-rotational queue flag for all CFA devices · 655772cc

Bartlomiej Zolnierkiewicz authored Jan 14, 2009

Some rotating disks also present themselves as CFA devices.
Reported-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

655772cc

it821x.c: use dev->revision instead of pci_read_config_byte · 4a246269

Brandon Philips authored Jan 14, 2009

Minor cleanup.
Signed-off-by: Brandon Philips <bphilips@suse.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Shawn Lin <shawn@dmp.com.tw>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4a246269

it821x: Add ultra_mask quirk for Vortex86SX · b94b898f

Brandon Philips authored Jan 14, 2009

On Vortex86SX with IDE controller revision 0x11 ultra DMA must be
disabled. This patch was tested by DMP and seems to work.

It is a cleaned up version of their older Kernel patch: 
 http://www.dmp.com.tw/tech/vortex86sx/patch-2.6.24-DMP.gzTested-by: Shawn Lin <shawn@dmp.com.tw>
Signed-off-by: Brandon Philips <bphilips@suse.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

b94b898f

ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal · 9b896033

Bartlomiej Zolnierkiewicz authored Jan 14, 2009

commit 54cc1428 ("ide: remove
local_irq_set() macro") accidentally replaced local_save_flags()
by local_irq_set() in ide_probe_port() and __ide_wait_stat()
which resulted in LOCKDEP breakage.
Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

9b896033

kernel/up.c: omit it if SMP=y, USE_GENERIC_SMP_HELPERS=n · 9316fcac

Andrew Morton authored Jan 14, 2009

Fix the sparc build - we were including `up.o' on SMP builds, when
CONFIG_USE_GENERIC_SMP_HELPERS=n.
Tested-by: Robert Reif <reif@earthlink.net>
Fixed-by: Robert Reif <reif@earthlink.net>
Cc: David Miller <davem@davemloft.net>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

9316fcac

mm: fix assertion · 18e6959c

Nick Piggin authored Jan 14, 2009

This assertion is incorrect for lockless pagecache. By definition if we
have an unpinned page that we are trying to take a speculative reference
to, it may become the tail of a compound page at any time (if it is
freed, then reallocated as a compound page).

It was still a valid assertion for the vmscan.c LRU isolation case, but
it doesn't seem incredibly helpful... if somebody wants it, they can
put it back directly where it applies in the vmscan code.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

18e6959c

[CVE-2009-0029] s390 specific system call wrappers · 26689452
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
26689452
[CVE-2009-0029] System call wrappers part 33 · 2b664219
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
2b664219
[CVE-2009-0029] System call wrappers part 32 · d4e82042
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
d4e82042
[CVE-2009-0029] System call wrappers part 31 · 836f92ad
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
836f92ad
[CVE-2009-0029] System call wrappers part 30 · 6559eed8
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
6559eed8
[CVE-2009-0029] System call wrappers part 29 · 2e4d0924
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
2e4d0924
[CVE-2009-0029] System call wrappers part 28 · 938bb9f5
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
938bb9f5
[CVE-2009-0029] System call wrappers part 27 · 1e7bfb21
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
1e7bfb21
[CVE-2009-0029] System call wrappers part 26 · c4ea37c2
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
c4ea37c2
[CVE-2009-0029] System call wrappers part 25 · d5460c99
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
d5460c99
[CVE-2009-0029] System call wrappers part 24 · e48fbb69
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
e48fbb69
[CVE-2009-0029] System call wrappers part 23 · 5a8a82b1
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
5a8a82b1
[CVE-2009-0029] System call wrappers part 22 · 3e0fa65f
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
3e0fa65f
[CVE-2009-0029] System call wrappers part 21 · 20f37034
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
20f37034
[CVE-2009-0029] System call wrappers part 20 · 3cdad428
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
3cdad428
[CVE-2009-0029] System call wrappers part 19 · 003d7ab4
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
003d7ab4
[CVE-2009-0029] System call wrappers part 18 · a6b42e83
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
a6b42e83
[CVE-2009-0029] System call wrappers part 17 · ca013e94
Heiko Carstens authored Jan 14, 2009
```
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
```
ca013e94