patch-2.4.10 linux/drivers/char/vt.c
Next file: linux/drivers/char/w83877f_wdt.c
Previous file: linux/drivers/char/vme_scc.c
Back to the patch index
Back to the overall index
- Lines: 65
- Date:
Mon Sep 17 22:52:35 2001
- Orig file:
v2.4.9/linux/drivers/char/vt.c
- Orig date:
Mon Aug 27 12:41:41 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/char/vt.c linux/drivers/char/vt.c
@@ -28,7 +28,6 @@
#include <asm/io.h>
#include <asm/uaccess.h>
-#include <asm/keyboard.h>
#include <linux/kbd_kern.h>
#include <linux/vt_kern.h>
@@ -93,8 +92,9 @@
*/
#if defined(__i386__) || defined(__alpha__) || defined(__powerpc__) \
- || (defined(__mips__) && !defined(CONFIG_SGI_IP22)) \
- || (defined(__arm__) && defined(CONFIG_HOST_FOOTBRIDGE))
+ || (defined(__mips__) && defined(CONFIG_ISA)) \
+ || (defined(__arm__) && defined(CONFIG_HOST_FOOTBRIDGE)) \
+ || defined(__x86_64__)
static void
kd_nosound(unsigned long ignored)
@@ -145,8 +145,13 @@
#endif
-void (*kd_mksound)(unsigned int hz, unsigned int ticks) = _kd_mksound;
+int _kbd_rate(struct kbd_repeat *rep)
+{
+ return -EINVAL;
+}
+void (*kd_mksound)(unsigned int hz, unsigned int ticks) = _kd_mksound;
+int (*kbd_rate)(struct kbd_repeat *rep) = _kbd_rate;
#define i (tmp.kb_index)
#define s (tmp.kb_table)
@@ -504,7 +509,6 @@
{
struct kbd_repeat kbrep;
- if (!kbd_rate) return( -EINVAL );
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
@@ -832,9 +836,9 @@
* make sure we are atomic with respect to
* other console switches..
*/
- spin_lock_irq(&console_lock);
+ acquire_console_sem();
complete_change_console(newvt);
- spin_unlock_irq(&console_lock);
+ release_console_sem();
}
}
@@ -1158,7 +1162,8 @@
vt_cons[new_console]->vt_mode.frsig = 0;
vt_cons[new_console]->vt_pid = -1;
vt_cons[new_console]->vt_newvt = -1;
- reset_palette (new_console) ;
+ if (!in_interrupt()) /* Via keyboard.c:SAK() - akpm */
+ reset_palette(new_console) ;
}
/*
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)