tty: Remove __lockfunc annotation from tty lock functions

peterhurley · gregkh · commit c2bb524b2e1a · 2016-01-27T14:28:20.000-08:00
The tty lock/unlock code does not belong in the special lockfunc section
which is treated specially by stack backtraces.

Signed-off-by: Peter Hurley &lt;peter@hurleysoftware.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
@@ -304,13 +304,13 @@ void tty_ldisc_deref(struct tty_ldisc *ld)
 EXPORT_SYMBOL_GPL(tty_ldisc_deref);
 
 
-static inline int __lockfunc
+static inline int
 __tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
 {
 	return ldsem_down_write(&tty->ldisc_sem, timeout);
 }
 
-static inline int __lockfunc
+static inline int
 __tty_ldisc_lock_nested(struct tty_struct *tty, unsigned long timeout)
 {
 	return ldsem_down_write_nested(&tty->ldisc_sem,
@@ -322,8 +322,7 @@ static inline void __tty_ldisc_unlock(struct tty_struct *tty)
 	ldsem_up_write(&tty->ldisc_sem);
 }
 
-static int __lockfunc
-tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
+static int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)
 {
 	int ret;
 
@@ -340,7 +339,7 @@ static void tty_ldisc_unlock(struct tty_struct *tty)
 	__tty_ldisc_unlock(tty);
 }
 
