diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-24 19:28:18 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-02-07 21:02:41 -0500 |
commit | e93a9a868792ad71cdd09d75e5a02d8067473c4e (patch) | |
tree | d2affabcd5a7e48a77ca148c9dc9be4f23de9936 /include/linux/console.h | |
parent | 50e244cc793d511b86adea24972f3a7264cae114 (diff) |
fb: Yet another band-aid for fixing lockdep mess
I've still got lockdep warnings even after Alan's patch, and it seems that
yet more band aids are required to paper over similar paths for
unbind_con_driver() and unregister_con_driver(). After this hack, lockdep
warnings are finally gone.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: stable <stable@vger.kernel.org>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux/console.h')
-rw-r--r-- | include/linux/console.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 4ef4307dfb82..47b858cffc47 100644 --- a/include/linux/console.h +++ b/include/linux/console.h | |||
@@ -77,6 +77,7 @@ extern const struct consw prom_con; /* SPARC PROM console */ | |||
77 | int con_is_bound(const struct consw *csw); | 77 | int con_is_bound(const struct consw *csw); |
78 | int register_con_driver(const struct consw *csw, int first, int last); | 78 | int register_con_driver(const struct consw *csw, int first, int last); |
79 | int unregister_con_driver(const struct consw *csw); | 79 | int unregister_con_driver(const struct consw *csw); |
80 | int do_unregister_con_driver(const struct consw *csw); | ||
80 | int take_over_console(const struct consw *sw, int first, int last, int deflt); | 81 | int take_over_console(const struct consw *sw, int first, int last, int deflt); |
81 | int do_take_over_console(const struct consw *sw, int first, int last, int deflt); | 82 | int do_take_over_console(const struct consw *sw, int first, int last, int deflt); |
82 | void give_up_console(const struct consw *sw); | 83 | void give_up_console(const struct consw *sw); |