Commit bcc8ca09 authored by Emmanuel Colbus's avatar Emmanuel Colbus Committed by Linus Torvalds

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

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: default avatarEmmanuel Colbus <emmanuel.colbus@ensimag.imag.fr>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f01b1b0b
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/timex.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -386,7 +387,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, ...@@ -386,7 +387,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
if (!perm) if (!perm)
return -EPERM; return -EPERM;
if (arg) if (arg)
arg = 1193182 / arg; arg = CLOCK_TICK_RATE / arg;
kd_mksound(arg, 0); kd_mksound(arg, 0);
return 0; return 0;
...@@ -403,7 +404,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, ...@@ -403,7 +404,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
ticks = HZ * ((arg >> 16) & 0xffff) / 1000; ticks = HZ * ((arg >> 16) & 0xffff) / 1000;
count = ticks ? (arg & 0xffff) : 0; count = ticks ? (arg & 0xffff) : 0;
if (count) if (count)
count = 1193182 / count; count = CLOCK_TICK_RATE / count;
kd_mksound(count, ticks); kd_mksound(count, ticks);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment