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

From: zze-COLBUS Emmanuel RD-MAPS-GRE
Date: Wed Jun 22 2005 - 11:42:22 EST



Hello,

I think there is a bug in drivers/char/vt_ioctl.c. 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.

This patch fixes it.

BTW, who is the maintainer of the text-mode console code? I couldn't
find it in the MAINTAINER file.

Signed-off-by: Emmanuel Colbus <emmanuel.colbus@xxxxxxxxxxxxxxx>


--- drivers/char/vt_ioctl_old.c 2005-06-22 18:04:21.912145025 +0200
+++ drivers/char/vt_ioctl.c 2005-06-22 17:59:54.867498294 +0200
@@ -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 @@
if (!perm)
return -EPERM;
if (arg)
- arg = 1193182 / arg;
+ arg = CLOCK_TICK_RATE / arg;
kd_mksound(arg, 0);
return 0;

@@ -403,7 +404,7 @@
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;
}



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/