linux-stable.git/drivers/tty/amiserial.c, branch linux-3.5.y

tty: Revert the tty locking series, it needs more work

2012-06-02T22:21:43+00:00

This reverts the tty layer change to use per-tty locking, because it's
not correct yet, and fixing it will require some more deep surgery.

The main revert is d29f3ef39be4 ("tty_lock: Localise the lock"), but
there are several smaller commits that built upon it, they also get
reverted here. The list of reverted commits is:

  fde86d310886 - tty: add lockdep annotations
  8f6576ad476b - tty: fix ldisc lock inversion trace
  d3ca8b64b97e - pty: Fix lock inversion
  b1d679afd766 - tty: drop the pty lock during hangup
  abcefe5fc357 - tty/amiserial: Add missing argument for tty_unlock()
  fd11b42e3598 - cris: fix missing tty arg in wait_event_interruptible_tty call
  d29f3ef39be4 - tty_lock: Localise the lock

The revert had a trivial conflict in the 68360serial.c staging driver
that got removed in the meantime.

Signed-off-by: Linus Torvalds

tty/amiserial: Add missing argument for tty_unlock()

2012-05-07T23:46:53+00:00

commit d29f3ef39be4eec0362b985305fc526d9be318cf ("tty_lock: Localise the lock")
missed that d3a7b83f865b46bb7b5e1ed18a129ce1af349db4 ("drivers/tty/amiserial.c:
add missing tty_unlock") just added a new caller of tty_unlock():

drivers/tty/amiserial.c: In function ‘set_serial_info’:
drivers/tty/amiserial.c:1077: error: too few arguments to function ‘tty_unlock’

Signed-off-by: Geert Uytterhoeven 
Cc: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

tty_lock: Localise the lock

2012-05-04T23:58:47+00:00

In each remaining case the tty_lock is associated with a specific tty. This
means we can now lock on a per tty basis. We do need tty_lock_pair() for
the pty case. Uglier but still a step in the right direction.

[fixed up calls in 3 missing drivers - gregkh]

Signed-off-by: Alan Cox 
Acked-by: Arnd Bergmann 
Signed-off-by: Greg Kroah-Hartman

drivers/tty/amiserial.c: add missing tty_unlock

2012-04-20T02:15:35+00:00

tty_unlock is used on all other exits from the function.

Signed-off-by: Julia Lawall 
Acked-by: Jiri Slaby 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

Remove all #inclusions of asm/system.h

2012-03-28T17:30:03+00:00

Remove all #inclusions of asm/system.h preparatory to splitting and killing
it.  Performed with the following command:

perl -p -i -e 's!^#\s*include\s*.*\n!!' `grep -Irl '^#\s*include\s*' *`

Signed-off-by: David Howells

TTY: amiserial, use tty_port_close_start

2012-03-08T20:50:02+00:00

Again, no need to duplicate the code. Let's use the helper.

Amiserial changes are only free of compilation errors. I have no
access to the hardware.

Signed-off-by: Jiri Slaby 
Cc: Geert Uytterhoeven 
Signed-off-by: Greg Kroah-Hartman

TTY: amiserial, use tty_port_close_end

2012-03-08T20:50:02+00:00

Hmm, the code was sleeping with interrupts disabled. This was not
good. Fix this by turning interrupts at an appropriate place. (The
race is protected by CLOSING flag.)

After the move, the code is identical to tty_port_close_end, so use
it!

Signed-off-by: Jiri Slaby 
Cc: Geert Uytterhoeven 
Signed-off-by: Greg Kroah-Hartman

TTY: amiserial, use tty_port_block_til_ready

2012-03-08T20:50:01+00:00

Hmm, 150 lines of duplicated stuff is gone now.

Signed-off-by: Jiri Slaby 
Cc: Geert Uytterhoeven 
Signed-off-by: Greg Kroah-Hartman

TTY: amiserial, provide carrier helpers

2012-03-08T20:50:01+00:00

This is a preparation for a switch to tty_port_block_til_ready. We
need amiga_carrier_raised and amiga_dtr_rts. The implementation is
taken from startup, shutdown and current block_til_ready.

Signed-off-by: Jiri Slaby 
Cc: Geert Uytterhoeven 
Signed-off-by: Greg Kroah-Hartman

TTY: amiserial no longer needs serialP

2012-03-08T20:50:01+00:00

amiserial is the last user of serialP.h. Let's move struct
serial_state directly to amiserial and remove serialP crap from
includes. Finally, remove the header from the tree completely.

Signed-off-by: Jiri Slaby 
Cc: Geert Uytterhoeven 
Signed-off-by: Greg Kroah-Hartman