diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /drivers/sgi/char | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'drivers/sgi/char')
| -rw-r--r-- | drivers/sgi/char/cons_newport.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/sgi/char/cons_newport.c b/drivers/sgi/char/cons_newport.c index 1fb02c0b5..38e86ded6 100644 --- a/drivers/sgi/char/cons_newport.c +++ b/drivers/sgi/char/cons_newport.c @@ -1,7 +1,9 @@ -/* $Id: cons_newport.c,v 1.3 1997/08/26 04:35:53 miguel Exp $ +/* * cons_newport.c: Newport graphics console code for the SGI. * * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) + * + * $Id:$ */ #include <linux/kernel.h> @@ -255,7 +257,7 @@ newport_hide_cursor(void) if(vt_cons[fg_console]->vc_mode == KD_GRAPHICS) return; - save_flags(flags); cli(); + save_and_cli(flags); idx = cursor_pos; if(idx == -1) { @@ -282,7 +284,7 @@ newport_set_cursor(int currcons) if (__real_origin != __origin) __set_origin(__real_origin); - save_flags(flags); cli(); + save_and_cli(flags); idx = (pos - video_mem_base) >> 1; sp = (unsigned short *) pos; |