2002-11-15 12:45:55

by Osamu Tomita

[permalink] [raw]
Subject: PC-9800 patch for 2.5.47-ac4: not merged yet (9/15) kernel

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 Wed Nov 13 14:22:53 2002
+++ linux98/kernel/ksyms.c Wed Nov 13 14:36:21 2002
@@ -601,5 +601,9 @@
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 11 15:46:23 2002
+++ linux98/kernel/timer.c Mon Nov 11 16:49:10 2002
@@ -436,8 +436,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)));


Attachments:
kernel.patch (1.49 kB)