-static int __lockfunc
+static int
 tty_ldisc_lock_pair_timeout(struct tty_struct *tty, struct tty_struct *tty2,
 			    unsigned long timeout)
 {
@@ -376,14 +375,13 @@ tty_ldisc_lock_pair_timeout(struct tty_struct *tty, struct tty_struct *tty2,
 	return 0;
 }
 
-static void __lockfunc
-tty_ldisc_lock_pair(struct tty_struct *tty, struct tty_struct *tty2)
+static void tty_ldisc_lock_pair(struct tty_struct *tty, struct tty_struct *tty2)
 {
 	tty_ldisc_lock_pair_timeout(tty, tty2, MAX_SCHEDULE_TIMEOUT);
 }
 
-static void __lockfunc tty_ldisc_unlock_pair(struct tty_struct *tty,
-					     struct tty_struct *tty2)
+static void tty_ldisc_unlock_pair(struct tty_struct *tty,
+				  struct tty_struct *tty2)
 {
 	__tty_ldisc_unlock(tty);
 	if (tty2)
diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c
@@ -10,7 +10,7 @@
  * Getting the big tty mutex.
  */
 
-void __lockfunc tty_lock(struct tty_struct *tty)
+void tty_lock(struct tty_struct *tty)
 {
 	if (WARN(tty->magic != TTY_MAGIC, "L Bad %p\n", tty))
 		return;
@@ -27,7 +27,7 @@ int tty_lock_interruptible(struct tty_struct *tty)
 	return mutex_lock_interruptible(&tty->legacy_mutex);
 }
 
-void __lockfunc tty_unlock(struct tty_struct *tty)
+void tty_unlock(struct tty_struct *tty)
 {
 	if (WARN(tty->magic != TTY_MAGIC, "U Bad %p\n", tty))
 		return;
@@ -36,13 +36,13 @@ void __lockfunc tty_unlock(struct tty_struct *tty)
 }
 EXPORT_SYMBOL(tty_unlock);
 
-void __lockfunc tty_lock_slave(struct tty_struct *tty)
+void tty_lock_slave(struct tty_struct *tty)
 {
 	if (tty && tty != tty->link)
 		tty_lock(tty);
 }
 
-void __lockfunc tty_unlock_slave(struct tty_struct *tty)
+void tty_unlock_slave(struct tty_struct *tty)
 {
 	if (tty && tty != tty->link)
 		tty_unlock(tty);
diff --git a/include/linux/tty.h b/include/linux/tty.h
@@ -643,11 +643,11 @@ extern long vt_compat_ioctl(struct tty_struct *tty,
 
 /* tty_mutex.c */
 /* functions for preparation of BKL removal */
-extern void __lockfunc tty_lock(struct tty_struct *tty);
+extern void tty_lock(struct tty_struct *tty);
 extern int  tty_lock_interruptible(struct tty_struct *tty);
-extern void __lockfunc tty_unlock(struct tty_struct *tty);
-extern void __lockfunc tty_lock_slave(struct tty_struct *tty);
-extern void __lockfunc tty_unlock_slave(struct tty_struct *tty);
+extern void tty_unlock(struct tty_struct *tty);
+extern void tty_lock_slave(struct tty_struct *tty);
+extern void tty_unlock_slave(struct tty_struct *tty);
 extern void tty_set_lock_subclass(struct tty_struct *tty);
 
 #ifdef CONFIG_PROC_FS

Original file line number	Diff line number	Diff line change
`@@ -304,13 +304,13 @@ void tty_ldisc_deref(struct tty_ldisc *ld)`
`304`	`304`	`EXPORT_SYMBOL_GPL(tty_ldisc_deref);`
`305`	`305`
`306`	`306`
`307`		`-static inline int __lockfunc`
	`307`	`+static inline int`
`308`	`308`	`__tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)`
`309`	`309`	`{`
`310`	`310`	`return ldsem_down_write(&tty->ldisc_sem, timeout);`
`311`	`311`	`}`
`312`	`312`
`313`		`-static inline int __lockfunc`
	`313`	`+static inline int`
`314`	`314`	`__tty_ldisc_lock_nested(struct tty_struct *tty, unsigned long timeout)`
`315`	`315`	`{`
`316`	`316`	`return ldsem_down_write_nested(&tty->ldisc_sem,`
`@@ -322,8 +322,7 @@ static inline void __tty_ldisc_unlock(struct tty_struct *tty)`
`322`	`322`	`ldsem_up_write(&tty->ldisc_sem);`
`323`	`323`	`}`
`324`	`324`
`325`		`-static int __lockfunc`
`326`		`-tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)`
	`325`	`+static int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)`
`327`	`326`	`{`
`328`	`327`	`int ret;`
`329`	`328`
`@@ -340,7 +339,7 @@ static void tty_ldisc_unlock(struct tty_struct *tty)`
`340`	`339`	`__tty_ldisc_unlock(tty);`
`341`	`340`	`}`
`342`	`341`
`343`		`-static int __lockfunc`
	`342`	`+static int`
`344`	`343`	`tty_ldisc_lock_pair_timeout(struct tty_struct tty, struct tty_struct tty2,`
`345`	`344`	`unsigned long timeout)`
`346`	`345`	`{`
`@@ -376,14 +375,13 @@ tty_ldisc_lock_pair_timeout(struct tty_struct tty, struct tty_struct tty2,`
`376`	`375`	`return 0;`
`377`	`376`	`}`
`378`	`377`
`379`		`-static void __lockfunc`
`380`		`-tty_ldisc_lock_pair(struct tty_struct tty, struct tty_struct tty2)`
	`378`	`+static void tty_ldisc_lock_pair(struct tty_struct tty, struct tty_struct tty2)`
`381`	`379`	`{`
`382`	`380`	`tty_ldisc_lock_pair_timeout(tty, tty2, MAX_SCHEDULE_TIMEOUT);`
`383`	`381`	`}`
`384`	`382`
`385`		`-static void __lockfunc tty_ldisc_unlock_pair(struct tty_struct *tty,`
`386`		`- struct tty_struct *tty2)`
	`383`	`+static void tty_ldisc_unlock_pair(struct tty_struct *tty,`
	`384`	`+ struct tty_struct *tty2)`
`387`	`385`	`{`
`388`	`386`	`__tty_ldisc_unlock(tty);`
`389`	`387`	`if (tty2)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Getting the big tty mutex.`
`11`	`11`	`*/`
`12`	`12`
`13`		`-void __lockfunc tty_lock(struct tty_struct *tty)`
	`13`	`+void tty_lock(struct tty_struct *tty)`
`14`	`14`	`{`
`15`	`15`	`if (WARN(tty->magic != TTY_MAGIC, "L Bad %p\n", tty))`
`16`	`16`	`return;`
`@@ -27,7 +27,7 @@ int tty_lock_interruptible(struct tty_struct *tty)`
`27`	`27`	`return mutex_lock_interruptible(&tty->legacy_mutex);`
`28`	`28`	`}`
`29`	`29`
`30`		`-void __lockfunc tty_unlock(struct tty_struct *tty)`
	`30`	`+void tty_unlock(struct tty_struct *tty)`
`31`	`31`	`{`
`32`	`32`	`if (WARN(tty->magic != TTY_MAGIC, "U Bad %p\n", tty))`
`33`	`33`	`return;`
`@@ -36,13 +36,13 @@ void __lockfunc tty_unlock(struct tty_struct *tty)`
`36`	`36`	`}`
`37`	`37`	`EXPORT_SYMBOL(tty_unlock);`
`38`	`38`
`39`		`-void __lockfunc tty_lock_slave(struct tty_struct *tty)`
	`39`	`+void tty_lock_slave(struct tty_struct *tty)`
`40`	`40`	`{`
`41`	`41`	`if (tty && tty != tty->link)`
`42`	`42`	`tty_lock(tty);`
`43`	`43`	`}`
`44`	`44`
`45`		`-void __lockfunc tty_unlock_slave(struct tty_struct *tty)`
	`45`	`+void tty_unlock_slave(struct tty_struct *tty)`
`46`	`46`	`{`
`47`	`47`	`if (tty && tty != tty->link)`
`48`	`48`	`tty_unlock(tty);`