NEC PC-9800 subarchitecture support patch for 2.5.50-ac1 (14/21)
This patch contains changes under kernel/*.
diffstat:
kernel/dma.c | 3 +++
kernel/ksyms.c | 4 ++++
kernel/timer.c | 5 +++++
3 files changed, 12 insertions(+)
Regards,
Osamu Tomita
diff -urN linux/kernel/dma.c linux98/kernel/dma.c
--- linux/kernel/dma.c Sun Aug 11 10:41:22 2002
+++ linux98/kernel/dma.c Wed Aug 21 09:53:59 2002
@@ -9,6 +9,7 @@
* [It also happened to remove the sizeof(char *) == sizeof(int)
* assumption introduced because of those /proc/dma patches. -- Hennus]
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -62,10 +63,12 @@
{ 0, 0 },
{ 0, 0 },
{ 0, 0 },
+#ifndef CONFIG_PC9800
{ 1, "cascade" },
{ 0, 0 },
{ 0, 0 },
{ 0, 0 }
+#endif
};
diff -urN linux/kernel/ksyms.c linux98/kernel/ksyms.c
--- linux/kernel/ksyms.c 2002-12-10 09:17:59.000000000 +0900
+++ linux98/kernel/ksyms.c 2002-12-10 10:37:55.000000000 +0900
@@ -604,6 +604,10 @@
EXPORT_SYMBOL(__per_cpu_offset);
#endif
+/* Whether PC-9800 architecture or not No:0 Yes:1 */
+int pc98 = 0;
+EXPORT_SYMBOL(pc98);
+
/* debug */
EXPORT_SYMBOL(dump_stack);
diff -urN linux/kernel/timer.c linux98/kernel/timer.c
--- linux/kernel/timer.c Mon Nov 18 13:29:29 2002
+++ linux98/kernel/timer.c Tue Nov 19 10:57:26 2002
@@ -433,8 +433,13 @@
/*
* Timekeeping variables
*/
+#ifndef CONFIG_PC9800
unsigned long tick_usec = TICK_USEC; /* ACTHZ period (usec) */
unsigned long tick_nsec = TICK_NSEC(TICK_USEC); /* USER_HZ period (nsec) */
+#else
+extern unsigned long tick_usec; /* ACTHZ period (usec) */
+extern unsigned long tick_nsec; /* USER_HZ period (nsec) */
+#endif
/* The current time */
struct timespec xtime __attribute__ ((aligned (16)));
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Dec 15 2002 - 22:00:32 EST