From b6edb6ce5eae7d1032e9f713ecdb68f1bff2635b Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Sun, 16 Jan 2011 19:42:30 -0500 Subject: [PATCH] printk: convert console_sem to console_mutex Convert console_sem to console_mutex, and all related code. Once done with printk.c you can get the others with: for i in `git grep -l acquire_console_sem` ; do mv $i $i~ cat $i~ |sed 's/acquire_console_sem/acquire_console_mutex/' > $i done There are also several instances of console_sem in comments that need to be sedified accordingly. This is one of several extractions from the merge up to 33-rc8. You can find the origin of this change in the tip merge commit: commit 5f854cfc024622e4aae14d7cf422f6ff86278688 Merge: cc24da0 4ec62b2 Author: Thomas Gleixner Date: Sun Feb 21 20:17:22 2010 +0100 Forward to 2.6.33-rc8 Merge branch 'linus' into rt/head with a pile of conflicts. Signed-off-by: Thomas Gleixner Normally there are not significant changes/additions in a merge commit that are not from any other "normal" commit. But in this case there are, so break them out into separate explicit commits. Signed-off-by: Paul Gortmaker --- drivers/char/bfin_jtag_comm.c | 8 +- drivers/char/selection.c | 4 +- drivers/char/vc_screen.c | 16 ++-- drivers/char/vt.c | 124 ++++++++++++++++---------------- drivers/char/vt_ioctl.c | 60 ++++++++-------- drivers/gpu/drm/nouveau/nouveau_drv.c | 8 +- drivers/gpu/drm/radeon/radeon_device.c | 10 ++-- drivers/serial/sb1250-duart.c | 2 +- drivers/staging/sm7xx/smtcfb.c | 8 +- drivers/video/arkfb.c | 12 ++-- drivers/video/aty/aty128fb.c | 12 ++-- drivers/video/aty/atyfb_base.c | 10 ++-- drivers/video/aty/radeon_pm.c | 10 ++-- drivers/video/chipsfb.c | 8 +- drivers/video/console/fbcon.c | 42 ++++++------ drivers/video/da8xx-fb.c | 8 +- drivers/video/fbmem.c | 12 ++-- drivers/video/fbsysfs.c | 20 +++--- drivers/video/geode/gxfb_core.c | 8 +- drivers/video/geode/lxfb_core.c | 8 +- drivers/video/i810/i810_main.c | 8 +- drivers/video/mx3fb.c | 8 +- drivers/video/nvidia/nvidia.c | 8 +- drivers/video/ps3fb.c | 16 ++-- drivers/video/s3fb.c | 16 ++-- drivers/video/savage/savagefb_driver.c | 8 +- drivers/video/sm501fb.c | 8 +- drivers/video/tmiofb.c | 10 ++-- drivers/video/vt8623fb.c | 12 ++-- drivers/video/xen-fbfront.c | 4 +- include/linux/console.h | 6 +- kernel/printk.c | 122 ++++++++++++++++---------------- 32 files changed, 308 insertions(+), 308 deletions(-) diff --git a/drivers/char/bfin_jtag_comm.c b/drivers/char/bfin_jtag_comm.c index e397df3..7d678f9 100644 --- a/drivers/char/bfin_jtag_comm.c +++ b/drivers/char/bfin_jtag_comm.c @@ -183,16 +183,16 @@ bfin_jc_circ_write(const unsigned char *buf, int count) } #ifndef CONFIG_BFIN_JTAG_COMM_CONSOLE -# define acquire_console_sem() -# define release_console_sem() +# define acquire_console_mutex() +# define release_console_mutex() #endif static int bfin_jc_write(struct tty_struct *tty, const unsigned char *buf, int count) { int i; - acquire_console_sem(); + acquire_console_mutex(); i = bfin_jc_circ_write(buf, count); - release_console_sem(); + release_console_mutex(); wake_up_process(bfin_jc_kthread); return i; } diff --git a/drivers/char/selection.c b/drivers/char/selection.c index f97b9e8..a382302 100644 --- a/drivers/char/selection.c +++ b/drivers/char/selection.c @@ -312,9 +312,9 @@ int paste_selection(struct tty_struct *tty) struct tty_ldisc *ld; DECLARE_WAITQUEUE(wait, current); - acquire_console_sem(); + acquire_console_mutex(); poke_blanked_console(); - release_console_sem(); + release_console_mutex(); ld = tty_ldisc_ref_wait(tty); diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c index c1791a6..3e92ac2 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/char/vc_screen.c @@ -115,7 +115,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) /* Select the proper current console and verify * sanity of the situation under the console lock. */ - acquire_console_sem(); + acquire_console_mutex(); attr = (currcons & 128); currcons = (currcons & 127); @@ -246,9 +246,9 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) * the pagefault handling code may want to call printk(). */ - release_console_sem(); + release_console_mutex(); ret = copy_to_user(buf, con_buf_start, orig_count); - acquire_console_sem(); + acquire_console_mutex(); if (ret) { read += (orig_count - ret); @@ -264,7 +264,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) if (read) ret = read; unlock_out: - release_console_sem(); + release_console_mutex(); mutex_unlock(&con_buf_mtx); return ret; } @@ -289,7 +289,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) /* Select the proper current console and verify * sanity of the situation under the console lock. */ - acquire_console_sem(); + acquire_console_mutex(); attr = (currcons & 128); currcons = (currcons & 127); @@ -324,9 +324,9 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) /* Temporarily drop the console lock so that we can read * in the write data from userspace safely. */ - release_console_sem(); + release_console_mutex(); ret = copy_from_user(con_buf, buf, this_round); - acquire_console_sem(); + acquire_console_mutex(); if (ret) { this_round -= ret; @@ -450,7 +450,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) ret = written; unlock_out: - release_console_sem(); + release_console_mutex(); mutex_unlock(&con_buf_mtx); diff --git a/drivers/char/vt.c b/drivers/char/vt.c index e87aed9..223476e 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -981,9 +981,9 @@ static int vt_resize(struct tty_struct *tty, struct winsize *ws) struct vc_data *vc = tty->driver_data; int ret; - acquire_console_sem(); + acquire_console_mutex(); ret = vc_do_resize(tty, vc, ws->ws_col, ws->ws_row); - release_console_sem(); + release_console_mutex(); return ret; } @@ -1249,7 +1249,7 @@ static void default_attr(struct vc_data *vc) vc->vc_color = vc->vc_def_color; } -/* console_sem is held */ +/* console_mutex is held */ static void csi_m(struct vc_data *vc) { int i; @@ -1393,7 +1393,7 @@ int mouse_reporting(void) return vc_cons[fg_console].d->vc_report_mouse; } -/* console_sem is held */ +/* console_mutex is held */ static void set_mode(struct vc_data *vc, int on_off) { int i; @@ -1463,7 +1463,7 @@ static void set_mode(struct vc_data *vc, int on_off) } } -/* console_sem is held */ +/* console_mutex is held */ static void setterm_command(struct vc_data *vc) { switch(vc->vc_par[0]) { @@ -1523,7 +1523,7 @@ static void setterm_command(struct vc_data *vc) } } -/* console_sem is held */ +/* console_mutex is held */ static void csi_at(struct vc_data *vc, unsigned int nr) { if (nr > vc->vc_cols - vc->vc_x) @@ -1533,7 +1533,7 @@ static void csi_at(struct vc_data *vc, unsigned int nr) insert_char(vc, nr); } -/* console_sem is held */ +/* console_mutex is held */ static void csi_L(struct vc_data *vc, unsigned int nr) { if (nr > vc->vc_rows - vc->vc_y) @@ -1544,7 +1544,7 @@ static void csi_L(struct vc_data *vc, unsigned int nr) vc->vc_need_wrap = 0; } -/* console_sem is held */ +/* console_mutex is held */ static void csi_P(struct vc_data *vc, unsigned int nr) { if (nr > vc->vc_cols - vc->vc_x) @@ -1554,7 +1554,7 @@ static void csi_P(struct vc_data *vc, unsigned int nr) delete_char(vc, nr); } -/* console_sem is held */ +/* console_mutex is held */ static void csi_M(struct vc_data *vc, unsigned int nr) { if (nr > vc->vc_rows - vc->vc_y) @@ -1565,7 +1565,7 @@ static void csi_M(struct vc_data *vc, unsigned int nr) vc->vc_need_wrap = 0; } -/* console_sem is held (except via vc_init->reset_terminal */ +/* console_mutex is held (except via vc_init->reset_terminal */ static void save_cur(struct vc_data *vc) { vc->vc_saved_x = vc->vc_x; @@ -1581,7 +1581,7 @@ static void save_cur(struct vc_data *vc) vc->vc_saved_G1 = vc->vc_G1_charset; } -/* console_sem is held */ +/* console_mutex is held */ static void restore_cur(struct vc_data *vc) { gotoxy(vc, vc->vc_saved_x, vc->vc_saved_y); @@ -1603,7 +1603,7 @@ enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey, EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd, ESpalette }; -/* console_sem is held (except via vc_init()) */ +/* console_mutex is held (except via vc_init()) */ static void reset_terminal(struct vc_data *vc, int do_clear) { vc->vc_top = 0; @@ -1663,7 +1663,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear) csi_J(vc, 2); } -/* console_sem is held */ +/* console_mutex is held */ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c) { /* @@ -2097,7 +2097,7 @@ static int is_double_width(uint32_t ucs) return bisearch(ucs, double_width, ARRAY_SIZE(double_width) - 1); } -/* acquires console_sem */ +/* acquires console_mutex */ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int count) { #ifdef VT_BUF_VRAM_ONLY @@ -2125,11 +2125,11 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co might_sleep(); - acquire_console_sem(); + acquire_console_mutex(); vc = tty->driver_data; if (vc == NULL) { printk(KERN_ERR "vt: argh, driver_data is NULL !\n"); - release_console_sem(); + release_console_mutex(); return 0; } @@ -2137,7 +2137,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co if (!vc_cons_allocated(currcons)) { /* could this happen? */ printk_once("con_write: tty %d not allocated\n", currcons+1); - release_console_sem(); + release_console_mutex(); return 0; } @@ -2353,7 +2353,7 @@ rescan_last_byte: } FLUSH console_conditional_schedule(); - release_console_sem(); + release_console_mutex(); notify_update(vc); return n; #undef FLUSH @@ -2366,11 +2366,11 @@ rescan_last_byte: * us to do the switches asynchronously (needed when we want * to switch due to a keyboard interrupt). Synchronization * with other console code and prevention of re-entrancy is - * ensured with console_sem. + * ensured with console_mutex. */ static void console_callback(struct work_struct *ignored) { - acquire_console_sem(); + acquire_console_mutex(); if (want_console >= 0) { if (want_console != fg_console && @@ -2400,7 +2400,7 @@ static void console_callback(struct work_struct *ignored) } notify_update(vc_cons[fg_console].d); - release_console_sem(); + release_console_mutex(); } int set_console(int nr) @@ -2581,7 +2581,7 @@ static struct console vt_console_driver = { */ /* - * Generally a bit racy with respect to console_sem(). + * Generally a bit racy with respect to console_mutex(). * * There are some functions which don't need it. * @@ -2609,17 +2609,17 @@ int tioclinux(struct tty_struct *tty, unsigned long arg) switch (type) { case TIOCL_SETSEL: - acquire_console_sem(); + acquire_console_mutex(); ret = set_selection((struct tiocl_selection __user *)(p+1), tty); - release_console_sem(); + release_console_mutex(); break; case TIOCL_PASTESEL: ret = paste_selection(tty); break; case TIOCL_UNBLANKSCREEN: - acquire_console_sem(); + acquire_console_mutex(); unblank_screen(); - release_console_sem(); + release_console_mutex(); break; case TIOCL_SELLOADLUT: ret = sel_loadlut(p); @@ -2668,10 +2668,10 @@ int tioclinux(struct tty_struct *tty, unsigned long arg) } break; case TIOCL_BLANKSCREEN: /* until explicitly unblanked, not only poked */ - acquire_console_sem(); + acquire_console_mutex(); ignore_poke = 1; do_blank_screen(0); - release_console_sem(); + release_console_mutex(); break; case TIOCL_BLANKEDSCREEN: ret = console_blanked; @@ -2771,11 +2771,11 @@ static void con_flush_chars(struct tty_struct *tty) return; /* if we race with con_close(), vt may be null */ - acquire_console_sem(); + acquire_console_mutex(); vc = tty->driver_data; if (vc) set_cursor(vc); - release_console_sem(); + release_console_mutex(); } /* @@ -2786,7 +2786,7 @@ static int con_open(struct tty_struct *tty, struct file *filp) unsigned int currcons = tty->index; int ret = 0; - acquire_console_sem(); + acquire_console_mutex(); if (tty->driver_data == NULL) { ret = vc_allocate(currcons); if (ret == 0) { @@ -2794,7 +2794,7 @@ static int con_open(struct tty_struct *tty, struct file *filp) /* Still being freed */ if (vc->vc_tty) { - release_console_sem(); + release_console_mutex(); return -ERESTARTSYS; } tty->driver_data = vc; @@ -2808,11 +2808,11 @@ static int con_open(struct tty_struct *tty, struct file *filp) tty->termios->c_iflag |= IUTF8; else tty->termios->c_iflag &= ~IUTF8; - release_console_sem(); + release_console_mutex(); return ret; } } - release_console_sem(); + release_console_mutex(); return ret; } @@ -2825,9 +2825,9 @@ static void con_shutdown(struct tty_struct *tty) { struct vc_data *vc = tty->driver_data; BUG_ON(vc == NULL); - acquire_console_sem(); + acquire_console_mutex(); vc->vc_tty = NULL; - release_console_sem(); + release_console_mutex(); tty_shutdown(tty); } @@ -2874,13 +2874,13 @@ static int __init con_init(void) struct vc_data *vc; unsigned int currcons = 0, i; - acquire_console_sem(); + acquire_console_mutex(); if (conswitchp) display_desc = conswitchp->con_startup(); if (!display_desc) { fg_console = 0; - release_console_sem(); + release_console_mutex(); return 0; } @@ -2926,7 +2926,7 @@ static int __init con_init(void) printable = 1; printk("\n"); - release_console_sem(); + release_console_mutex(); #ifdef CONFIG_VT_CONSOLE register_console(&vt_console_driver); @@ -3006,7 +3006,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last, if (!try_module_get(owner)) return -ENODEV; - acquire_console_sem(); + acquire_console_mutex(); /* check if driver is registered */ for (i = 0; i < MAX_NR_CON_DRIVER; i++) { @@ -3091,7 +3091,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last, retval = 0; err: - release_console_sem(); + release_console_mutex(); module_put(owner); return retval; }; @@ -3140,7 +3140,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt) if (!try_module_get(owner)) return -ENODEV; - acquire_console_sem(); + acquire_console_mutex(); /* check if driver is registered and if it is unbindable */ for (i = 0; i < MAX_NR_CON_DRIVER; i++) { @@ -3154,7 +3154,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt) } if (retval) { - release_console_sem(); + release_console_mutex(); goto err; } @@ -3173,12 +3173,12 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt) } if (retval) { - release_console_sem(); + release_console_mutex(); goto err; } if (!con_is_bound(csw)) { - release_console_sem(); + release_console_mutex(); goto err; } @@ -3207,7 +3207,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt) if (!con_is_bound(csw)) con_driver->flag &= ~CON_DRIVER_FLAG_INIT; - release_console_sem(); + release_console_mutex(); /* ignore return value, binding should not fail */ bind_con_driver(defcsw, first, last, deflt); err: @@ -3433,7 +3433,7 @@ int register_con_driver(const struct consw *csw, int first, int last) if (!try_module_get(owner)) return -ENODEV; - acquire_console_sem(); + acquire_console_mutex(); for (i = 0; i < MAX_NR_CON_DRIVER; i++) { con_driver = ®istered_con_driver[i]; @@ -3487,7 +3487,7 @@ int register_con_driver(const struct consw *csw, int first, int last) } err: - release_console_sem(); + release_console_mutex(); module_put(owner); return retval; } @@ -3508,7 +3508,7 @@ int unregister_con_driver(const struct consw *csw) { int i, retval = -ENODEV; - acquire_console_sem(); + acquire_console_mutex(); /* cannot unregister a bound driver */ if (con_is_bound(csw)) @@ -3534,7 +3534,7 @@ int unregister_con_driver(const struct consw *csw) } } err: - release_console_sem(); + release_console_mutex(); return retval; } EXPORT_SYMBOL(unregister_con_driver); @@ -3828,9 +3828,9 @@ int con_set_cmap(unsigned char __user *arg) { int rc; - acquire_console_sem(); + acquire_console_mutex(); rc = set_get_cmap (arg,1); - release_console_sem(); + release_console_mutex(); return rc; } @@ -3839,9 +3839,9 @@ int con_get_cmap(unsigned char __user *arg) { int rc; - acquire_console_sem(); + acquire_console_mutex(); rc = set_get_cmap (arg,0); - release_console_sem(); + release_console_mutex(); return rc; } @@ -3888,12 +3888,12 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op) } else font.data = NULL; - acquire_console_sem(); + acquire_console_mutex(); if (vc->vc_sw->con_font_get) rc = vc->vc_sw->con_font_get(vc, &font); else rc = -ENOSYS; - release_console_sem(); + release_console_mutex(); if (rc) goto out; @@ -3974,12 +3974,12 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op) kfree(font.data); return -EFAULT; } - acquire_console_sem(); + acquire_console_mutex(); if (vc->vc_sw->con_font_set) rc = vc->vc_sw->con_font_set(vc, &font, op->flags); else rc = -ENOSYS; - release_console_sem(); + release_console_mutex(); kfree(font.data); return rc; } @@ -4001,12 +4001,12 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op) else name[MAX_FONT_NAME - 1] = 0; - acquire_console_sem(); + acquire_console_mutex(); if (vc->vc_sw->con_font_default) rc = vc->vc_sw->con_font_default(vc, &font, s); else rc = -ENOSYS; - release_console_sem(); + release_console_mutex(); if (!rc) { op->width = font.width; op->height = font.height; @@ -4022,7 +4022,7 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op) if (vc->vc_mode != KD_TEXT) return -EINVAL; - acquire_console_sem(); + acquire_console_mutex(); if (!vc->vc_sw->con_font_copy) rc = -ENOSYS; else if (con < 0 || !vc_cons_allocated(con)) @@ -4031,7 +4031,7 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op) rc = 0; else rc = vc->vc_sw->con_font_copy(vc, con); - release_console_sem(); + release_console_mutex(); return rc; } diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 6aa1028..26a7300 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -648,12 +648,12 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, /* * explicitly blank/unblank the screen if switching modes */ - acquire_console_sem(); + acquire_console_mutex(); if (arg == KD_TEXT) do_unblank_screen(1); else do_blank_screen(1); - release_console_sem(); + release_console_mutex(); break; case KDGETMODE: @@ -892,7 +892,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, ret = -EINVAL; goto out; } - acquire_console_sem(); + acquire_console_mutex(); vc->vt_mode = tmp; /* the frsig is ignored, so we set it to 0 */ vc->vt_mode.frsig = 0; @@ -900,7 +900,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, vc->vt_pid = get_pid(task_pid(current)); /* no switch is required -- saw@shade.msu.ru */ vc->vt_newvt = -1; - release_console_sem(); + release_console_mutex(); break; } @@ -909,9 +909,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, struct vt_mode tmp; int rc; - acquire_console_sem(); + acquire_console_mutex(); memcpy(&tmp, &vc->vt_mode, sizeof(struct vt_mode)); - release_console_sem(); + release_console_mutex(); rc = copy_to_user(up, &tmp, sizeof(struct vt_mode)); if (rc) @@ -964,9 +964,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, ret = -ENXIO; else { arg--; - acquire_console_sem(); + acquire_console_mutex(); ret = vc_allocate(arg); - release_console_sem(); + release_console_mutex(); if (ret) break; set_console(arg); @@ -989,7 +989,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, ret = -ENXIO; else { vsa.console--; - acquire_console_sem(); + acquire_console_mutex(); ret = vc_allocate(vsa.console); if (ret == 0) { struct vc_data *nvc; @@ -1002,7 +1002,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, put_pid(nvc->vt_pid); nvc->vt_pid = get_pid(task_pid(current)); } - release_console_sem(); + release_console_mutex(); if (ret) break; /* Commence switch and lock */ @@ -1043,7 +1043,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, /* * Switching-from response */ - acquire_console_sem(); + acquire_console_mutex(); if (vc->vt_newvt >= 0) { if (arg == 0) /* @@ -1062,7 +1062,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, vc->vt_newvt = -1; ret = vc_allocate(newvt); if (ret) { - release_console_sem(); + release_console_mutex(); break; } /* @@ -1082,7 +1082,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, if (arg != VT_ACKACQ) ret = -EINVAL; } - release_console_sem(); + release_console_mutex(); break; /* @@ -1095,20 +1095,20 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, } if (arg == 0) { /* deallocate all unused consoles, but leave 0 */ - acquire_console_sem(); + acquire_console_mutex(); for (i=1; iv_cols)) ret = -EFAULT; else { - acquire_console_sem(); + acquire_console_mutex(); for (i = 0; i < MAX_NR_CONSOLES; i++) { vc = vc_cons[i].d; @@ -1134,7 +1134,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, vc_resize(vc_cons[i].d, cc, ll); } } - release_console_sem(); + release_console_mutex(); } break; } @@ -1186,14 +1186,14 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, for (i = 0; i < MAX_NR_CONSOLES; i++) { if (!vc_cons[i].d) continue; - acquire_console_sem(); + acquire_console_mutex(); if (vlin) vc_cons[i].d->vc_scan_lines = vlin; if (clin) vc_cons[i].d->vc_font.height = clin; vc_cons[i].d->vc_resize_user = 1; vc_resize(vc_cons[i].d, cc, ll); - release_console_sem(); + release_console_mutex(); } break; } @@ -1364,7 +1364,7 @@ void vc_SAK(struct work_struct *work) struct vc_data *vc; struct tty_struct *tty; - acquire_console_sem(); + acquire_console_mutex(); vc = vc_con->d; if (vc) { tty = vc->vc_tty; @@ -1376,7 +1376,7 @@ void vc_SAK(struct work_struct *work) __do_SAK(tty); reset_vc(vc); } - release_console_sem(); + release_console_mutex(); } #ifdef CONFIG_COMPAT @@ -1734,10 +1734,10 @@ int vt_move_to_console(unsigned int vt, int alloc) { int prev; - acquire_console_sem(); + acquire_console_mutex(); /* Graphics mode - up to X */ if (disable_vt_switch) { - release_console_sem(); + release_console_mutex(); return 0; } prev = fg_console; @@ -1745,7 +1745,7 @@ int vt_move_to_console(unsigned int vt, int alloc) if (alloc && vc_allocate(vt)) { /* we can't have a free VC for now. Too bad, * we don't want to mess the screen for now. */ - release_console_sem(); + release_console_mutex(); return -ENOSPC; } @@ -1755,10 +1755,10 @@ int vt_move_to_console(unsigned int vt, int alloc) * Let the calling function know so it can decide * what to do. */ - release_console_sem(); + release_console_mutex(); return -EIO; } - release_console_sem(); + release_console_mutex(); if (vt_waitactive(vt + 1)) { pr_debug("Suspend: Can't switch VCs."); return -EINTR; @@ -1775,8 +1775,8 @@ int vt_move_to_console(unsigned int vt, int alloc) */ void pm_set_vt_switch(int do_switch) { - acquire_console_sem(); + acquire_console_mutex(); disable_vt_switch = !do_switch; - release_console_sem(); + release_console_mutex(); } EXPORT_SYMBOL(pm_set_vt_switch); diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 1de974a..a082d09 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -229,9 +229,9 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) pci_set_power_state(pdev, PCI_D3hot); } - acquire_console_sem(); + acquire_console_mutex(); fb_set_suspend(dev_priv->fbdev_info, 1); - release_console_sem(); + release_console_mutex(); dev_priv->fbdev_info->flags = fbdev_flags; return 0; @@ -331,9 +331,9 @@ nouveau_pci_resume(struct pci_dev *pdev) nv_crtc->lut.depth = 0; } - acquire_console_sem(); + acquire_console_mutex(); fb_set_suspend(dev_priv->fbdev_info, 0); - release_console_sem(); + release_console_mutex(); nouveau_fbcon_zfill(dev); diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 7b629e3..86256f4 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -754,9 +754,9 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state) pci_disable_device(dev->pdev); pci_set_power_state(dev->pdev, PCI_D3hot); } - acquire_console_sem(); + acquire_console_mutex(); fb_set_suspend(rdev->fbdev_info, 1); - release_console_sem(); + release_console_mutex(); return 0; } @@ -767,11 +767,11 @@ int radeon_resume_kms(struct drm_device *dev) if (rdev->powered_down) return 0; - acquire_console_sem(); + acquire_console_mutex(); pci_set_power_state(dev->pdev, PCI_D0); pci_restore_state(dev->pdev); if (pci_enable_device(dev->pdev)) { - release_console_sem(); + release_console_mutex(); return -1; } pci_set_master(dev->pdev); @@ -780,7 +780,7 @@ int radeon_resume_kms(struct drm_device *dev) radeon_resume(rdev); radeon_restore_bios_scratch_regs(rdev); fb_set_suspend(rdev->fbdev_info, 0); - release_console_sem(); + release_console_mutex(); /* reset hpd state */ radeon_hpd_init(rdev); diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c index a2f2b32..499962e 100644 --- a/drivers/serial/sb1250-duart.c +++ b/drivers/serial/sb1250-duart.c @@ -829,7 +829,7 @@ static void __init sbd_probe_duarts(void) #ifdef CONFIG_SERIAL_SB1250_DUART_CONSOLE /* * Serial console stuff. Very basic, polling driver for doing serial - * console output. The console_sem is held by the caller, so we + * console output. The console_mutex is held by the caller, so we * shouldn't be interrupted for more console activity. */ static void sbd_console_putchar(struct uart_port *uport, int ch) diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c index 8d7261c..a0f0ec1 100644 --- a/drivers/staging/sm7xx/smtcfb.c +++ b/drivers/staging/sm7xx/smtcfb.c @@ -1043,9 +1043,9 @@ static int __maybe_unused smtcfb_suspend(struct pci_dev *pdev, pm_message_t msg) /* when doing suspend, call fb apis and pci apis */ if (msg.event == PM_EVENT_SUSPEND) { - acquire_console_sem(); + acquire_console_mutex(); fb_set_suspend(&sfb->fb, 1); - release_console_sem(); + release_console_mutex(); retv = pci_save_state(pdev); pci_disable_device(pdev); retv = pci_choose_state(pdev, msg); @@ -1104,9 +1104,9 @@ static int __maybe_unused smtcfb_resume(struct pci_dev *pdev) smtcfb_setmode(sfb); - acquire_console_sem(); + acquire_console_mutex(); fb_set_suspend(&sfb->fb, 0); - release_console_sem(); + release_console_mutex(); return 0; } diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index d583bea..de7b771 100644 --- a/drivers/video/arkfb.c +++ b/drivers/video/arkfb.c @@ -23,7 +23,7 @@ #include #include #include -#include /* Why should fb driver call console functions? because acquire_console_sem() */ +#include /* Why should fb driver call console functions? because acquire_console_mutex() */ #include