forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] Adapt drivers/char/vt_ioctl.c to non-x86

Browse source 
This code uses the x86 (non-AMD-ELAN) value of CLOCK_TICK_RATE instead of
CLOCK_TICK_RATE itself, which is wrong for other archs.

Signed-off-by: Emmanuel Colbus <emmanuel.colbus@ensimag.imag.fr>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Emmanuel Colbus 2005-06-28 20:44:49 -07:00 • committed by Linus Torvalds
commit bcc8ca0992
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/char/vt_ioctl.c
View file

@ -25,6 +25,7 @@
#include <linux/fs.h>
#include <linux/console.h>
#include <linux/signal.h>
#include <linux/timex.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@ -386,7 +387,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
if (!perm)
return -EPERM;
if (arg)
arg = 1193182 / arg;
arg = CLOCK_TICK_RATE / arg;
kd_mksound(arg, 0);
return 0;
@ -403,7 +404,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
ticks = HZ * ((arg >> 16) & 0xffff) / 1000;
count = ticks ? (arg & 0xffff) : 0;
if (count)
count = 1193182 / count;
count = CLOCK_TICK_RATE / count;
kd_mksound(count, ticks);
return 0;
}