From: Luis R. Rodriguez Date: Tue, 8 May 2012 07:12:55 +0000 (-0700) Subject: compat: backport localizing the tty lock X-Git-Tag: compat-2012-07-02~1^2~15 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=74a8f3174b1e02bcf43a65edd6ede2b7d2997dc2;p=~emulex%2Ffor-vlad%2Fcompat.git compat: backport localizing the tty lock Just undo make the lock generic for older kernels. This backports: commit d29f3ef39be4eec0362b985305fc526d9be318cf Author: Alan Cox Date: Thu May 3 22:24:08 2012 +0100 tty_lock: Localise the lock 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 mcgrof@tux ~/compat (git::master)$ ckmake Trying kernel 3.4.0-030400rc1-generic [OK] Trying kernel 3.3.0-030300rc2-generic [OK] Trying kernel 3.2.2-030202-generic [OK] Trying kernel 3.1.10-030110-generic [OK] Trying kernel 3.0.18-030018-generic [OK] Trying kernel 2.6.39-02063904-generic [OK] Trying kernel 2.6.38-02063808-generic [OK] Trying kernel 2.6.37-02063706-generic [OK] Trying kernel 2.6.36-02063604-generic [OK] Trying kernel 2.6.35-02063512-generic [OK] Trying kernel 2.6.34-02063410-generic [OK] Trying kernel 2.6.33-02063305-generic [OK] Trying kernel 2.6.32-02063255-generic [OK] Trying kernel 2.6.31-02063113-generic [OK] Trying kernel 2.6.30-02063010-generic [OK] Trying kernel 2.6.29-02062906-generic [OK] Trying kernel 2.6.28-02062810-generic [OK] Trying kernel 2.6.27-020627-generic [OK] Trying kernel 2.6.26-020626-generic [OK] Trying kernel 2.6.25-020625-generic [OK] Trying kernel 2.6.24-020624-generic [OK] Signed-off-by: Luis R. Rodriguez --- diff --git a/include/linux/compat-3.5.h b/include/linux/compat-3.5.h index 9c10a42..4cd0a0d 100644 --- a/include/linux/compat-3.5.h +++ b/include/linux/compat-3.5.h @@ -8,6 +8,9 @@ extern int simple_open(struct inode *inode, struct file *file); +/* Backports tty_lock: Localise the lock */ +#define tty_unlock(__tty) tty_unlock() + #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) */ #endif /* LINUX_3_5_COMPAT_H */