r4511 - in dists/trunk/linux-2.6/debian: . patches-arch
patches-debian
Christian T. Steigies
cts at costa.debian.org
Mon Oct 17 16:51:17 UTC 2005
Author: cts
Date: 2005-10-17 16:51:12 +0000 (Mon, 17 Oct 2005)
New Revision: 4511
Added:
dists/trunk/linux-2.6/debian/patches-debian/m68k-arch.patch
dists/trunk/linux-2.6/debian/patches-debian/m68k-drivers.patch
dists/trunk/linux-2.6/debian/patches-debian/m68k-include-m68k.patch
dists/trunk/linux-2.6/debian/patches-debian/m68k-kernel.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches-arch/m68k.diff
Log:
update m68k.diff for 2.6.13
Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog 2005-10-17 14:39:01 UTC (rev 4510)
+++ dists/trunk/linux-2.6/debian/changelog 2005-10-17 16:51:12 UTC (rev 4511)
@@ -48,6 +48,13 @@
See CAN-2005-3180
- ieee1394/sbp2: fixes for hot-unplug and module unloading
+ [ Christian T. Steigies ]
+ * disable CONFIG_EXT2_FS_XIP for m68k like on all(?) other arches
+ * deactivate OKTAGON_SCSI for amiga/m68k until it can be compiled again
+ * deactivate CONFIG_KEYBOARD_HIL, CONFIG_MOUSE_HIL, and CONFIG_HIL_MLC for hp/m68k
+ * enable CONFIG_KEYBOARD_HIL_OLD, CONFIG_HP_SDC for hp/m68k
+ * update m68k.diff for 2.6.13
+
-- Simon Horman <horms at debian.org> Tue, 11 Oct 2005 19:50:55 +0900
linux-2.6 (2.6.13-1) experimental; urgency=low
Modified: dists/trunk/linux-2.6/debian/patches-arch/m68k.diff
===================================================================
--- dists/trunk/linux-2.6/debian/patches-arch/m68k.diff 2005-10-17 14:39:01 UTC (rev 4510)
+++ dists/trunk/linux-2.6/debian/patches-arch/m68k.diff 2005-10-17 16:51:12 UTC (rev 4511)
@@ -10,3232 +10,116 @@
CROSS_COMPILE ?=
# Architecture as present in compile.h
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/fpsp040/skeleton.S linux-2.6.13/arch/m68k/fpsp040/skeleton.S
---- linux-2.6.13-i386/arch/m68k/fpsp040/skeleton.S 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/fpsp040/skeleton.S 2005-05-30 16:31:21.000000000 +0200
-@@ -381,10 +381,8 @@
- .Lnotkern:
- SAVE_ALL_INT
- GET_CURRENT(%d0)
-- tstb %curptr@(TASK_NEEDRESCHED)
-- jne ret_from_exception | deliver signals,
-- | reschedule etc..
-- RESTORE_ALL
-+ | deliver signals, reschedule etc..
-+ jra ret_from_exception
-
- |
- | mem_write --- write to user or supervisor address space
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/ifpsp060/iskeleton.S linux-2.6.13/arch/m68k/ifpsp060/iskeleton.S
---- linux-2.6.13-i386/arch/m68k/ifpsp060/iskeleton.S 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/ifpsp060/iskeleton.S 2005-05-30 16:31:22.000000000 +0200
-@@ -75,10 +75,8 @@
- .Lnotkern:
- SAVE_ALL_INT
- GET_CURRENT(%d0)
-- tstb %curptr@(TASK_NEEDRESCHED)
-- jne ret_from_exception | deliver signals,
-- | reschedule etc..
-- RESTORE_ALL
-+ | deliver signals, reschedule etc..
-+ jra ret_from_exception
-
- |
- | _060_real_chk():
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/asm-offsets.c linux-2.6.13/arch/m68k/kernel/asm-offsets.c
---- linux-2.6.13-i386/arch/m68k/kernel/asm-offsets.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/kernel/asm-offsets.c 2005-05-30 16:31:22.000000000 +0200
-@@ -25,12 +25,8 @@
- DEFINE(TASK_STATE, offsetof(struct task_struct, state));
- DEFINE(TASK_FLAGS, offsetof(struct task_struct, flags));
- DEFINE(TASK_PTRACE, offsetof(struct task_struct, ptrace));
-- DEFINE(TASK_WORK, offsetof(struct task_struct, thread.work));
-- DEFINE(TASK_NEEDRESCHED, offsetof(struct task_struct, thread.work.need_resched));
-- DEFINE(TASK_SYSCALL_TRACE, offsetof(struct task_struct, thread.work.syscall_trace));
-- DEFINE(TASK_SIGPENDING, offsetof(struct task_struct, thread.work.sigpending));
-- DEFINE(TASK_NOTIFY_RESUME, offsetof(struct task_struct, thread.work.notify_resume));
- DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
-+ DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));
- DEFINE(TASK_MM, offsetof(struct task_struct, mm));
- DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
-
-@@ -45,6 +41,10 @@
- DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl));
- DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
-
-+ /* offsets into the thread_info struct */
-+ DEFINE(TINFO_PREEMPT, offsetof(struct thread_info, preempt_count));
-+ DEFINE(TINFO_FLAGS, offsetof(struct thread_info, flags));
-+
- /* offsets into the pt_regs */
- DEFINE(PT_D0, offsetof(struct pt_regs, d0));
- DEFINE(PT_ORIG_D0, offsetof(struct pt_regs, orig_d0));
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/bios32.c linux-2.6.13/arch/m68k/kernel/bios32.c
---- linux-2.6.13-i386/arch/m68k/kernel/bios32.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/kernel/bios32.c 2004-10-20 16:38:00.000000000 +0200
-@@ -285,7 +285,7 @@
-
- DBG_DEVS(("layout_bus: starting bus %d\n", bus->number));
-
-- if (!bus->devices && !bus->children)
-+ if (list_empty(&bus->devices) && list_empty(&bus->children))
- return;
-
- /*
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/entry.S linux-2.6.13/arch/m68k/kernel/entry.S
---- linux-2.6.13-i386/arch/m68k/kernel/entry.S 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/kernel/entry.S 2005-05-30 16:31:22.000000000 +0200
-@@ -44,9 +44,7 @@
-
- #include <asm/offsets.h>
-
--.globl system_call, buserr, trap
--.globl resume, ret_from_exception
--.globl ret_from_signal
-+.globl system_call, buserr, trap, resume
- .globl inthandler, sys_call_table
- .globl sys_fork, sys_clone, sys_vfork
- .globl ret_from_interrupt, bad_interrupt
-@@ -58,7 +56,7 @@
- movel %sp,%sp at - | stack frame pointer argument
- bsrl buserr_c
- addql #4,%sp
-- jra ret_from_exception
-+ jra .Lret_from_exception
-
- ENTRY(trap)
- SAVE_ALL_INT
-@@ -66,7 +64,7 @@
- movel %sp,%sp at - | stack frame pointer argument
- bsrl trap_c
- addql #4,%sp
-- jra ret_from_exception
-+ jra .Lret_from_exception
-
- | After a fork we jump here directly from resume,
- | so that %d1 contains the previous task
-@@ -75,30 +73,31 @@
- movel %d1,%sp at -
- jsr schedule_tail
- addql #4,%sp
-- jra ret_from_exception
-+ jra .Lret_from_exception
-
--badsys:
-- movel #-ENOSYS,%sp@(PT_D0)
-- jra ret_from_exception
--
--do_trace:
-+do_trace_entry:
- movel #-ENOSYS,%sp@(PT_D0) | needed for strace
- subql #4,%sp
- SAVE_SWITCH_STACK
- jbsr syscall_trace
- RESTORE_SWITCH_STACK
- addql #4,%sp
-- movel %sp@(PT_ORIG_D0),%d1
-- movel #-ENOSYS,%d0
-- cmpl #NR_syscalls,%d1
-- jcc 1f
-- jbsr @(sys_call_table,%d1:l:4)@(0)
--1: movel %d0,%sp@(PT_D0) | save the return value
-- subql #4,%sp | dummy return address
-+ movel %sp@(PT_ORIG_D0),%d0
-+ cmpl #NR_syscalls,%d0
-+ jcs syscall
-+badsys:
-+ movel #-ENOSYS,%sp@(PT_D0)
-+ jra ret_from_syscall
-+
-+do_trace_exit:
-+ subql #4,%sp
- SAVE_SWITCH_STACK
- jbsr syscall_trace
-+ RESTORE_SWITCH_STACK
-+ addql #4,%sp
-+ jra .Lret_from_exception
-
--ret_from_signal:
-+ENTRY(ret_from_signal)
- RESTORE_SWITCH_STACK
- addql #4,%sp
- /* on 68040 complete pending writebacks if any */
-@@ -111,7 +110,7 @@
- addql #4,%sp
- 1:
- #endif
-- jra ret_from_exception
-+ jra .Lret_from_exception
-
- ENTRY(system_call)
- SAVE_ALL_SYS
-@@ -120,30 +119,34 @@
- | save top of frame
- movel %sp,%curptr@(TASK_THREAD+THREAD_ESP0)
-
-- tstb %curptr@(TASK_SYSCALL_TRACE)
-- jne do_trace
-+ | syscall trace?
-+ tstb %curptr@(TASK_INFO+TINFO_FLAGS+2)
-+ jmi do_trace_entry
- cmpl #NR_syscalls,%d0
- jcc badsys
-+syscall:
- jbsr @(sys_call_table,%d0:l:4)@(0)
- movel %d0,%sp@(PT_D0) | save the return value
--
-+ret_from_syscall:
- |oriw #0x0700,%sr
-- movel %curptr@(TASK_WORK),%d0
-+ movew %curptr@(TASK_INFO+TINFO_FLAGS+2),%d0
- jne syscall_exit_work
- 1: RESTORE_ALL
-
- syscall_exit_work:
- btst #5,%sp@(PT_SR) | check if returning to kernel
- bnes 1b | if so, skip resched, signals
-- tstw %d0
-- jeq do_signal_return
-- tstb %d0
-- jne do_delayed_trace
--
-+ lslw #1,%d0
-+ jcs do_trace_exit
-+ jmi do_delayed_trace
-+ lslw #8,%d0
-+ jmi do_signal_return
- pea resume_userspace
-- jmp schedule
-+ jra schedule
-+
-
--ret_from_exception:
-+ENTRY(ret_from_exception)
-+.Lret_from_exception:
- btst #5,%sp@(PT_SR) | check if returning to kernel
- bnes 1f | if so, skip resched, signals
- | only allow interrupts when we are really the last one on the
-@@ -152,19 +155,18 @@
- andw #ALLOWINT,%sr
-
- resume_userspace:
-- movel %curptr@(TASK_WORK),%d0
-- lsrl #8,%d0
-+ moveb %curptr@(TASK_INFO+TINFO_FLAGS+3),%d0
- jne exit_work
- 1: RESTORE_ALL
-
- exit_work:
- | save top of frame
- movel %sp,%curptr@(TASK_THREAD+THREAD_ESP0)
-- tstb %d0
-- jeq do_signal_return
--
-+ lslb #1,%d0
-+ jmi do_signal_return
- pea resume_userspace
-- jmp schedule
-+ jra schedule
-+
-
- do_signal_return:
- |andw #ALLOWINT,%sr
-@@ -254,7 +256,7 @@
-
- /* check if we need to do software interrupts */
- tstl irq_stat+CPUSTAT_SOFTIRQ_PENDING
-- jeq ret_from_exception
-+ jeq .Lret_from_exception
- pea ret_from_exception
- jra do_softirq
-
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/m68k_ksyms.c linux-2.6.13/arch/m68k/kernel/m68k_ksyms.c
---- linux-2.6.13-i386/arch/m68k/kernel/m68k_ksyms.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/kernel/m68k_ksyms.c 2005-08-30 16:31:36.000000000 +0200
-@@ -74,9 +74,6 @@
- EXPORT_SYMBOL(__ashldi3);
- EXPORT_SYMBOL(__ashrdi3);
- EXPORT_SYMBOL(__lshrdi3);
--EXPORT_SYMBOL(memcpy);
--EXPORT_SYMBOL(memset);
--EXPORT_SYMBOL(memcmp);
- EXPORT_SYMBOL(memscan);
- EXPORT_SYMBOL(__muldi3);
-
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/process.c linux-2.6.13/arch/m68k/kernel/process.c
---- linux-2.6.13-i386/arch/m68k/kernel/process.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/kernel/process.c 2005-08-30 16:31:36.000000000 +0200
-@@ -239,7 +239,7 @@
- unsigned long stack_offset, *retp;
-
- stack_offset = THREAD_SIZE - sizeof(struct pt_regs);
-- childregs = (struct pt_regs *) ((unsigned long) (p->thread_info) + stack_offset);
-+ childregs = (struct pt_regs *) ((unsigned long)p->stack + stack_offset);
-
- *childregs = *regs;
- childregs->d0 = 0;
-@@ -384,7 +384,7 @@
- if (!p || p == current || p->state == TASK_RUNNING)
- return 0;
-
-- stack_page = (unsigned long)(p->thread_info);
-+ stack_page = (unsigned long)p->stack;
- fp = ((struct switch_stack *)p->thread.ksp)->a6;
- do {
- if (fp < stack_page+sizeof(struct thread_info) ||
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/ptrace.c linux-2.6.13/arch/m68k/kernel/ptrace.c
---- linux-2.6.13-i386/arch/m68k/kernel/ptrace.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/kernel/ptrace.c 2005-06-19 16:32:04.000000000 +0200
-@@ -95,7 +95,7 @@
- if (regno == PT_USP)
- addr = &task->thread.usp;
- else if (regno < sizeof(regoff)/sizeof(regoff[0]))
-- addr = (unsigned long *) (task->thread.esp0 + regoff[regno]);
-+ addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
- else
- return -1;
- *addr = data;
-@@ -103,48 +103,56 @@
- }
-
- /*
-- * Called by kernel/ptrace.c when detaching..
-- *
- * Make sure the single step bit is not set.
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/fs/fat/inode.c linux-2.6.13/fs/fat/inode.c
+--- linux-2.6.13-i386/fs/fat/inode.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/fs/fat/inode.c 2005-08-30 16:35:05.000000000 +0200
+@@ -11,12 +11,14 @@
*/
--void ptrace_disable(struct task_struct *child)
-+static inline void singlestep_disable(struct task_struct *child)
- {
-- unsigned long tmp;
-- /* make sure the single step bit is not set. */
-- tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
-+ unsigned long tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
- put_reg(child, PT_SR, tmp);
-- child->thread.work.delayed_trace = 0;
-- child->thread.work.syscall_trace = 0;
-+ clear_tsk_thread_flag(child, TIF_DELAYED_TRACE);
-+}
-+
-+/*
-+ * Called by kernel/ptrace.c when detaching..
-+ */
-+void ptrace_disable(struct task_struct *child)
-+{
-+ singlestep_disable(child);
-+ clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
- }
- asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
- {
- struct task_struct *child;
-- int ret;
-+ unsigned long tmp;
-+ int i, ret = 0;
-
- lock_kernel();
-- ret = -EPERM;
- if (request == PTRACE_TRACEME) {
- /* are we already being traced? */
-- if (current->ptrace & PT_PTRACED)
-+ if (current->ptrace & PT_PTRACED) {
-+ ret = -EPERM;
- goto out;
-+ }
- /* set the ptrace bit in the process flags. */
- current->ptrace |= PT_PTRACED;
-- ret = 0;
- goto out;
- }
-- ret = -ESRCH;
- read_lock(&tasklist_lock);
- child = find_task_by_pid(pid);
- if (child)
- get_task_struct(child);
- read_unlock(&tasklist_lock);
-- if (!child)
-+ if (unlikely(!child)) {
-+ ret = -ESRCH;
- goto out;
-+ }
-
-- ret = -EPERM;
-- if (pid == 1) /* you may not mess with init */
-+ /* you may not mess with init */
-+ if (unlikely(pid == 1)) {
-+ ret = -EPERM;
- goto out_tsk;
-+ }
-
- if (request == PTRACE_ATTACH) {
- ret = ptrace_attach(child);
-@@ -152,234 +160,175 @@
- }
-
- ret = ptrace_check_attach(child, request == PTRACE_KILL);
-- if (ret < 0)
-+ if (ret)
- goto out_tsk;
-
- switch (request) {
- /* when I and D space are separate, these will need to be fixed. */
-- case PTRACE_PEEKTEXT: /* read word at location addr. */
-- case PTRACE_PEEKDATA: {
-- unsigned long tmp;
-- int copied;
--
-- copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-- ret = -EIO;
-- if (copied != sizeof(tmp))
-- break;
-- ret = put_user(tmp,(unsigned long *) data);
-- break;
-- }
-+ case PTRACE_PEEKTEXT: /* read word at location addr. */
-+ case PTRACE_PEEKDATA:
-+ i = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-+ if (i != sizeof(tmp))
-+ goto out_eio;
-+ ret = put_user(tmp, (unsigned long *)data);
-+ break;
-
- /* read the word at location addr in the USER area. */
-- case PTRACE_PEEKUSR: {
-- unsigned long tmp;
--
-- ret = -EIO;
-- if ((addr & 3) || addr < 0 ||
-- addr > sizeof(struct user) - 3)
-- break;
--
-- tmp = 0; /* Default return condition */
-- addr = addr >> 2; /* temporary hack. */
-- ret = -EIO;
-- if (addr < 19) {
-- tmp = get_reg(child, addr);
-- if (addr == PT_SR)
-- tmp >>= 16;
-- } else if (addr >= 21 && addr < 49) {
-- tmp = child->thread.fp[addr - 21];
--#ifdef CONFIG_M68KFPU_EMU
-- /* Convert internal fpu reg representation
-- * into long double format
-- */
-- if (FPU_IS_EMU && (addr < 45) && !(addr % 3))
-- tmp = ((tmp & 0xffff0000) << 15) |
-- ((tmp & 0x0000ffff) << 16);
--#endif
-- } else
-- break;
-- ret = put_user(tmp,(unsigned long *) data);
-- break;
-- }
--
-- /* when I and D space are separate, this will have to be fixed. */
-- case PTRACE_POKETEXT: /* write the word at location addr. */
-- case PTRACE_POKEDATA:
-- ret = 0;
-- if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-- break;
-- ret = -EIO;
-- break;
--
-- case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
-- ret = -EIO;
-- if ((addr & 3) || addr < 0 ||
-- addr > sizeof(struct user) - 3)
-- break;
--
-- addr = addr >> 2; /* temporary hack. */
--
-- if (addr == PT_SR) {
-- data &= SR_MASK;
-- data <<= 16;
-- data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
-- }
-- if (addr < 19) {
-- if (put_reg(child, addr, data))
-- break;
-- ret = 0;
-- break;
-- }
-- if (addr >= 21 && addr < 48)
-- {
--#ifdef CONFIG_M68KFPU_EMU
-- /* Convert long double format
-- * into internal fpu reg representation
-- */
-- if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) {
-- data = (unsigned long)data << 15;
-- data = (data & 0xffff0000) |
-- ((data & 0x0000ffff) >> 1);
-- }
--#endif
-- child->thread.fp[addr - 21] = data;
-- ret = 0;
-- }
-- break;
--
-- case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
-- case PTRACE_CONT: { /* restart after signal. */
-- long tmp;
--
-- ret = -EIO;
-- if (!valid_signal(data))
-- break;
-- if (request == PTRACE_SYSCALL) {
-- child->thread.work.syscall_trace = ~0;
-- } else {
-- child->thread.work.syscall_trace = 0;
-- }
-- child->exit_code = data;
-- /* make sure the single step bit is not set. */
-- tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
-- put_reg(child, PT_SR, tmp);
-- child->thread.work.delayed_trace = 0;
-- wake_up_process(child);
-- ret = 0;
-- break;
-- }
--
--/*
-- * make the child exit. Best I can do is send it a sigkill.
-- * perhaps it should be put in the status that it wants to
-- * exit.
-- */
-- case PTRACE_KILL: {
-- long tmp;
--
-- ret = 0;
-- if (child->exit_state == EXIT_ZOMBIE) /* already dead */
-- break;
-- child->exit_code = SIGKILL;
-- /* make sure the single step bit is not set. */
-- tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
-- put_reg(child, PT_SR, tmp);
-- child->thread.work.delayed_trace = 0;
-- wake_up_process(child);
-- break;
-- }
--
-- case PTRACE_SINGLESTEP: { /* set the trap flag. */
-- long tmp;
--
-- ret = -EIO;
-- if (!valid_signal(data))
-- break;
-- child->thread.work.syscall_trace = 0;
-- tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
-- put_reg(child, PT_SR, tmp);
-- child->thread.work.delayed_trace = 1;
--
-- child->exit_code = data;
-- /* give it a chance to run. */
-- wake_up_process(child);
-- ret = 0;
-- break;
-- }
-+ case PTRACE_PEEKUSR:
-+ if (addr & 3)
-+ goto out_eio;
-+ addr >>= 2; /* temporary hack. */
+ #include <linux/module.h>
++#include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/time.h>
+ #include <linux/slab.h>
+ #include <linux/smp_lock.h>
+ #include <linux/seq_file.h>
+ #include <linux/msdos_fs.h>
++#include <linux/major.h>
+ #include <linux/pagemap.h>
+ #include <linux/buffer_head.h>
+ #include <linux/mount.h>
+@@ -751,7 +753,7 @@
+ Opt_check_n, Opt_check_r, Opt_check_s, Opt_uid, Opt_gid,
+ Opt_umask, Opt_dmask, Opt_fmask, Opt_codepage, Opt_nocase,
+ Opt_quiet, Opt_showexec, Opt_debug, Opt_immutable,
+- Opt_dots, Opt_nodots,
++ Opt_dots, Opt_nodots, Opt_atari_no, Opt_atari_yes,
+ Opt_charset, Opt_shortname_lower, Opt_shortname_win95,
+ Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,
+ Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,
+@@ -776,6 +778,9 @@
+ {Opt_showexec, "showexec"},
+ {Opt_debug, "debug"},
+ {Opt_immutable, "sys_immutable"},
++ {Opt_atari_yes, "atari=yes"},
++ {Opt_atari_yes, "atari"},
++ {Opt_atari_no, "atari=no"},
+ {Opt_obsolate, "conv=binary"},
+ {Opt_obsolate, "conv=text"},
+ {Opt_obsolate, "conv=auto"},
+@@ -850,6 +855,13 @@
+ opts->utf8 = opts->unicode_xlate = 0;
+ opts->numtail = 1;
+ opts->nocase = 0;
++ opts->atari = 0;
+
-+ if (addr >= 0 && addr < 19) {
-+ tmp = get_reg(child, addr);
-+ if (addr == PT_SR)
-+ tmp >>= 16;
-+ } else if (addr >= 21 && addr < 49) {
-+ tmp = child->thread.fp[addr - 21];
-+ /* Convert internal fpu reg representation
-+ * into long double format
-+ */
-+ if (FPU_IS_EMU && (addr < 45) && !(addr % 3))
-+ tmp = ((tmp & 0xffff0000) << 15) |
-+ ((tmp & 0x0000ffff) << 16);
-+ } else
-+ break;
-+ ret = put_user(tmp, (unsigned long *)data);
-+ break;
-+
-+ /* when I and D space are separate, this will have to be fixed. */
-+ case PTRACE_POKETEXT: /* write the word at location addr. */
-+ case PTRACE_POKEDATA:
-+ if (access_process_vm(child, addr, &data, sizeof(data), 1) != sizeof(data))
-+ goto out_eio;
-+ break;
-+
-+ case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
-+ if (addr & 3)
-+ goto out_eio;
-+ addr >>= 2; /* temporary hack. */
-+
-+ if (addr == PT_SR) {
-+ data &= SR_MASK;
-+ data <<= 16;
-+ data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
-+ } else if (addr >= 0 && addr < 19) {
-+ if (put_reg(child, addr, data))
-+ goto out_eio;
-+ } else if (addr >= 21 && addr < 48) {
-+ /* Convert long double format
-+ * into internal fpu reg representation
-+ */
-+ if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) {
-+ data = (unsigned long)data << 15;
-+ data = (data & 0xffff0000) |
-+ ((data & 0x0000ffff) >> 1);
-+ }
-+ child->thread.fp[addr - 21] = data;
-+ } else
-+ goto out_eio;
-+ break;
-+
-+ case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
-+ case PTRACE_CONT: /* restart after signal. */
-+ if (!valid_signal(data))
-+ goto out_eio;
-+
-+ if (request == PTRACE_SYSCALL)
-+ set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-+ else
-+ clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-+ child->exit_code = data;
-+ singlestep_disable(child);
-+ wake_up_process(child);
-+ break;
++#ifdef CONFIG_ATARI
++ if(MACH_IS_ATARI)
++ /* make Atari GEMDOS format the default if machine is an Atari */
++ opts->atari = 1;
++#endif
+ *debug = 0;
-- case PTRACE_DETACH: /* detach a process that was attached. */
-- ret = ptrace_detach(child, data);
-+ /*
-+ * make the child exit. Best I can do is send it a sigkill.
-+ * perhaps it should be put in the status that it wants to
-+ * exit.
-+ */
-+ case PTRACE_KILL:
-+ if (child->exit_state == EXIT_ZOMBIE) /* already dead */
+ if (!options)
+@@ -898,6 +910,12 @@
+ case Opt_immutable:
+ opts->sys_immutable = 1;
break;
--
-- case PTRACE_GETREGS: { /* Get all gp regs from the child. */
-- int i;
-- unsigned long tmp;
-- for (i = 0; i < 19; i++) {
-- tmp = get_reg(child, i);
-- if (i == PT_SR)
-+ child->exit_code = SIGKILL;
-+ singlestep_disable(child);
-+ wake_up_process(child);
-+ break;
-+
-+ case PTRACE_SINGLESTEP: /* set the trap flag. */
-+ if (!valid_signal(data))
-+ goto out_eio;
-+
-+ clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-+ tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
-+ put_reg(child, PT_SR, tmp);
-+ set_tsk_thread_flag(child, TIF_DELAYED_TRACE);
-+
-+ child->exit_code = data;
-+ /* give it a chance to run. */
-+ wake_up_process(child);
-+ break;
-+
-+ case PTRACE_DETACH: /* detach a process that was attached. */
-+ ret = ptrace_detach(child, data);
-+ break;
-+
-+ case PTRACE_GETREGS: /* Get all gp regs from the child. */
-+ for (i = 0; i < 19; i++) {
-+ tmp = get_reg(child, i);
-+ if (i == PT_SR)
- tmp >>= 16;
-- if (put_user(tmp, (unsigned long *) data)) {
-- ret = -EFAULT;
-+ ret = put_user(tmp, (unsigned long *)data);
-+ if (ret)
- break;
-- }
-- data += sizeof(long);
-- }
-- ret = 0;
-- break;
-+ data += sizeof(long);
- }
-+ break;
++ case Opt_atari_yes:
++ opts->atari = 1;
++ break;
++ case Opt_atari_no:
++ opts->atari = 0;
++ break;
+ case Opt_uid:
+ if (match_int(&args[0], &option))
+ return 0;
+@@ -1230,8 +1248,31 @@
-- case PTRACE_SETREGS: { /* Set all gp regs in the child. */
-- int i;
-- unsigned long tmp;
-- for (i = 0; i < 19; i++) {
-- if (get_user(tmp, (unsigned long *) data)) {
-- ret = -EFAULT;
-+ case PTRACE_SETREGS: /* Set all gp regs in the child. */
-+ for (i = 0; i < 19; i++) {
-+ ret = get_user(tmp, (unsigned long *)data);
-+ if (ret)
- break;
-- }
-- if (i == PT_SR) {
-+ if (i == PT_SR) {
- tmp &= SR_MASK;
- tmp <<= 16;
- tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
-- }
-- put_reg(child, i, tmp);
-- data += sizeof(long);
- }
-- ret = 0;
-- break;
-- }
--
-- case PTRACE_GETFPREGS: { /* Get the child FPU state. */
-- ret = 0;
-- if (copy_to_user((void *)data, &child->thread.fp,
-- sizeof(struct user_m68kfp_struct)))
-- ret = -EFAULT;
-- break;
-+ put_reg(child, i, tmp);
-+ data += sizeof(long);
- }
-+ break;
+ total_clusters = (total_sectors - sbi->data_start) / sbi->sec_per_clus;
-- case PTRACE_SETFPREGS: { /* Set the child FPU state. */
-- ret = 0;
-- if (copy_from_user(&child->thread.fp, (void *)data,
-- sizeof(struct user_m68kfp_struct)))
-- ret = -EFAULT;
-- break;
-- }
--
-- default:
-- ret = ptrace_request(child, request, addr, data);
-- break;
-+ case PTRACE_GETFPREGS: /* Get the child FPU state. */
-+ if (copy_to_user((void *)data, &child->thread.fp,
-+ sizeof(struct user_m68kfp_struct)))
-+ ret = -EFAULT;
-+ break;
-+
-+ case PTRACE_SETFPREGS: /* Set the child FPU state. */
-+ if (copy_from_user(&child->thread.fp, (void *)data,
-+ sizeof(struct user_m68kfp_struct)))
-+ ret = -EFAULT;
-+ break;
-+
-+ default:
-+ ret = ptrace_request(child, request, addr, data);
-+ break;
- }
- out_tsk:
- put_task_struct(child);
- out:
- unlock_kernel();
- return ret;
-+out_eio:
-+ ret = -EIO;
-+ goto out_tsk;
- }
-
- asmlinkage void syscall_trace(void)
- {
-- if (!current->thread.work.delayed_trace &&
-- !current->thread.work.syscall_trace)
-- return;
- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
- ? 0x80 : 0));
- /*
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/Makefile linux-2.6.13/arch/m68k/lib/Makefile
---- linux-2.6.13-i386/arch/m68k/lib/Makefile 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/lib/Makefile 2005-08-30 16:31:36.000000000 +0200
-@@ -5,4 +5,4 @@
- EXTRA_AFLAGS := -traditional
-
- lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
-- checksum.o memcmp.o memcpy.o memset.o semaphore.o
-+ checksum.o string.o semaphore.o
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/memcmp.c linux-2.6.13/arch/m68k/lib/memcmp.c
---- linux-2.6.13-i386/arch/m68k/lib/memcmp.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/lib/memcmp.c 1970-01-01 01:00:00.000000000 +0100
-@@ -1,11 +0,0 @@
--#include <linux/types.h>
--
--int memcmp(const void * cs,const void * ct,size_t count)
--{
-- const unsigned char *su1, *su2;
--
-- for( su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-- if (*su1 != *su2)
-- return((*su1 < *su2) ? -1 : +1);
-- return(0);
--}
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/memcpy.c linux-2.6.13/arch/m68k/lib/memcpy.c
---- linux-2.6.13-i386/arch/m68k/lib/memcpy.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/lib/memcpy.c 1970-01-01 01:00:00.000000000 +0100
-@@ -1,75 +0,0 @@
--#include <linux/types.h>
--
--void * memcpy(void * to, const void * from, size_t n)
--{
-- void *xto = to;
-- size_t temp, temp1;
--
-- if (!n)
-- return xto;
-- if ((long) to & 1)
-- {
-- char *cto = to;
-- const char *cfrom = from;
-- *cto++ = *cfrom++;
-- to = cto;
-- from = cfrom;
-- n--;
-- }
-- if (n > 2 && (long) to & 2)
-- {
-- short *sto = to;
-- const short *sfrom = from;
-- *sto++ = *sfrom++;
-- to = sto;
-- from = sfrom;
-- n -= 2;
-- }
-- temp = n >> 2;
-- if (temp)
-- {
-- long *lto = to;
-- const long *lfrom = from;
--
-- __asm__ __volatile__("movel %2,%3\n\t"
-- "andw #7,%3\n\t"
-- "lsrl #3,%2\n\t"
-- "negw %3\n\t"
-- "jmp %%pc@(1f,%3:w:2)\n\t"
-- "4:\t"
-- "movel %0 at +,%1 at +\n\t"
-- "movel %0 at +,%1 at +\n\t"
-- "movel %0 at +,%1 at +\n\t"
-- "movel %0 at +,%1 at +\n\t"
-- "movel %0 at +,%1 at +\n\t"
-- "movel %0 at +,%1 at +\n\t"
-- "movel %0 at +,%1 at +\n\t"
-- "movel %0 at +,%1 at +\n\t"
-- "1:\t"
-- "dbra %2,4b\n\t"
-- "clrw %2\n\t"
-- "subql #1,%2\n\t"
-- "jpl 4b\n\t"
-- : "=a" (lfrom), "=a" (lto), "=d" (temp),
-- "=&d" (temp1)
-- : "0" (lfrom), "1" (lto), "2" (temp)
-- );
-- to = lto;
-- from = lfrom;
-- }
-- if (n & 2)
-- {
-- short *sto = to;
-- const short *sfrom = from;
-- *sto++ = *sfrom++;
-- to = sto;
-- from = sfrom;
-- }
-- if (n & 1)
-- {
-- char *cto = to;
-- const char *cfrom = from;
-- *cto = *cfrom;
-- }
-- return xto;
--}
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/memset.c linux-2.6.13/arch/m68k/lib/memset.c
---- linux-2.6.13-i386/arch/m68k/lib/memset.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/lib/memset.c 1970-01-01 01:00:00.000000000 +0100
-@@ -1,68 +0,0 @@
--#include <linux/types.h>
--
--void * memset(void * s, int c, size_t count)
--{
-- void *xs = s;
-- size_t temp, temp1;
--
-- if (!count)
-- return xs;
-- c &= 0xff;
-- c |= c << 8;
-- c |= c << 16;
-- if ((long) s & 1)
-- {
-- char *cs = s;
-- *cs++ = c;
-- s = cs;
-- count--;
-- }
-- if (count > 2 && (long) s & 2)
-- {
-- short *ss = s;
-- *ss++ = c;
-- s = ss;
-- count -= 2;
-- }
-- temp = count >> 2;
-- if (temp)
-- {
-- long *ls = s;
--
-- __asm__ __volatile__("movel %1,%2\n\t"
-- "andw #7,%2\n\t"
-- "lsrl #3,%1\n\t"
-- "negw %2\n\t"
-- "jmp %%pc@(2f,%2:w:2)\n\t"
-- "1:\t"
-- "movel %3,%0 at +\n\t"
-- "movel %3,%0 at +\n\t"
-- "movel %3,%0 at +\n\t"
-- "movel %3,%0 at +\n\t"
-- "movel %3,%0 at +\n\t"
-- "movel %3,%0 at +\n\t"
-- "movel %3,%0 at +\n\t"
-- "movel %3,%0 at +\n\t"
-- "2:\t"
-- "dbra %1,1b\n\t"
-- "clrw %1\n\t"
-- "subql #1,%1\n\t"
-- "jpl 1b\n\t"
-- : "=a" (ls), "=d" (temp), "=&d" (temp1)
-- : "d" (c), "0" (ls), "1" (temp)
-- );
-- s = ls;
-- }
-- if (count & 2)
-- {
-- short *ss = s;
-- *ss++ = c;
-- s = ss;
-- }
-- if (count & 1)
-- {
-- char *cs = s;
-- *cs = c;
-- }
-- return xs;
--}
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/string.c linux-2.6.13/arch/m68k/lib/string.c
---- linux-2.6.13-i386/arch/m68k/lib/string.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13/arch/m68k/lib/string.c 2005-08-30 13:26:30.000000000 +0200
-@@ -0,0 +1,237 @@
-+
-+#include <linux/types.h>
-+#include <linux/module.h>
-+
-+void *memset(void *s, int c, size_t count)
-+{
-+ void *xs = s;
-+ size_t temp, temp1;
-+
-+ if (!count)
-+ return xs;
-+ c &= 0xff;
-+ c |= c << 8;
-+ c |= c << 16;
-+ if ((long)s & 1) {
-+ char *cs = s;
-+ *cs++ = c;
-+ s = cs;
-+ count--;
-+ }
-+ if (count > 2 && (long)s & 2) {
-+ short *ss = s;
-+ *ss++ = c;
-+ s = ss;
-+ count -= 2;
-+ }
-+ temp = count >> 2;
-+ if (temp) {
-+ long *ls = s;
-+
-+ asm volatile (
-+ " movel %1,%2\n"
-+ " andw #7,%2\n"
-+ " lsrl #3,%1\n"
-+ " negw %2\n"
-+ " jmp %%pc@(2f,%2:w:2)\n"
-+ "1: movel %3,%0 at +\n"
-+ " movel %3,%0 at +\n"
-+ " movel %3,%0 at +\n"
-+ " movel %3,%0 at +\n"
-+ " movel %3,%0 at +\n"
-+ " movel %3,%0 at +\n"
-+ " movel %3,%0 at +\n"
-+ " movel %3,%0 at +\n"
-+ "2: dbra %1,1b\n"
-+ " clrw %1\n"
-+ " subql #1,%1\n"
-+ " jpl 1b"
-+ : "=a" (ls), "=d" (temp), "=&d" (temp1)
-+ : "d" (c), "0" (ls), "1" (temp));
-+ s = ls;
-+ }
-+ if (count & 2) {
-+ short *ss = s;
-+ *ss++ = c;
-+ s = ss;
-+ }
-+ if (count & 1) {
-+ char *cs = s;
-+ *cs = c;
-+ }
-+ return xs;
-+}
-+EXPORT_SYMBOL(memset);
-+
-+void *memcpy(void *to, const void *from, size_t n)
-+{
-+ void *xto = to;
-+ size_t temp, temp1;
-+
-+ if (!n)
-+ return xto;
-+ if ((long)to & 1) {
-+ char *cto = to;
-+ const char *cfrom = from;
-+ *cto++ = *cfrom++;
-+ to = cto;
-+ from = cfrom;
-+ n--;
-+ }
-+ if (n > 2 && (long)to & 2) {
-+ short *sto = to;
-+ const short *sfrom = from;
-+ *sto++ = *sfrom++;
-+ to = sto;
-+ from = sfrom;
-+ n -= 2;
-+ }
-+ temp = n >> 2;
-+ if (temp) {
-+ long *lto = to;
-+ const long *lfrom = from;
-+
-+ asm volatile (
-+ " movel %2,%3\n"
-+ " andw #7,%3\n"
-+ " lsrl #3,%2\n"
-+ " negw %3\n"
-+ " jmp %%pc@(1f,%3:w:2)\n"
-+ "4: movel %0 at +,%1 at +\n"
-+ " movel %0 at +,%1 at +\n"
-+ " movel %0 at +,%1 at +\n"
-+ " movel %0 at +,%1 at +\n"
-+ " movel %0 at +,%1 at +\n"
-+ " movel %0 at +,%1 at +\n"
-+ " movel %0 at +,%1 at +\n"
-+ " movel %0 at +,%1 at +\n"
-+ "1: dbra %2,4b\n"
-+ " clrw %2\n"
-+ " subql #1,%2\n"
-+ " jpl 4b"
-+ : "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1)
-+ : "0" (lfrom), "1" (lto), "2" (temp));
-+ to = lto;
-+ from = lfrom;
-+ }
-+ if (n & 2) {
-+ short *sto = to;
-+ const short *sfrom = from;
-+ *sto++ = *sfrom++;
-+ to = sto;
-+ from = sfrom;
-+ }
-+ if (n & 1) {
-+ char *cto = to;
-+ const char *cfrom = from;
-+ *cto = *cfrom;
-+ }
-+ return xto;
-+}
-+EXPORT_SYMBOL(memcpy);
-+
-+void *memmove(void *dest, const void *src, size_t n)
-+{
-+ void *xdest = dest;
-+ size_t temp;
-+
-+ if (!n)
-+ return xdest;
-+
-+ if (dest < src) {
-+ if ((long)dest & 1) {
-+ char *cdest = dest;
-+ const char *csrc = src;
-+ *cdest++ = *csrc++;
-+ dest = cdest;
-+ src = csrc;
-+ n--;
-+ }
-+ if (n > 2 && (long)dest & 2) {
-+ short *sdest = dest;
-+ const short *ssrc = src;
-+ *sdest++ = *ssrc++;
-+ dest = sdest;
-+ src = ssrc;
-+ n -= 2;
-+ }
-+ temp = n >> 2;
-+ if (temp) {
-+ long *ldest = dest;
-+ const long *lsrc = src;
-+ temp--;
-+ do
-+ *ldest++ = *lsrc++;
-+ while (temp--);
-+ dest = ldest;
-+ src = lsrc;
-+ }
-+ if (n & 2) {
-+ short *sdest = dest;
-+ const short *ssrc = src;
-+ *sdest++ = *ssrc++;
-+ dest = sdest;
-+ src = ssrc;
-+ }
-+ if (n & 1) {
-+ char *cdest = dest;
-+ const char *csrc = src;
-+ *cdest = *csrc;
-+ }
+- if (sbi->fat_bits != 32)
+- sbi->fat_bits = (total_clusters > MAX_FAT12) ? 16 : 12;
++ if (!sbi->options.atari) {
++ if (sbi->fat_bits != 32)
++ sbi->fat_bits = (total_clusters > MAX_FAT12) ? 16 : 12;
+ } else {
-+ dest = (char *)dest + n;
-+ src = (const char *)src + n;
-+ if ((long)dest & 1) {
-+ char *cdest = dest;
-+ const char *csrc = src;
-+ *--cdest = *--csrc;
-+ dest = cdest;
-+ src = csrc;
-+ n--;
-+ }
-+ if (n > 2 && (long)dest & 2) {
-+ short *sdest = dest;
-+ const short *ssrc = src;
-+ *--sdest = *--ssrc;
-+ dest = sdest;
-+ src = ssrc;
-+ n -= 2;
-+ }
-+ temp = n >> 2;
-+ if (temp) {
-+ long *ldest = dest;
-+ const long *lsrc = src;
-+ temp--;
-+ do
-+ *--ldest = *--lsrc;
-+ while (temp--);
-+ dest = ldest;
-+ src = lsrc;
-+ }
-+ if (n & 2) {
-+ short *sdest = dest;
-+ const short *ssrc = src;
-+ *--sdest = *--ssrc;
-+ dest = sdest;
-+ src = ssrc;
-+ }
-+ if (n & 1) {
-+ char *cdest = dest;
-+ const char *csrc = src;
-+ *--cdest = *--csrc;
-+ }
-+ }
-+ return xdest;
-+}
-+EXPORT_SYMBOL(memmove);
-+
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+ const unsigned char *su1, *su2;
-+
-+ for (su1 = cs, su2 = ct; count > 0; ++su1, ++su2, count--)
-+ if (*su1 != *su2)
-+ return *su1 < *su2 ? -1 : +1;
-+ return 0;
-+}
-+EXPORT_SYMBOL(memcmp);
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/mm/Makefile linux-2.6.13/arch/m68k/mm/Makefile
---- linux-2.6.13-i386/arch/m68k/mm/Makefile 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/mm/Makefile 2004-02-06 14:59:40.000000000 +0100
-@@ -2,7 +2,7 @@
- # Makefile for the linux m68k-specific parts of the memory manager.
- #
-
--obj-y := init.o fault.o hwtest.o
-+obj-y := cache.o init.o fault.o hwtest.o
-
- obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o
- obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/mm/cache.c linux-2.6.13/arch/m68k/mm/cache.c
---- linux-2.6.13-i386/arch/m68k/mm/cache.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13/arch/m68k/mm/cache.c 2005-08-30 16:31:37.000000000 +0200
-@@ -0,0 +1,118 @@
-+/*
-+ * linux/arch/m68k/mm/cache.c
-+ *
-+ * Instruction cache handling
-+ *
-+ * Copyright (C) 1995 Hamish Macdonald
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/pgalloc.h>
-+#include <asm/traps.h>
-+
-+
-+static unsigned long virt_to_phys_slow(unsigned long vaddr)
-+{
-+ if (CPU_IS_060) {
-+ unsigned long paddr;
-+
-+ /* The PLPAR instruction causes an access error if the translation
-+ * is not possible. To catch this we use the same exception mechanism
-+ * as for user space accesses in <asm/uaccess.h>. */
-+ asm volatile (".chip 68060\n"
-+ "1: plpar (%0)\n"
-+ ".chip 68k\n"
-+ "2:\n"
-+ ".section .fixup,\"ax\"\n"
-+ " .even\n"
-+ "3: sub.l %0,%0\n"
-+ " jra 2b\n"
-+ ".previous\n"
-+ ".section __ex_table,\"a\"\n"
-+ " .align 4\n"
-+ " .long 1b,3b\n"
-+ ".previous"
-+ : "=a" (paddr)
-+ : "0" (vaddr));
-+ return paddr;
-+ } else if (CPU_IS_040) {
-+ unsigned long mmusr;
-+
-+ asm volatile (".chip 68040\n\t"
-+ "ptestr (%1)\n\t"
-+ "movec %%mmusr, %0\n\t"
-+ ".chip 68k"
-+ : "=r" (mmusr)
-+ : "a" (vaddr));
-+
-+ if (mmusr & MMU_R_040)
-+ return (mmusr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
-+ } else {
-+ unsigned short mmusr;
-+ unsigned long *descaddr;
-+
-+ asm volatile ("ptestr %3,%2@,#7,%0\n\t"
-+ "pmove %%psr,%1@"
-+ : "=a&" (descaddr)
-+ : "a" (&mmusr), "a" (vaddr), "d" (get_fs().seg));
-+ if (mmusr & (MMU_I|MMU_B|MMU_L))
-+ return 0;
-+ descaddr = phys_to_virt((unsigned long)descaddr);
-+ switch (mmusr & MMU_NUM) {
-+ case 1:
-+ return (*descaddr & 0xfe000000) | (vaddr & 0x01ffffff);
-+ case 2:
-+ return (*descaddr & 0xfffc0000) | (vaddr & 0x0003ffff);
-+ case 3:
-+ return (*descaddr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
-+ }
-+ }
-+ return 0;
-+}
-+
-+/* Push n pages at kernel virtual address and clear the icache */
-+/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
-+void flush_icache_range(unsigned long address, unsigned long endaddr)
-+{
-+
-+ if (CPU_IS_040_OR_060) {
-+ address &= PAGE_MASK;
-+
-+ do {
-+ asm volatile ("nop\n\t"
-+ ".chip 68040\n\t"
-+ "cpushp %%bc,(%0)\n\t"
-+ ".chip 68k"
-+ : : "a" (virt_to_phys_slow(address)));
-+ address += PAGE_SIZE;
-+ } while (address < endaddr);
-+ } else {
-+ unsigned long tmp;
-+ asm volatile ("movec %%cacr,%0\n\t"
-+ "orw %1,%0\n\t"
-+ "movec %0,%%cacr"
-+ : "=&d" (tmp)
-+ : "di" (FLUSH_I));
-+ }
-+}
-+EXPORT_SYMBOL(flush_icache_range);
-+
-+void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-+ unsigned long addr, int len)
-+{
-+ if (CPU_IS_040_OR_060) {
-+ asm volatile ("nop\n\t"
-+ ".chip 68040\n\t"
-+ "cpushp %%bc,(%0)\n\t"
-+ ".chip 68k"
-+ : : "a" (page_to_phys(page)));
-+ } else {
-+ unsigned long tmp;
-+ asm volatile ("movec %%cacr,%0\n\t"
-+ "orw %1,%0\n\t"
-+ "movec %0,%%cacr"
-+ : "=&d" (tmp)
-+ : "di" (FLUSH_I));
-+ }
-+}
-+
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/mm/memory.c linux-2.6.13/arch/m68k/mm/memory.c
---- linux-2.6.13-i386/arch/m68k/mm/memory.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/arch/m68k/mm/memory.c 2004-10-03 16:35:42.000000000 +0200
-@@ -354,110 +354,6 @@
- #endif
- }
-
--static unsigned long virt_to_phys_slow(unsigned long vaddr)
--{
-- if (CPU_IS_060) {
-- mm_segment_t fs = get_fs();
-- unsigned long paddr;
--
-- set_fs(get_ds());
--
-- /* The PLPAR instruction causes an access error if the translation
-- * is not possible. To catch this we use the same exception mechanism
-- * as for user space accesses in <asm/uaccess.h>. */
-- asm volatile (".chip 68060\n"
-- "1: plpar (%0)\n"
-- ".chip 68k\n"
-- "2:\n"
-- ".section .fixup,\"ax\"\n"
-- " .even\n"
-- "3: sub.l %0,%0\n"
-- " jra 2b\n"
-- ".previous\n"
-- ".section __ex_table,\"a\"\n"
-- " .align 4\n"
-- " .long 1b,3b\n"
-- ".previous"
-- : "=a" (paddr)
-- : "0" (vaddr));
-- set_fs(fs);
-- return paddr;
-- } else if (CPU_IS_040) {
-- mm_segment_t fs = get_fs();
-- unsigned long mmusr;
--
-- set_fs(get_ds());
--
-- asm volatile (".chip 68040\n\t"
-- "ptestr (%1)\n\t"
-- "movec %%mmusr, %0\n\t"
-- ".chip 68k"
-- : "=r" (mmusr)
-- : "a" (vaddr));
-- set_fs(fs);
--
-- if (mmusr & MMU_R_040)
-- return (mmusr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
-- } else {
-- unsigned short mmusr;
-- unsigned long *descaddr;
--
-- asm volatile ("ptestr #5,%2@,#7,%0\n\t"
-- "pmove %%psr,%1@"
-- : "=a&" (descaddr)
-- : "a" (&mmusr), "a" (vaddr));
-- if (mmusr & (MMU_I|MMU_B|MMU_L))
-- return 0;
-- descaddr = phys_to_virt((unsigned long)descaddr);
-- switch (mmusr & MMU_NUM) {
-- case 1:
-- return (*descaddr & 0xfe000000) | (vaddr & 0x01ffffff);
-- case 2:
-- return (*descaddr & 0xfffc0000) | (vaddr & 0x0003ffff);
-- case 3:
-- return (*descaddr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
-- }
-- }
-- return 0;
--}
--
--/* Push n pages at kernel virtual address and clear the icache */
--/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
--void flush_icache_range(unsigned long address, unsigned long endaddr)
--{
-- if (CPU_IS_040_OR_060) {
-- address &= PAGE_MASK;
--
-- if (address >= PAGE_OFFSET && address < (unsigned long)high_memory) {
-- do {
-- asm volatile ("nop\n\t"
-- ".chip 68040\n\t"
-- "cpushp %%bc,(%0)\n\t"
-- ".chip 68k"
-- : : "a" (virt_to_phys((void *)address)));
-- address += PAGE_SIZE;
-- } while (address < endaddr);
-- } else {
-- do {
-- asm volatile ("nop\n\t"
-- ".chip 68040\n\t"
-- "cpushp %%bc,(%0)\n\t"
-- ".chip 68k"
-- : : "a" (virt_to_phys_slow(address)));
-- address += PAGE_SIZE;
-- } while (address < endaddr);
-- }
-- } else {
-- unsigned long tmp;
-- asm volatile ("movec %%cacr,%0\n\t"
-- "orw %1,%0\n\t"
-- "movec %0,%%cacr"
-- : "=&d" (tmp)
-- : "di" (FLUSH_I));
-- }
--}
--
--
- #ifndef CONFIG_SINGLE_MEMORY_CHUNK
- int mm_end_of_chunk (unsigned long addr, int len)
- {
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/block/swim3.c linux-2.6.13/drivers/block/swim3.c
---- linux-2.6.13-i386/drivers/block/swim3.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/block/swim3.c 2005-08-30 16:32:28.000000000 +0200
-@@ -304,7 +304,7 @@
- #endif /* CONFIG_PMAC_MEDIABAY */
- start_request(&floppy_states[i]);
- }
-- sti();
-+ local_irq_enable();
- }
-
- static void start_request(struct floppy_state *fs)
-@@ -370,7 +370,7 @@
- {
- unsigned long flags;
-
-- save_flags(flags); cli();
-+ local_irq_save(flags);
- if (fs->timeout_pending)
- del_timer(&fs->timeout);
- fs->timeout.expires = jiffies + nticks;
-@@ -378,7 +378,7 @@
- fs->timeout.data = (unsigned long) fs;
- add_timer(&fs->timeout);
- fs->timeout_pending = 1;
-- restore_flags(flags);
-+ local_irq_restore(flags);
- }
-
- static inline void scan_track(struct floppy_state *fs)
-@@ -790,14 +790,13 @@
- {
- unsigned long flags;
-
-- save_flags(flags);
-- cli();
-+ local_irq_save(flags);
- if (fs->state != idle) {
- ++fs->wanted;
- while (fs->state != available) {
- if (interruptible && signal_pending(current)) {
- --fs->wanted;
-- restore_flags(flags);
-+ local_irq_restore(flags);
- return -EINTR;
- }
- interruptible_sleep_on(&fs->wait);
-@@ -805,7 +804,7 @@
- --fs->wanted;
- }
- fs->state = state;
-- restore_flags(flags);
-+ local_irq_restore(flags);
- return 0;
- }
-
-@@ -813,11 +812,10 @@
- {
- unsigned long flags;
-
-- save_flags(flags);
-- cli();
-+ local_irq_save(flags);
- fs->state = idle;
- start_request(fs);
-- restore_flags(flags);
-+ local_irq_restore(flags);
- }
-
- static int fd_eject(struct floppy_state *fs)
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/16c552.h linux-2.6.13/drivers/char/16c552.h
---- linux-2.6.13-i386/drivers/char/16c552.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13/drivers/char/16c552.h 2001-10-22 11:34:32.000000000 +0200
-@@ -0,0 +1,165 @@
-+/*
-+ * Definitions for the 16c552 DACE
-+ * (dual-asynchronous-communications-element) used on the GVP
-+ * IO-Extender.
-+ *
-+ * Basically this is two 16c550 uarts's and a parallel port, which is
-+ * why the serial definitions should be valid for the 16c550 uart
-+ * aswell.
-+ *
-+ * Data was taken from National Semiconductors duart 16c552
-+ * data-sheets and the Texas Instruments DACE 16c552 data-sheets (the
-+ * NS version of the chip is _non_ standard and their data-sheets did
-+ * cost me several wasted hours of work).
-+ *
-+ * This file is (C) 1995 Jes Sorensen (jds at kom.auc.dk)
-+ *
-+ * Moved from drivers/char/ to include/linux/, because it's useful
-+ * on more than just the one card. I'm using it on the hp300 DCA
-+ * serial driver, for example.
-+ * -- Peter Maydell <pmaydell at chiark.greenend.org.uk> 05/1998
-+ */
-+
-+#ifndef _16C552_H_
-+#define _16C552_H_
-+
-+/* Serial stuff */
-+
-+struct uart_16c550 {
-+ volatile u_char skip0;
-+ volatile u_char RBR;
-+ volatile u_char skip1;
-+ volatile u_char IER;
-+ volatile u_char skip2;
-+ volatile u_char IIR;
-+ volatile u_char skip3;
-+ volatile u_char LCR;
-+ volatile u_char skip4;
-+ volatile u_char MCR;
-+ volatile u_char skip5;
-+ volatile u_char LSR;
-+ volatile u_char skip6;
-+ volatile u_char MSR;
-+ volatile u_char skip7;
-+ volatile u_char SCR;
-+};
-+
-+#define THR RBR
-+#define FCR IIR
-+#define DLL RBR
-+#define DLM IER
-+#define AFR IIR
-+
-+/*
-+ * Bit-defines for the various registers.
-+ */
-+
-+
-+/* IER */
-+
-+#define ERDAI (1<<0)
-+#define ETHREI (1<<1)
-+#define ELSI (1<<2)
-+#define EMSI (1<<3)
-+
-+/* IIR - Interrupt Ident. Register */
-+
-+#define IRQ_PEND (1<<0) /* NOTE: IRQ_PEND=0 implies irq pending */
-+#define IRQ_ID1 (1<<1)
-+#define IRQ_ID2 (1<<2)
-+#define IRQ_ID3 (1<<3)
-+#define FIFO_ENA0 (1<<6) /* Both these are set when FCR(1<<0)=1 */
-+#define FIFO_ENA1 (1<<7)
-+
-+#define IRQ_RLS (IRQ_ID1 | IRQ_ID2)
-+#define IRQ_RDA (IRQ_ID2)
-+#define IRQ_CTI (IRQ_ID2 | IRQ_ID3)
-+#define IRQ_THRE (IRQ_ID1)
-+#define IRQ_MS 0
-+
-+/* FCR - FIFO Control Register */
-+
-+#define FIFO_ENA (1<<0)
-+#define RCVR_FIFO_RES (1<<1)
-+#define XMIT_FIFO_RES (1<<2)
-+#define DMA_MODE_SEL (1<<3)
-+#define RCVR_TRIG_LSB (1<<6)
-+#define RCVR_TRIG_MSB (1<<7)
-+
-+#define FIFO_TRIG_1 0x00
-+#define FIFO_TRIG_4 RCVR_TRIG_LSB
-+#define FIFO_TRIG_8 RCVR_TRIG_MSB
-+#define FIFO_TRIG_14 RCVR_TRIG_LSB|RCVR_TRIG_MSB
-+
-+/* LCR - Line Control Register */
-+
-+#define WLS0 (1<<0)
-+#define WLS1 (1<<1)
-+#define STB (1<<2)
-+#define PEN (1<<3)
-+#define EPS (1<<4)
-+#define STICK_PARITY (1<<5)
-+#define SET_BREAK (1<<6)
-+#define DLAB (1<<7)
-+
-+#define data_5bit 0x00
-+#define data_6bit 0x01
-+#define data_7bit 0x02
-+#define data_8bit 0x03
-+
-+
-+/* MCR - Modem Control Register */
-+
-+#define DTR (1<<0)
-+#define RTS (1<<1)
-+#define OUT1 (1<<2)
-+#define OUT2 (1<<3)
-+#define LOOP (1<<4)
-+
-+/* LSR - Line Status Register */
-+
-+#define DR (1<<0)
-+#define OE (1<<1)
-+#define PE (1<<2)
-+#define FE (1<<3)
-+#define BI (1<<4)
-+#define THRE (1<<5)
-+#define TEMT (1<<6)
-+#define RCVR_FIFO_ERR (1<<7)
-+
-+/* MSR - Modem Status Register */
-+
-+#define DCTS (1<<0)
-+#define DDSR (1<<1)
-+#define TERI (1<<2)
-+#define DDCD (1<<3)
-+#define CTS (1<<4)
-+#define DSR (1<<5)
-+#define RING_I (1<<6)
-+#define DCD (1<<7)
-+
-+/* AFR - Alternate Function Register */
-+
-+#define CONCUR_WRITE (1<<0)
-+#define BAUDOUT (1<<1)
-+#define RXRDY (1<<2)
-+
-+/* Parallel stuff */
-+
-+/*
-+ * Unfortunately National Semiconductors did not supply the
-+ * specifications for the parallel port in the chip :-(
-+ * TI succed though, so here they are :-)
-+ *
-+ * Defines for the bits can be found by including <linux/lp.h>
-+ */
-+struct IOEXT_par {
-+ volatile u_char skip0;
-+ volatile u_char DATA;
-+ volatile u_char skip1;
-+ volatile u_char STATUS;
-+ volatile u_char skip2;
-+ volatile u_char CTRL;
-+};
-+
-+#endif
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/ioext.h linux-2.6.13/drivers/char/ioext.h
---- linux-2.6.13-i386/drivers/char/ioext.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13/drivers/char/ioext.h 2001-10-22 11:34:32.000000000 +0200
-@@ -0,0 +1,108 @@
-+/*
-+ * Shared data structure for GVP IO-Extender support.
-+ *
-+ * Merge of ioext.h and ser_ioext.h
-+ */
-+#ifndef _IOEXT_H_
-+#define _IOEXT_H_
-+
-+#include <linux/config.h>
-+#include <linux/netdevice.h>
-+
-+#include "16c552.h"
-+
-+#define MAX_IOEXT 5 /*
-+ * The maximum number of io-extenders is 5, as you
-+ * can't have more than 5 ZII boards in any Amiga.
-+ */
-+
-+#define UART_CLK 7372800
-+
-+#define IOEXT_BAUD_BASE (UART_CLK / 16)
-+
-+#define IOEXT_MAX_LINES 2
-+
-+#define IOEXT_PAR_PLIP 0x0001
-+#define IOEXT_PAR_LP 0x0002
-+
-+
-+/*
-+ * Macros for the serial driver.
-+ */
-+#define curruart(info) ((struct uart_16c550 *)(info->port))
-+
-+#define ser_DTRon(info) curruart(info)->MCR |= DTR
-+#define ser_RTSon(info) curruart(info)->MCR |= RTS
-+#define ser_DTRoff(info) curruart(info)->MCR &= ~DTR
-+#define ser_RTSoff(info) curruart(info)->MCR &= ~RTS
-+
-+
-+/*
-+ * CNTR defines (copied from the GVP SCSI-driver file gvp11.h
-+ */
-+#define GVP_BUSY (1<<0)
-+#define GVP_IRQ_PEND (1<<1)
-+#define GVP_IRQ_ENA (1<<3)
-+#define GVP_DIR_WRITE (1<<4)
-+
-+
-+/*
-+ * CTRL defines
-+ */
-+#define PORT0_MIDI (1<<0) /* CLR = DRIVERS SET = MIDI */
-+#define PORT1_MIDI (1<<1) /* CLR = DRIVERS SET = MIDI */
-+#define PORT0_DRIVER (1<<2) /* CLR = RS232, SET = MIDI */
-+#define PORT1_DRIVER (1<<3) /* CLR = RS232, SET = MIDI */
-+#define IRQ_SEL (1<<4) /* CLR = INT2, SET = INT6 */
-+#define ROM_BANK_SEL (1<<5) /* CLR = LOW 32K, SET = HIGH 32K */
-+#define PORT0_CTRL (1<<6) /* CLR = RTSx or RXRDYx, SET = RTSx ONLY */
-+#define PORT1_CTRL (1<<7) /* CLR = RTSx or RXRDYx, SET = RTSx ONLY */
-+
-+
-+/*
-+ * This is the struct describing the registers on the IO-Extender.
-+ * NOTE: The board uses a dual uart (16c552), which should be equal to
-+ * two 16c550 uarts.
-+ */
-+typedef struct {
-+ char gap0[0x41];
-+ volatile unsigned char CNTR; /* GVP DMAC CNTR (status register) */
-+ char gap1[0x11e];
-+ struct uart_16c550 uart0; /* The first uart */
-+ char gap2[0xf0];
-+ struct uart_16c550 uart1; /* The second uart */
-+ char gap3[0xf0];
-+ struct IOEXT_par par; /* The parallel port */
-+ char gap4[0xfb];
-+ volatile unsigned char CTRL; /* The control-register on the board */
-+} IOEXT_struct;
-+
-+
-+typedef struct {
-+ int num_uarts;
-+ int line[IOEXT_MAX_LINES];
-+ volatile struct uart_16c550 *uart[IOEXT_MAX_LINES];
-+ IOEXT_struct *board;
-+ int spurious_count;
-+ unsigned char par_use; /* IOEXT_PAR_xxx */
-+#if defined(CONFIG_GVPIOEXT_PLIP) || defined(CONFIG_GVPIOEXT_PLIP_MODULE)
-+ struct nt_device *dev;
-+#endif
-+#if defined(CONFIG_GVPIOEXT_LP) || defined(CONFIG_GVPIOEXT_LP_MODULE)
-+ struct lp_struct *lp_table;
-+ int lp_dev;
-+ int lp_interrupt;
-+#endif
-+} IOExtInfoType;
-+
-+/* Number of detected boards. */
-+extern int ioext_num;
-+extern IOExtInfoType ioext_info[MAX_IOEXT];
-+
-+void ioext_plip_interrupt(struct net_device *dev, int *spurious_count);
-+void ioext_lp_interrupt(int dev, int *spurious_count);
-+
-+extern struct net_device ioext_dev_plip[3];
-+extern struct lp_struct ioext_lp_table[1];
-+
-+#endif
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/mc68681.h linux-2.6.13/drivers/char/mc68681.h
---- linux-2.6.13-i386/drivers/char/mc68681.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13/drivers/char/mc68681.h 2001-10-22 11:34:32.000000000 +0200
-@@ -0,0 +1,131 @@
-+#ifndef _MC68681_H_
-+#define _MC68681_H_
-+
-+/*
-+ * This describes an MC68681 DUART. It has almost only overlayed registers, which
-+ * the structure very ugly.
-+ * Note that the ri-register isn't really a register of the duart but a kludge of bsc
-+ * to make the ring indicator available.
-+ *
-+ * The data came from the MFC-31-Developer Kit (from Ralph Seidel,
-+ * zodiac at darkness.gun.de) and the data sheet of Phillip's clone device (SCN68681)
-+ * (from Richard Hirst, srh at gpt.co.uk)
-+ *
-+ * 11.11.95 copyright Joerg Dorchain (dorchain at mpi-sb.mpg.de)
-+ *
-+ */
-+
-+struct duarthalf {
-+union {
-+volatile u_char mr1; /* rw */
-+volatile u_char mr2; /* rw */
-+} mr;
-+volatile u_char ri; /* special, read */
-+union {
-+volatile u_char sr; /* read */
-+volatile u_char csr; /* write */
-+} sr_csr;
-+u_char pad1;
-+volatile u_char cr; /* write */
-+u_char pad2;
-+union {
-+volatile u_char rhr; /* read */
-+volatile u_char thr; /* write */
-+} hr;
-+u_char pad3;
-+};
-+
-+struct duart {
-+struct duarthalf pa;
-+union {
-+volatile u_char ipcr; /* read */
-+volatile u_char acr; /* write */
-+} ipcr_acr;
-+u_char pad1;
-+union {
-+volatile u_char isr; /* read */
-+volatile u_char imr; /* write */
-+} ir;
-+u_char pad2;
-+volatile u_char ctu;
-+u_char pad3;
-+volatile u_char ctl;
-+u_char pad4;
-+struct duarthalf pb;
-+volatile u_char ivr;
-+u_char pad5;
-+union {
-+volatile u_char ipr; /* read */
-+volatile u_char opcr; /* write */
-+} ipr_opcr;
-+u_char pad6;
-+union {
-+volatile u_char start; /* read */
-+volatile u_char sopc; /* write */
-+} start_sopc;
-+u_char pad7;
-+union {
-+volatile u_char stop; /* read */
-+volatile u_char ropc; /* write */
-+} stop_ropc;
-+u_char pad8;
-+};
-+
-+#define MR1_BITS 3
-+#define MR1_5BITS 0
-+#define MR1_6BITS 1
-+#define MR1_7BITS 2
-+#define MR1_8BITS 3
-+
-+#define MR1_PARITY_ODD 4
-+
-+#define MR1_PARITY 24
-+#define MR1_PARITY_WITH 0
-+#define MR1_PARITY_FORCE 8
-+#define MR1_PARITY_NO 16
-+#define MR1_PARITY_MULTIDROP 24
-+
-+#define MR1_ERROR_BLOCK 32
-+#define MR1_FFULL_IRQ 64
-+#define MR1_RxRTS_ON 128
-+
-+#define MR2_STOPS 15
-+#define MR2_1STOP 7
-+#define MR2_2STOP 15
-+
-+#define MR2_CTS_ON 16
-+#define MR2_TxRTS_ON 32
-+
-+#define MR2_MODE 192
-+#define MR2_NORMAL 0
-+#define MR2_ECHO 64
-+#define MR2_LOCALLOOP 128
-+#define MR2_REMOTELOOP 192
-+
-+#define CR_RXCOMMAND 3
-+#define CR_NONE 0
-+#define CR_RX_ON 1
-+#define CR_RX_OFF 2
-+#define CR_TXCOMMAND 12
-+#define CR_TX_ON 4
-+#define CR_TX_OFF 8
-+#define CR_MISC 112
-+#define CR_RESET_MR 16
-+#define CR_RESET_RX 32
-+#define CR_RESET_TX 48
-+#define CR_RESET_ERR 64
-+#define CR_RESET_BREAK 80
-+#define CR_START_BREAK 96
-+#define CR_STOP_BREAK 112
-+
-+#define SR_RXRDY 1
-+#define SR_FFULL 2
-+#define SR_TXRDY 4
-+#define SR_TXEMPT 8
-+#define SR_OVERRUN 16
-+#define SR_PARITY 32
-+#define SR_FRAMING 64
-+#define SR_BREAK 128
-+
-+
-+#endif
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/plip_ioext.c linux-2.6.13/drivers/char/plip_ioext.c
---- linux-2.6.13-i386/drivers/char/plip_ioext.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13/drivers/char/plip_ioext.c 2004-10-25 16:38:25.000000000 +0200
-@@ -0,0 +1,1058 @@
-+/*
-+ * plip_ioext: A parallel port "network" driver for GVP IO-Extender.
-+ *
-+ * Authors: See drivers/net/plip.c
-+ * IO-Extender version by Steve Bennett, <msteveb at ozemail.com.au>
-+ *
-+ * This driver is for use with a 5-bit cable (LapLink (R) cable).
-+ */
-+
-+static const char *version = "NET3 PLIP version 2.2/m68k";
-+
-+#define __NO_VERSION__
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/sched.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/slab.h>
-+#include <linux/termios.h>
-+#include <linux/tty.h>
-+#include <linux/serial.h>
-+
-+#include <asm/setup.h>
-+#include <asm/irq.h>
-+#include <asm/amigahw.h>
-+#include <asm/amigaints.h>
-+#include <linux/zorro.h>
-+
-+#include <linux/config.h>
-+#include <linux/kernel.h>
-+#include <linux/fcntl.h>
-+#include <linux/string.h>
-+#include <linux/ptrace.h>
-+#include <linux/if_ether.h>
-+
-+#include <asm/system.h>
-+
-+#include <linux/in.h>
-+#include <linux/delay.h>
-+/*#include <linux/lp_m68k.h>*/
-+
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/inetdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/if_plip.h>
-+
-+#include <linux/tqueue.h>
-+#include <linux/ioport.h>
-+#include <linux/bitops.h>
-+#include <asm/byteorder.h>
-+
-+#include "ioext.h"
-+
-+#define DEBUG 0
-+
-+/* Map 'struct device *' to our control structure */
-+#define PLIP_DEV(DEV) (&ioext_info[(DEV)->irq])
-+
-+/************************************************************************
-+**
-+** PLIP definitions
-+**
-+*************************************************************************
-+*/
-+
-+/* Use 0 for production, 1 for verification, >2 for debug */
-+#ifndef NET_DEBUG
-+#define NET_DEBUG 2
-+#endif
-+static unsigned int net_debug = NET_DEBUG;
-+
-+/* In micro second */
-+#define PLIP_DELAY_UNIT 1
-+
-+/* Connection time out = PLIP_TRIGGER_WAIT * PLIP_DELAY_UNIT usec */
-+#define PLIP_TRIGGER_WAIT 500
-+
-+/* Nibble time out = PLIP_NIBBLE_WAIT * PLIP_DELAY_UNIT usec */
-+#define PLIP_NIBBLE_WAIT 3000
-+
-+#define PAR_DATA(dev) ((dev)->base_addr+0)
-+#define PAR_STATUS(dev) ((dev)->base_addr+2)
-+#define PAR_CONTROL(dev) ((dev)->base_addr+4)
-+
-+static void enable_par_irq(struct device *dev, int on);
-+static int plip_init(struct device *dev);
-+
-+/* Bottom halfs */
-+static void plip_kick_bh(struct device *dev);
-+static void plip_bh(struct device *dev);
-+
-+/* Functions for DEV methods */
-+static int plip_rebuild_header(struct sk_buff *skb);
-+static int plip_tx_packet(struct sk_buff *skb, struct device *dev);
-+static int plip_open(struct device *dev);
-+static int plip_close(struct device *dev);
-+static struct enet_statistics *plip_get_stats(struct device *dev);
-+static int plip_config(struct device *dev, struct ifmap *map);
-+static int plip_ioctl(struct device *dev, struct ifreq *ifr, int cmd);
-+
-+enum plip_connection_state {
-+ PLIP_CN_NONE=0,
-+ PLIP_CN_RECEIVE,
-+ PLIP_CN_SEND,
-+ PLIP_CN_CLOSING,
-+ PLIP_CN_ERROR
-+};
-+
-+enum plip_packet_state {
-+ PLIP_PK_DONE=0,
-+ PLIP_PK_TRIGGER,
-+ PLIP_PK_LENGTH_LSB,
-+ PLIP_PK_LENGTH_MSB,
-+ PLIP_PK_DATA,
-+ PLIP_PK_CHECKSUM
-+};
-+
-+enum plip_nibble_state {
-+ PLIP_NB_BEGIN,
-+ PLIP_NB_1,
-+ PLIP_NB_2,
-+};
-+
-+struct plip_local {
-+ enum plip_packet_state state;
-+ enum plip_nibble_state nibble;
-+ union {
-+ struct {
-+#if defined(__LITTLE_ENDIAN)
-+ unsigned char lsb;
-+ unsigned char msb;
-+#elif defined(__BIG_ENDIAN)
-+ unsigned char msb;
-+ unsigned char lsb;
-+#else
-+#error "Please fix the endianness defines in <asm/byteorder.h>"
-+#endif
-+ } b;
-+ unsigned short h;
-+ } length;
-+ unsigned short byte;
-+ unsigned char checksum;
-+ unsigned char data;
-+ struct sk_buff *skb;
-+};
-+
-+struct net_local {
-+ struct enet_statistics enet_stats;
-+ struct tq_struct immediate;
-+ struct tq_struct deferred;
-+ struct plip_local snd_data;
-+ struct plip_local rcv_data;
-+ unsigned long trigger;
-+ unsigned long nibble;
-+ enum plip_connection_state connection;
-+ unsigned short timeout_count;
-+ char is_deferred;
-+ int (*orig_rebuild_header)(struct sk_buff *skb);
-+};
-+
-+struct device ioext_dev_plip[] = {
-+ {
-+ "plip0",
-+ 0, 0, 0, 0, /* memory */
-+ 0, 0, /* base, irq */
-+ 0, 0, 0, NULL, plip_init
-+ },
-+ {
-+ "plip1",
-+ 0, 0, 0, 0, /* memory */
-+ 0, 0, /* base, irq */
-+ 0, 0, 0, NULL, plip_init
-+ },
-+ {
-+ "plip2",
-+ 0, 0, 0, 0, /* memory */
-+ 0, 0, /* base, irq */
-+ 0, 0, 0, NULL, plip_init
-+ }
-+};
-+
-+/*
-+ * Check for and handle an interrupt for this PLIP device.
-+ *
-+ */
-+void ioext_plip_interrupt(struct device *dev, int *spurious_count)
-+{
-+ struct net_local *nl;
-+ struct plip_local *rcv;
-+ unsigned char c0;
-+ unsigned long flags;
-+
-+ nl = (struct net_local *)dev->priv;
-+ rcv = &nl->rcv_data;
-+
-+ c0 = z_readb(PAR_STATUS(dev));
-+
-+ if (dev->interrupt) {
-+ return;
-+ }
-+
-+ if ((c0 & 0xf8) != 0xc0) {
-+ /* Not for us */
-+ ++*spurious_count;
-+ return;
-+ }
-+
-+ *spurious_count = 0;
-+ dev->interrupt = 1;
-+
-+ local_irq_save(flags);
-+
-+ switch (nl->connection) {
-+ case PLIP_CN_CLOSING:
-+ dev->tbusy = 0;
-+ case PLIP_CN_NONE:
-+ case PLIP_CN_SEND:
-+ dev->last_rx = jiffies;
-+ rcv->state = PLIP_PK_TRIGGER;
-+ nl->connection = PLIP_CN_RECEIVE;
-+ nl->timeout_count = 0;
-+ queue_task(&nl->immediate, &tq_immediate);
-+ mark_bh(IMMEDIATE_BH);
-+ local_irq_restore(flags);
-+#if 0
-+ printk("%s: receive irq in SEND/NONE/CLOSING (%d) ok\n",
-+ dev->name, nl->connection);
-+#endif
-+ break;
-+
-+ case PLIP_CN_RECEIVE:
-+ local_irq_restore(flags);
-+ printk("%s: receive interrupt when receiving packet\n",
-+ dev->name);
-+ break;
-+
-+ case PLIP_CN_ERROR:
-+ local_irq_restore(flags);
-+ printk("%s: receive interrupt in error state\n", dev->name);
-+ break;
-+ }
-+}
-+
-+
-+/* Bottom half handler for the delayed request.
-+ This routine is kicked by do_timer().
-+ Request `plip_bh' to be invoked. */
-+static void
-+plip_kick_bh(struct device *dev)
-+{
-+ struct net_local *nl = (struct net_local *)dev->priv;
-+
-+ if (nl->is_deferred) {
-+ queue_task(&nl->immediate, &tq_immediate);
-+ mark_bh(IMMEDIATE_BH);
-+ }
-+}
-+
-+/* Forward declarations of internal routines */
-+static int plip_none(struct device *, struct net_local *,
-+ struct plip_local *, struct plip_local *);
-+static int plip_receive_packet(struct device *, struct net_local *,
-+ struct plip_local *, struct plip_local *);
-+static int plip_send_packet(struct device *, struct net_local *,
-+ struct plip_local *, struct plip_local *);
-+static int plip_connection_close(struct device *, struct net_local *,
-+ struct plip_local *, struct plip_local *);
-+static int plip_error(struct device *, struct net_local *,
-+ struct plip_local *, struct plip_local *);
-+static int plip_bh_timeout_error(struct device *dev, struct net_local *nl,
-+ struct plip_local *snd,
-+ struct plip_local *rcv,
-+ int error);
-+
-+#define OK 0
-+#define TIMEOUT 1
-+#define ERROR 2
-+
-+typedef int (*plip_func)(struct device *dev, struct net_local *nl,
-+ struct plip_local *snd, struct plip_local *rcv);
-+
-+static plip_func connection_state_table[] =
-+{
-+ plip_none,
-+ plip_receive_packet,
-+ plip_send_packet,
-+ plip_connection_close,
-+ plip_error
-+};
-+
-+/*
-+** enable_par_irq()
-+**
-+** Enable or disable parallel irq for 'dev' according to 'on'.
-+**
-+** It is NOT possible to disable only the parallel irq.
-+** So we disable the board interrupt instead. This means that
-+** during reception of a PLIP packet, no serial interrupts can
-+** happen. Sorry.
-+*/
-+static void enable_par_irq(struct device *dev, int on)
-+{
-+ if (on) {
-+ PLIP_DEV(dev)->board->CNTR |= GVP_IRQ_ENA;
-+ }
-+ else {
-+ PLIP_DEV(dev)->board->CNTR &= ~GVP_IRQ_ENA;
-+ }
-+}
-+
-+/* Bottom half handler of PLIP. */
-+static void
-+plip_bh(struct device *dev)
-+{
-+ struct net_local *nl = (struct net_local *)dev->priv;
-+ struct plip_local *snd = &nl->snd_data;
-+ struct plip_local *rcv = &nl->rcv_data;
-+ plip_func f;
-+ int r;
-+
-+ nl->is_deferred = 0;
-+ f = connection_state_table[nl->connection];
-+ if ((r = (*f)(dev, nl, snd, rcv)) != OK
-+ && (r = plip_bh_timeout_error(dev, nl, snd, rcv, r)) != OK) {
-+ nl->is_deferred = 1;
-+ queue_task(&nl->deferred, &tq_timer);
-+ }
-+}
-+
-+static int
-+plip_bh_timeout_error(struct device *dev, struct net_local *nl,
-+ struct plip_local *snd, struct plip_local *rcv,
-+ int error)
-+{
-+ unsigned char c0;
-+ unsigned long flags;
-+
-+ local_irq_save(flags);
-+ if (nl->connection == PLIP_CN_SEND) {
-+
-+ if (error != ERROR) { /* Timeout */
-+ nl->timeout_count++;
-+ if ((snd->state == PLIP_PK_TRIGGER
-+ && nl->timeout_count <= 10)
-+ || nl->timeout_count <= 3) {
-+ local_irq_restore(flags);
-+ /* Try again later */
-+ return TIMEOUT;
-+ }
-+ c0 = z_readb(PAR_STATUS(dev));
-+ printk(KERN_INFO "%s: transmit timeout(%d,%02x)\n",
-+ dev->name, snd->state, c0);
-+ }
-+ nl->enet_stats.tx_errors++;
-+ nl->enet_stats.tx_aborted_errors++;
-+ } else if (nl->connection == PLIP_CN_RECEIVE) {
-+ if (rcv->state == PLIP_PK_TRIGGER) {
-+ /* Transmission was interrupted. */
-+ local_irq_restore(flags);
-+ return OK;
-+ }
-+ if (error != ERROR) { /* Timeout */
-+ if (++nl->timeout_count <= 3) {
-+ local_irq_restore(flags);
-+ /* Try again later */
-+ return TIMEOUT;
-+ }
-+ c0 = z_readb(PAR_STATUS(dev));
-+ printk(KERN_INFO "%s: receive timeout(%d,%02x)\n",
-+ dev->name, rcv->state, c0);
-+ }
-+ nl->enet_stats.rx_dropped++;
-+ }
-+ rcv->state = PLIP_PK_DONE;
-+ if (rcv->skb) {
-+ kfree_skb(rcv->skb);
-+ rcv->skb = NULL;
-+ }
-+ snd->state = PLIP_PK_DONE;
-+ if (snd->skb) {
-+ dev_kfree_skb(snd->skb);
-+ snd->skb = NULL;
-+ }
-+ enable_par_irq(dev, 0);
-+ dev->tbusy = 1;
-+ nl->connection = PLIP_CN_ERROR;
-+ z_writeb(0x00, PAR_DATA(dev));
-+ local_irq_restore(flags);
-+
-+ return TIMEOUT;
-+}
-+
-+static int
-+plip_none(struct device *dev, struct net_local *nl,
-+ struct plip_local *snd, struct plip_local *rcv)
-+{
-+ return OK;
-+}
-+
-+/* PLIP_RECEIVE --- receive a byte(two nibbles)
-+ Returns OK on success, TIMEOUT on timeout */
-+inline static int
-+plip_receive(struct device *dev, unsigned short nibble_timeout,
-+ enum plip_nibble_state *ns_p, unsigned char *data_p)
-+{
-+ unsigned char c0, c1;
-+ unsigned int cx;
-+
-+ switch (*ns_p) {
-+ case PLIP_NB_BEGIN:
-+ cx = nibble_timeout;
-+ while (1) {
-+ c0 = z_readb(PAR_STATUS(dev));
-+ udelay(PLIP_DELAY_UNIT);
-+ if ((c0 & 0x80) == 0) {
-+ c1 = z_readb(PAR_STATUS(dev));
-+ if (c0 == c1)
-+ break;
-+ }
-+ if (--cx == 0)
-+ return TIMEOUT;
-+ }
-+#if 0
-+ printk("received first nybble: %02X -> %02X\n",
-+ c0, (c0 >> 3) & 0x0F);
-+#endif
-+ *data_p = (c0 >> 3) & 0x0f;
-+ z_writeb(0x10, PAR_DATA(dev)); /* send ACK */
-+ *ns_p = PLIP_NB_1;
-+
-+ case PLIP_NB_1:
-+ cx = nibble_timeout;
-+ while (1) {
-+ c0 = z_readb(PAR_STATUS(dev));
-+ udelay(PLIP_DELAY_UNIT);
-+ if (c0 & 0x80) {
-+ c1 = z_readb(PAR_STATUS(dev));
-+ if (c0 == c1)
-+ break;
-+ }
-+ if (--cx == 0)
-+ return TIMEOUT;
-+ }
-+#if 0
-+ printk("received second nybble: %02X -> %02X\n",
-+ c0, (c0 << 1) & 0xF0);
-+#endif
-+ *data_p |= (c0 << 1) & 0xf0;
-+ z_writeb(0x00, PAR_DATA(dev)); /* send ACK */
-+ *ns_p = PLIP_NB_BEGIN;
-+ case PLIP_NB_2:
-+ break;
-+ }
-+ return OK;
-+}
-+
-+/* PLIP_RECEIVE_PACKET --- receive a packet */
-+static int
-+plip_receive_packet(struct device *dev, struct net_local *nl,
-+ struct plip_local *snd, struct plip_local *rcv)
-+{
-+ unsigned short nibble_timeout = nl->nibble;
-+ unsigned char *lbuf;
-+ unsigned long flags;
-+
-+ switch (rcv->state) {
-+ case PLIP_PK_TRIGGER:
-+ enable_par_irq(dev, 0);
-+ dev->interrupt = 0;
-+ z_writeb(0x01, PAR_DATA(dev)); /* send ACK */
-+ if (net_debug > 2)
-+ printk(KERN_DEBUG "%s: receive start\n", dev->name);
-+ rcv->state = PLIP_PK_LENGTH_LSB;
-+ rcv->nibble = PLIP_NB_BEGIN;
-+
-+ case PLIP_PK_LENGTH_LSB:
-+ if (snd->state != PLIP_PK_DONE) {
-+ if (plip_receive(dev, nl->trigger,
-+ &rcv->nibble, &rcv->length.b.lsb)) {
-+ /* collision, here dev->tbusy == 1 */
-+ rcv->state = PLIP_PK_DONE;
-+ nl->is_deferred = 1;
-+ nl->connection = PLIP_CN_SEND;
-+ queue_task(&nl->deferred, &tq_timer);
-+ enable_par_irq(dev, 1);
-+ return OK;
-+ }
-+ } else {
-+ if (plip_receive(dev, nibble_timeout,
-+ &rcv->nibble, &rcv->length.b.lsb))
-+ return TIMEOUT;
-+ }
-+ rcv->state = PLIP_PK_LENGTH_MSB;
-+
-+ case PLIP_PK_LENGTH_MSB:
-+ if (plip_receive(dev, nibble_timeout,
-+ &rcv->nibble, &rcv->length.b.msb))
-+ return TIMEOUT;
-+ if (rcv->length.h > dev->mtu + dev->hard_header_len
-+ || rcv->length.h < 8) {
-+ printk(KERN_INFO "%s: bogus packet size %d.\n",
-+ dev->name, rcv->length.h);
-+ return ERROR;
-+ }
-+ /* Malloc up new buffer. */
-+ rcv->skb = dev_alloc_skb(rcv->length.h);
-+ if (rcv->skb == NULL) {
-+ printk(KERN_INFO "%s: Memory squeeze.\n", dev->name);
-+ return ERROR;
-+ }
-+ skb_put(rcv->skb,rcv->length.h);
-+ rcv->skb->dev = dev;
-+ rcv->state = PLIP_PK_DATA;
-+ rcv->byte = 0;
-+ rcv->checksum = 0;
-+
-+ case PLIP_PK_DATA:
-+ lbuf = rcv->skb->data;
-+ do
-+ if (plip_receive(dev, nibble_timeout,
-+ &rcv->nibble, &lbuf[rcv->byte]))
-+ return TIMEOUT;
-+ while (++rcv->byte < rcv->length.h);
-+ do
-+ rcv->checksum += lbuf[--rcv->byte];
-+ while (rcv->byte);
-+ rcv->state = PLIP_PK_CHECKSUM;
-+
-+ case PLIP_PK_CHECKSUM:
-+ if (plip_receive(dev, nibble_timeout,
-+ &rcv->nibble, &rcv->data))
-+ return TIMEOUT;
-+ if (rcv->data != rcv->checksum) {
-+ nl->enet_stats.rx_crc_errors++;
-+ if (net_debug)
-+ printk(KERN_INFO "%s: checksum error\n",
-+ dev->name);
-+ return ERROR;
-+ }
-+ rcv->state = PLIP_PK_DONE;
-+
-+ case PLIP_PK_DONE:
-+ /* Inform the upper layer for the arrival of a packet. */
-+ rcv->skb->protocol=eth_type_trans(rcv->skb, dev);
-+ netif_rx(rcv->skb);
-+ nl->enet_stats.rx_packets++;
-+ rcv->skb = NULL;
-+ if (net_debug > 2)
-+ printk(KERN_DEBUG "%s: receive end\n", dev->name);
-+
-+ /* Close the connection. */
-+ z_writeb (0x00, PAR_DATA(dev));
-+
-+ local_irq_save(flags);
-+ if (snd->state != PLIP_PK_DONE) {
-+ nl->connection = PLIP_CN_SEND;
-+ local_irq_restore(flags);
-+ queue_task(&nl->immediate, &tq_immediate);
-+ mark_bh(IMMEDIATE_BH);
-+ enable_par_irq(dev, 1);
-+ return OK;
-+ } else {
-+ nl->connection = PLIP_CN_NONE;
-+ local_irq_restore(flags);
-+ enable_par_irq(dev, 1);
-+ return OK;
-+ }
-+ }
-+ return OK;
-+}
-+
-+/* PLIP_SEND --- send a byte (two nibbles)
-+ Returns OK on success, TIMEOUT when timeout */
-+inline static int
-+plip_send(struct device *dev, unsigned short nibble_timeout,
-+ enum plip_nibble_state *ns_p, unsigned char data)
-+{
-+ unsigned char c0;
-+ unsigned int cx;
-+
-+ switch (*ns_p) {
-+ case PLIP_NB_BEGIN:
-+ z_writeb((data & 0x0f), PAR_DATA(dev));
-+ *ns_p = PLIP_NB_1;
-+
-+ case PLIP_NB_1:
-+ z_writeb(0x10 | (data & 0x0f), PAR_DATA(dev));
-+ cx = nibble_timeout;
-+ while (1) {
-+ c0 = z_readb(PAR_STATUS(dev));
-+ if ((c0 & 0x80) == 0)
-+ break;
-+ if (--cx == 0)
-+ return TIMEOUT;
-+ udelay(PLIP_DELAY_UNIT);
-+ }
-+ z_writeb(0x10 | (data >> 4), PAR_DATA(dev));
-+ *ns_p = PLIP_NB_2;
-+
-+ case PLIP_NB_2:
-+ z_writeb((data >> 4), PAR_DATA(dev));
-+ cx = nibble_timeout;
-+ while (1) {
-+ c0 = z_readb(PAR_STATUS(dev));
-+ if (c0 & 0x80)
-+ break;
-+ if (--cx == 0)
-+ return TIMEOUT;
-+ udelay(PLIP_DELAY_UNIT);
-+ }
-+ *ns_p = PLIP_NB_BEGIN;
-+ return OK;
-+ }
-+ return OK;
-+}
-+
-+/* PLIP_SEND_PACKET --- send a packet */
-+static int
-+plip_send_packet(struct device *dev, struct net_local *nl,
-+ struct plip_local *snd, struct plip_local *rcv)
-+{
-+ unsigned short nibble_timeout = nl->nibble;
-+ unsigned char *lbuf;
-+ unsigned char c0;
-+ unsigned int cx;
-+ unsigned long flags;
-+
-+ if (snd->skb == NULL || (lbuf = snd->skb->data) == NULL) {
-+ printk(KERN_INFO "%s: send skb lost\n", dev->name);
-+ snd->state = PLIP_PK_DONE;
-+ snd->skb = NULL;
-+ return ERROR;
-+ }
-+
-+ if (snd->length.h == 0) {
-+ return OK;
-+ }
-+
-+ switch (snd->state) {
-+ case PLIP_PK_TRIGGER:
-+ if ((z_readb(PAR_STATUS(dev)) & 0xf8) != 0x80)
-+ return TIMEOUT;
-+
-+ /* Trigger remote rx interrupt. */
-+ z_writeb(0x08, PAR_DATA(dev));
-+ cx = nl->trigger;
-+ while (1) {
-+ udelay(PLIP_DELAY_UNIT);
-+ local_irq_save(flags);
-+ if (nl->connection == PLIP_CN_RECEIVE) {
-+ local_irq_restore(flags);
-+ /* interrupted */
-+ nl->enet_stats.collisions++;
-+ if (net_debug > 1)
-+ printk(KERN_INFO "%s: collision.\n",
-+ dev->name);
-+ return OK;
-+ }
-+ c0 = z_readb(PAR_STATUS(dev));
-+ if (c0 & 0x08) {
-+ enable_par_irq(dev, 0);
-+ if (net_debug > 2)
-+ printk(KERN_DEBUG "%s: send start\n",
-+ dev->name);
-+ snd->state = PLIP_PK_LENGTH_LSB;
-+ snd->nibble = PLIP_NB_BEGIN;
-+ nl->timeout_count = 0;
-+ local_irq_restore(flags);
-+ break;
-+ }
-+ local_irq_restore(flags);
-+ if (--cx == 0) {
-+ z_writeb(0x00, PAR_DATA(dev));
-+ return TIMEOUT;
-+ }
-+ }
-+
-+ case PLIP_PK_LENGTH_LSB:
-+ if (plip_send(dev, nibble_timeout,
-+ &snd->nibble, snd->length.b.lsb))
-+ return TIMEOUT;
-+ snd->state = PLIP_PK_LENGTH_MSB;
-+
-+ case PLIP_PK_LENGTH_MSB:
-+ if (plip_send(dev, nibble_timeout,
-+ &snd->nibble, snd->length.b.msb))
-+ return TIMEOUT;
-+ snd->state = PLIP_PK_DATA;
-+ snd->byte = 0;
-+ snd->checksum = 0;
-+
-+ case PLIP_PK_DATA:
-+ do
-+ if (plip_send(dev, nibble_timeout,
-+ &snd->nibble, lbuf[snd->byte]))
-+ return TIMEOUT;
-+ while (++snd->byte < snd->length.h);
-+ do
-+ snd->checksum += lbuf[--snd->byte];
-+ while (snd->byte);
-+ snd->state = PLIP_PK_CHECKSUM;
-+
-+ case PLIP_PK_CHECKSUM:
-+ if (plip_send(dev, nibble_timeout,
-+ &snd->nibble, snd->checksum))
-+ return TIMEOUT;
-+
-+ dev_kfree_skb(snd->skb);
-+ nl->enet_stats.tx_packets++;
-+ snd->state = PLIP_PK_DONE;
-+
-+ case PLIP_PK_DONE:
-+ /* Close the connection */
-+ z_writeb (0x00, PAR_DATA(dev));
-+ snd->skb = NULL;
-+ if (net_debug > 2)
-+ printk(KERN_DEBUG "%s: send end\n", dev->name);
-+ nl->connection = PLIP_CN_CLOSING;
-+ nl->is_deferred = 1;
-+ queue_task(&nl->deferred, &tq_timer);
-+ enable_par_irq(dev, 1);
-+ return OK;
-+ }
-+ return OK;
-+}
-+
-+static int
-+plip_connection_close(struct device *dev, struct net_local *nl,
-+ struct plip_local *snd, struct plip_local *rcv)
-+{
-+ unsigned long flags;
-+
-+ local_irq_save(flags);
-+ if (nl->connection == PLIP_CN_CLOSING) {
-+ nl->connection = PLIP_CN_NONE;
-+ dev->tbusy = 0;
-+ mark_bh(NET_BH);
-+ }
-+ local_irq_restore(flags);
-+ return OK;
-+}
-+
-+/* PLIP_ERROR --- wait till other end settled */
-+static int
-+plip_error(struct device *dev, struct net_local *nl,
-+ struct plip_local *snd, struct plip_local *rcv)
-+{
-+ unsigned char status;
-+
-+ status = z_readb(PAR_STATUS(dev));
-+ if ((status & 0xf8) == 0x80) {
-+ if (net_debug > 2)
-+ printk(KERN_DEBUG "%s: reset interface.\n", dev->name);
-+ nl->connection = PLIP_CN_NONE;
-+ dev->tbusy = 0;
-+ dev->interrupt = 0;
-+ enable_par_irq(dev, 1);
-+ mark_bh(NET_BH);
-+ } else {
-+ nl->is_deferred = 1;
-+ queue_task(&nl->deferred, &tq_timer);
-+ }
-+
-+ return OK;
-+}
-+
-+/* We don't need to send arp, for plip is point-to-point. */
-+static int
-+plip_rebuild_header(struct sk_buff *skb)
-+{
-+ struct device *dev = skb->dev;
-+ struct net_local *nl = (struct net_local *)dev->priv;
-+ struct ethhdr *eth = (struct ethhdr *)skb->data;
-+ int i;
-+
-+ if ((dev->flags & IFF_NOARP)==0)
-+ return nl->orig_rebuild_header(skb);
-+
-+ if (eth->h_proto != __constant_htons(ETH_P_IP)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+ && eth->h_proto != __constant_htons(ETH_P_IPV6)
-+#endif
-+ ) {
-+ printk(KERN_ERR "plip_rebuild_header: Don't know how to resolve type %d addresses?\n", (int)eth->h_proto);
-+ memcpy(eth->h_source, dev->dev_addr, dev->addr_len);
-+ return 0;
-+ }
-+
-+ for (i=0; i < ETH_ALEN - sizeof(u32); i++)
-+ eth->h_dest[i] = 0xfc;
-+#if 0
-+ *(u32 *)(eth->h_dest+i) = dst;
-+#else
-+ /* Do not want to include net/route.h here.
-+ * In any case, it is TOP of silliness to emulate
-+ * hardware addresses on PtP link. --ANK
-+ */
-+ *(u32 *)(eth->h_dest+i) = 0;
-+#endif
-+ return 0;
-+}
-+
-+static int
-+plip_tx_packet(struct sk_buff *skb, struct device *dev)
-+{
-+ struct net_local *nl = (struct net_local *)dev->priv;
-+ struct plip_local *snd = &nl->snd_data;
-+ unsigned long flags;
-+
-+ if (dev->tbusy)
-+ return 1;
-+
-+ if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) {
-+ printk(KERN_ERR "%s: Transmitter access conflict.\n",
-+ dev->name);
-+ return 1;
-+ }
-+
-+ if (skb->len > dev->mtu + dev->hard_header_len) {
-+ printk(KERN_ERR "%s: packet too big, %d.\n",
-+ dev->name, (int)skb->len);
-+ dev->tbusy = 0;
-+ return 0;
-+ }
-+
-+ if (net_debug > 2)
-+ printk(KERN_DEBUG "%s: send request\n", dev->name);
-+
-+ local_irq_save(flags);
-+ dev->trans_start = jiffies;
-+ snd->skb = skb;
-+ snd->length.h = skb->len;
-+ snd->state = PLIP_PK_TRIGGER;
-+ if (nl->connection == PLIP_CN_NONE) {
-+ nl->connection = PLIP_CN_SEND;
-+ nl->timeout_count = 0;
-+ }
-+ queue_task(&nl->immediate, &tq_immediate);
-+ mark_bh(IMMEDIATE_BH);
-+ local_irq_restore(flags);
-+
-+ return 0;
-+}
-+
-+/* Open/initialize the board. This is called (in the current kernel)
-+ sometime after booting when the 'ifconfig' program is run.
-+
-+ */
-+static int
-+plip_open(struct device *dev)
-+{
-+ struct net_local *nl = (struct net_local *)dev->priv;
-+ struct in_device *in_dev;
-+
-+#if defined(CONFIG_GVPIOEXT_LP) || defined(CONFIG_GVPIOEXT_LP_MODULE)
-+ /* Yes, there is a race condition here. Fix it later */
-+ if (PLIP_DEV(dev)->par_use & IOEXT_PAR_LP) {
-+ /* Can't open if lp is in use */
-+#if DEBUG
-+ printk("par is in use by lp\n");
-+#endif
-+ return(-EBUSY);
-+ }
-+#endif
-+ PLIP_DEV(dev)->par_use |= IOEXT_PAR_PLIP;
-+
-+#if DEBUG
-+ printk("plip_open(): sending 00 to data port\n");
-+#endif
-+
-+ /* Clear the data port. */
-+ z_writeb (0x00, PAR_DATA(dev));
-+
-+#if DEBUG
-+ printk("plip_open(): sent\n");
-+#endif
-+
-+ /* Initialize the state machine. */
-+ nl->rcv_data.state = nl->snd_data.state = PLIP_PK_DONE;
-+ nl->rcv_data.skb = nl->snd_data.skb = NULL;
-+ nl->connection = PLIP_CN_NONE;
-+ nl->is_deferred = 0;
-+
-+ /* Fill in the MAC-level header.
-+ (ab)Use "dev->broadcast" to store point-to-point MAC address.
-+
-+ PLIP doesn't have a real mac address, but we need to create one
-+ to be DOS compatible. */
-+ memset(dev->dev_addr, 0xfc, ETH_ALEN);
-+ memset(dev->broadcast, 0xfc, ETH_ALEN);
-+
-+ if ((in_dev=dev->ip_ptr) != NULL) {
-+ /*
-+ * Any address will do - we take the first
++ int sectors;
++ /* Atari GEMDOS partitions always have 16-bit fat */
++ if (sbi->fat_bits != 32)
++ sbi->fat_bits = 16;
++ /* If more clusters than fat entries in 16-bit fat, we assume
++ * it's a real MSDOS partition with 12-bit fat.
+ */
-+ struct in_ifaddr *ifa=in_dev->ifa_list;
-+ if (ifa != NULL) {
-+ memcpy(dev->dev_addr+2, &ifa->ifa_local, 4);
-+ memcpy(dev->broadcast+2, &ifa->ifa_address, 4);
-+ }
++ if (sbi->fat_bits != 32 && total_clusters+2 > sbi->
++ fat_length*SECTOR_SIZE*8/sbi->fat_bits)
++ sbi->fat_bits = 12;
++ /* if it's a floppy disk --> 12bit fat */
++ if (sbi->fat_bits != 32 && MAJOR(sb->s_dev) == FLOPPY_MAJOR)
++ sbi->fat_bits = 12;
++ /* if it's a ramdisk or loopback device and has one of the usual
++ * floppy sizes -> 12bit FAT */
++ sectors = total_sectors + sbi->data_start;
++ if (sbi->fat_bits != 32 && (MAJOR(sb->s_dev) == RAMDISK_MAJOR ||
++ MAJOR(sb->s_dev) == LOOP_MAJOR) &&
++ (sectors == 720 || sectors == 1440 || sectors == 2880))
++ sbi->fat_bits = 12;
+ }
-+
-+ dev->interrupt = 0;
-+ dev->start = 1;
-+ dev->tbusy = 0;
-+
-+ MOD_INC_USE_COUNT;
-+
-+ /* Enable rx interrupt. */
-+ enable_par_irq(dev, 1);
-+
-+ return 0;
-+}
-+
-+/* The inverse routine to plip_open (). */
-+static int
-+plip_close(struct device *dev)
-+{
-+ struct net_local *nl = (struct net_local *)dev->priv;
-+ struct plip_local *snd = &nl->snd_data;
-+ struct plip_local *rcv = &nl->rcv_data;
-+ unsigned long flags;
-+
-+ dev->tbusy = 1;
-+ dev->start = 0;
-+ local_irq_save(flags);
-+ nl->is_deferred = 0;
-+ nl->connection = PLIP_CN_NONE;
-+ local_irq_restore(flags);
-+ z_writeb(0x00, PAR_DATA(dev));
-+
-+ snd->state = PLIP_PK_DONE;
-+ if (snd->skb) {
-+ dev_kfree_skb(snd->skb);
-+ snd->skb = NULL;
-+ }
-+ rcv->state = PLIP_PK_DONE;
-+ if (rcv->skb) {
-+ kfree_skb(rcv->skb);
-+ rcv->skb = NULL;
-+ }
-+
-+ PLIP_DEV(dev)->par_use &= ~IOEXT_PAR_PLIP;
-+
-+ MOD_DEC_USE_COUNT;
-+ return 0;
-+}
-+
-+static struct enet_statistics *
-+plip_get_stats(struct device *dev)
-+{
-+ struct net_local *nl = (struct net_local *)dev->priv;
-+ struct enet_statistics *r = &nl->enet_stats;
-+
-+ return r;
-+}
-+
-+static int
-+plip_config(struct device *dev, struct ifmap *map)
-+{
-+ if (dev->flags & IFF_UP)
-+ return -EBUSY;
-+
-+ printk(KERN_INFO "%s: This interface is autodetected (ignored).\n",
-+ dev->name);
-+
-+ return 0;
-+}
-+
-+static int
-+plip_ioctl(struct device *dev, struct ifreq *rq, int cmd)
-+{
-+ struct net_local *nl = (struct net_local *) dev->priv;
-+ struct plipconf *pc = (struct plipconf *) &rq->ifr_data;
-+
-+ switch(pc->pcmd) {
-+ case PLIP_GET_TIMEOUT:
-+ pc->trigger = nl->trigger;
-+ pc->nibble = nl->nibble;
-+ break;
-+ case PLIP_SET_TIMEOUT:
-+ nl->trigger = pc->trigger;
-+ nl->nibble = pc->nibble;
-+ break;
-+ default:
-+ return -EOPNOTSUPP;
-+ }
-+ return 0;
-+}
-+
-+/*
-+ * Detect and initialize all IO-Extenders in this system.
-+ *
-+ * Both PLIP and serial devices are configured.
-+ */
-+int plip_init(struct device *dev)
-+{
-+ IOEXT_struct *board;
-+ struct net_local *nl;
-+
-+ if (ioext_num == 0) {
-+ printk(KERN_INFO "%s\n", version);
-+ }
-+
-+ board = PLIP_DEV(dev)->board;
-+ dev->base_addr = (unsigned long)&board->par.DATA;
-+
-+ /* Cheat and use irq to index into our table */
-+ dev->irq = ioext_num;
-+
-+ printk(KERN_INFO "%s: IO-Extender parallel port at 0x%08lX\n", dev->name, dev->base_addr);
-+
-+ /* Fill in the generic fields of the device structure. */
-+ ether_setup(dev);
-+
-+ /* Then, override parts of it */
-+ dev->hard_start_xmit = plip_tx_packet;
-+ dev->open = plip_open;
-+ dev->stop = plip_close;
-+ dev->get_stats = plip_get_stats;
-+ dev->set_config = plip_config;
-+ dev->do_ioctl = plip_ioctl;
-+ dev->tx_queue_len = 10;
-+ dev->flags = IFF_POINTOPOINT|IFF_NOARP;
-+
-+ /* Set the private structure */
-+ dev->priv = kmalloc(sizeof (struct net_local), GFP_KERNEL);
-+ if (dev->priv == NULL) {
-+ printk(KERN_ERR "%s: out of memory\n", dev->name);
-+ return -ENOMEM;
-+ }
-+ memset(dev->priv, 0, sizeof(struct net_local));
-+ nl = (struct net_local *) dev->priv;
-+
-+ nl->orig_rebuild_header = dev->rebuild_header;
-+ dev->rebuild_header = plip_rebuild_header;
-+
-+ /* Initialize constants */
-+ nl->trigger = PLIP_TRIGGER_WAIT;
-+ nl->nibble = PLIP_NIBBLE_WAIT;
-+
-+ /* Initialize task queue structures */
-+ nl->immediate.next = NULL;
-+ nl->immediate.sync = 0;
-+ nl->immediate.routine = (void *)(void *)plip_bh;
-+ nl->immediate.data = dev;
-+
-+ nl->deferred.next = NULL;
-+ nl->deferred.sync = 0;
-+ nl->deferred.routine = (void *)(void *)plip_kick_bh;
-+ nl->deferred.data = dev;
-+
-+ /* Don't enable interrupts yet */
-+
-+ return 0;
-+}
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/ide/ide-iops.c linux-2.6.13/drivers/ide/ide-iops.c
---- linux-2.6.13-i386/drivers/ide/ide-iops.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/ide/ide-iops.c 2005-08-30 16:32:55.000000000 +0200
-@@ -341,6 +341,23 @@
- int i;
- u16 *stringcast;
-+#ifdef __mc68000__
-+ if (!MACH_IS_AMIGA && !MACH_IS_MAC && !MACH_IS_Q40 && !MACH_IS_ATARI)
-+ return;
-+
-+#ifdef M68K_IDE_SWAPW
-+ if (M68K_IDE_SWAPW) { /* fix bus byteorder first */
-+ u_char *p = (u_char *)id;
-+ u_char t;
-+ for (i = 0; i < 512; i += 2) {
-+ t = p[i];
-+ p[i] = p[i+1];
-+ p[i+1] = t;
-+ }
-+ }
-+#endif
-+#endif /* __mc68000__ */
-+
- id->config = __le16_to_cpu(id->config);
- id->cyls = __le16_to_cpu(id->cyls);
- id->reserved2 = __le16_to_cpu(id->reserved2);
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/ide/legacy/gayle.c linux-2.6.13/drivers/ide/legacy/gayle.c
---- linux-2.6.13-i386/drivers/ide/legacy/gayle.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/ide/legacy/gayle.c 2005-09-02 16:32:11.000000000 +0200
-@@ -161,6 +161,7 @@
- base = (unsigned long)ZTWO_VADDR(phys_base);
- ctrlport = GAYLE_HAS_CONTROL_REG ? (base + GAYLE_CONTROL) : 0;
+ /* check that FAT table does not overflow */
+ fat_clusters = sbi->fat_length * sb->s_blocksize * 8 / sbi->fat_bits;
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/net/7990.c linux-2.6.13/drivers/net/7990.c
+--- linux-2.6.13-i386/drivers/net/7990.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/net/7990.c 2005-10-12 16:32:42.000000000 +0200
+@@ -500,7 +500,7 @@
+ int res;
+
+ /* Install the Interrupt handler. Or we could shunt this out to specific drivers? */
+- if (request_irq(lp->irq, lance_interrupt, 0, lp->name, dev))
++ if (request_irq(lp->irq, lance_interrupt, SA_SHIRQ, lp->name, dev))
+ return -EAGAIN;
-+ memset(&hw, 0, sizeof(hw));
- ide_setup_ports(&hw, base, gayle_offsets,
- ctrlport, irqport, ack_intr,
- // &gayle_iops,
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/input/keyboard/Kconfig linux-2.6.13/drivers/input/keyboard/Kconfig
---- linux-2.6.13-i386/drivers/input/keyboard/Kconfig 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/input/keyboard/Kconfig 2005-08-30 16:33:05.000000000 +0200
-@@ -154,7 +154,7 @@
-
- config KEYBOARD_HIL_OLD
- tristate "HP HIL keyboard support (simple driver)"
-- depends on GSC
-+ depends on GSC || HP300
- default y
- help
- The "Human Interface Loop" is a older, 8-channel USB-like
-@@ -171,7 +171,7 @@
-
- config KEYBOARD_HIL
- tristate "HP HIL keyboard support"
-- depends on GSC
-+ depends on GSC || HP300
- default y
- select HP_SDC
- select HIL_MLC
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/input/misc/Kconfig linux-2.6.13/drivers/input/misc/Kconfig
---- linux-2.6.13-i386/drivers/input/misc/Kconfig 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/input/misc/Kconfig 2005-08-30 16:33:05.000000000 +0200
-@@ -51,7 +51,7 @@
-
- config HP_SDC_RTC
- tristate "HP SDC Real Time Clock"
-- depends on GSC
-+ depends on GSC || HP300
- select HP_SDC
- help
- Say Y here if you want to support the built-in real time clock
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/input/mouse/Kconfig linux-2.6.13/drivers/input/mouse/Kconfig
---- linux-2.6.13-i386/drivers/input/mouse/Kconfig 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/input/mouse/Kconfig 2005-08-30 16:33:05.000000000 +0200
-@@ -129,7 +129,7 @@
-
- config MOUSE_HIL
- tristate "HIL pointers (mice etc)."
-- depends on GSC
-+ depends on GSC || HP300
- select HP_SDC
- select HIL_MLC
- help
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/input/serio/Kconfig linux-2.6.13/drivers/input/serio/Kconfig
---- linux-2.6.13-i386/drivers/input/serio/Kconfig 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/input/serio/Kconfig 2005-08-30 16:33:05.000000000 +0200
-@@ -112,7 +112,7 @@
-
- config HP_SDC
- tristate "HP System Device Controller i8042 Support"
-- depends on GSC && SERIO
-+ depends on (GSC || HP300) && SERIO
- default y
- ---help---
- This option enables supports for the the "System Device
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/macintosh/adb.c linux-2.6.13/drivers/macintosh/adb.c
---- linux-2.6.13-i386/drivers/macintosh/adb.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/macintosh/adb.c 2005-08-30 16:33:07.000000000 +0200
-@@ -476,13 +476,15 @@
- use_sreq = 1;
- } else
- use_sreq = 0;
-- req->nbytes = nbytes+1;
-+ i = (flags & ADBREQ_RAW) ? 0 : 1;
-+ req->nbytes = nbytes+i;
- req->done = done;
- req->reply_expected = flags & ADBREQ_REPLY;
- req->data[0] = ADB_PACKET;
- va_start(list, nbytes);
-- for (i = 0; i < nbytes; ++i)
-- req->data[i+1] = va_arg(list, int);
-+ while (i < req->nbytes) {
-+ req->data[i++] = va_arg(list, int);
-+ }
- va_end(list);
-
- if (flags & ADBREQ_NOSEND)
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/net/Kconfig linux-2.6.13/drivers/net/Kconfig
---- linux-2.6.13-i386/drivers/net/Kconfig 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/net/Kconfig 2005-08-30 16:33:24.000000000 +0200
-@@ -294,7 +294,7 @@
-
- config MAC89x0
- tristate "Macintosh CS89x0 based ethernet cards"
-- depends on NET_ETHERNET && MAC && BROKEN
-+ depends on NET_ETHERNET && MAC
- ---help---
- Support for CS89x0 chipset based Ethernet cards. If you have a
- Nubus or LC-PDS network (Ethernet) card of this type, say Y and
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/net/mac89x0.c linux-2.6.13/drivers/net/mac89x0.c
---- linux-2.6.13-i386/drivers/net/mac89x0.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/net/mac89x0.c 2004-12-30 16:38:24.000000000 +0100
-@@ -128,7 +128,7 @@
- extern void reset_chip(struct net_device *dev);
- #endif
- static int net_open(struct net_device *dev);
--static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
-+static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
- static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs *regs);
- static void set_multicast_list(struct net_device *dev);
- static void net_rx(struct net_device *dev);
-@@ -374,56 +374,37 @@
- static int
- net_send_packet(struct sk_buff *skb, struct net_device *dev)
- {
-- if (dev->tbusy) {
-- /* If we get here, some higher level has decided we are broken.
-- There should really be a "kick me" function call instead. */
-- int tickssofar = jiffies - dev->trans_start;
-- if (tickssofar < 5)
-- return 1;
-- if (net_debug > 0) printk("%s: transmit timed out, %s?\n", dev->name,
-- tx_done(dev) ? "IRQ conflict" : "network cable problem");
-- /* Try to restart the adaptor. */
-- dev->tbusy=0;
-- dev->trans_start = jiffies;
-- }
--
-- /* Block a timer-based transmit from overlapping. This could better be
-- done with atomic_swap(1, dev->tbusy), but set_bit() works as well. */
-- if (test_and_set_bit(0, (void*)&dev->tbusy) != 0)
-- printk("%s: Transmitter access conflict.\n", dev->name);
-- else {
-- struct net_local *lp = netdev_priv(dev);
-- unsigned long flags;
--
-- if (net_debug > 3)
-- printk("%s: sent %d byte packet of type %x\n",
-- dev->name, skb->len,
-- (skb->data[ETH_ALEN+ETH_ALEN] << 8)
-- | skb->data[ETH_ALEN+ETH_ALEN+1]);
--
-- /* keep the upload from being interrupted, since we
-- ask the chip to start transmitting before the
-- whole packet has been completely uploaded. */
-- local_irq_save(flags);
--
-- /* initiate a transmit sequence */
-- writereg(dev, PP_TxCMD, lp->send_cmd);
-- writereg(dev, PP_TxLength, skb->len);
--
-- /* Test to see if the chip has allocated memory for the packet */
-- if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) {
-- /* Gasp! It hasn't. But that shouldn't happen since
-- we're waiting for TxOk, so return 1 and requeue this packet. */
-- local_irq_restore(flags);
-- return 1;
-- }
-+ struct net_local *lp = netdev_priv(dev);
-+ unsigned long flags;
-
-- /* Write the contents of the packet */
-- memcpy_toio(dev->mem_start + PP_TxFrame, skb->data, skb->len+1);
-+ if (net_debug > 3)
-+ printk("%s: sent %d byte packet of type %x\n",
-+ dev->name, skb->len,
-+ (skb->data[ETH_ALEN+ETH_ALEN] << 8)
-+ | skb->data[ETH_ALEN+ETH_ALEN+1]);
-+
-+ /* keep the upload from being interrupted, since we
-+ ask the chip to start transmitting before the
-+ whole packet has been completely uploaded. */
-+ local_irq_save(flags);
-
-+ /* initiate a transmit sequence */
-+ writereg(dev, PP_TxCMD, lp->send_cmd);
-+ writereg(dev, PP_TxLength, skb->len);
-+
-+ /* Test to see if the chip has allocated memory for the packet */
-+ if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) {
-+ /* Gasp! It hasn't. But that shouldn't happen since
-+ we're waiting for TxOk, so return 1 and requeue this packet. */
- local_irq_restore(flags);
-- dev->trans_start = jiffies;
-+ return 1;
- }
-+
-+ /* Write the contents of the packet */
-+ memcpy((void *)(dev->mem_start + PP_TxFrame), skb->data, skb->len+1);
-+
-+ local_irq_restore(flags);
-+ dev->trans_start = jiffies;
- dev_kfree_skb (skb);
-
- return 0;
-@@ -441,9 +422,6 @@
- printk ("net_interrupt(): irq %d for unknown device.\n", irq);
- return IRQ_NONE;
- }
-- if (dev->interrupt)
-- printk("%s: Re-entering the interrupt handler.\n", dev->name);
-- dev->interrupt = 1;
-
- ioaddr = dev->base_addr;
- lp = netdev_priv(dev);
-@@ -464,8 +442,7 @@
- break;
- case ISQ_TRANSMITTER_EVENT:
- lp->stats.tx_packets++;
-- dev->tbusy = 0;
-- mark_bh(NET_BH); /* Inform upper layers. */
-+ netif_wake_queue(dev);
- if ((status & TX_OK) == 0) lp->stats.tx_errors++;
- if (status & TX_LOST_CRS) lp->stats.tx_carrier_errors++;
- if (status & TX_SQE_ERROR) lp->stats.tx_heartbeat_errors++;
-@@ -479,8 +456,7 @@
- That shouldn't happen since we only ever
- load one packet. Shrug. Do the right
- thing anyway. */
-- dev->tbusy = 0;
-- mark_bh(NET_BH); /* Inform upper layers. */
-+ netif_wake_queue(dev);
- }
- if (status & TX_UNDERRUN) {
- if (net_debug > 0) printk("%s: transmit underrun\n", dev->name);
-@@ -497,7 +473,6 @@
- break;
- }
- }
-- dev->interrupt = 0;
- return IRQ_HANDLED;
- }
-
-@@ -532,7 +507,7 @@
- skb_put(skb, length);
- skb->dev = dev;
-
-- memcpy_fromio(skb->data, dev->mem_start + PP_RxFrame, length);
-+ memcpy(skb->data, (void *)(dev->mem_start + PP_RxFrame), length);
-
- if (net_debug > 3)printk("%s: received %d byte packet of type %x\n",
- dev->name, length,
-@@ -611,8 +586,6 @@
- static int set_mac_address(struct net_device *dev, void *addr)
- {
- int i;
-- if (dev->start)
-- return -EBUSY;
- printk("%s: Setting MAC address to ", dev->name);
- for (i = 0; i < 6; i++)
- printk(" %2.2x", dev->dev_addr[i] = ((unsigned char *)addr)[i]);
+ res = lance_reset(dev);
diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/53c7xx.c linux-2.6.13/drivers/scsi/53c7xx.c
--- linux-2.6.13-i386/drivers/scsi/53c7xx.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13/drivers/scsi/53c7xx.c 2005-06-19 16:34:18.000000000 +0200
@@ -4590,36 +1474,6 @@
#endif /* NCR53c710_C */
#endif /* NCR53c710_H */
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/Kconfig linux-2.6.13/drivers/scsi/Kconfig
---- linux-2.6.13-i386/drivers/scsi/Kconfig 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/scsi/Kconfig 2005-08-30 16:33:54.000000000 +0200
-@@ -1627,7 +1627,7 @@
-
- config SCSI_AMIGA7XX
- bool "Amiga NCR53c710 SCSI support (EXPERIMENTAL)"
-- depends on AMIGA && SCSI && EXPERIMENTAL && BROKEN
-+ depends on AMIGA && SCSI && EXPERIMENTAL
- help
- Support for various NCR53c710-based SCSI controllers on the Amiga.
- This includes:
-@@ -1724,7 +1724,7 @@
-
- config MVME16x_SCSI
- bool "NCR53C710 SCSI driver for MVME16x"
-- depends on MVME16x && SCSI && BROKEN
-+ depends on MVME16x && SCSI
- help
- The Motorola MVME162, 166, 167, 172 and 177 boards use the NCR53C710
- SCSI controller chip. Almost everyone using one of these boards
-@@ -1732,7 +1732,7 @@
-
- config BVME6000_SCSI
- bool "NCR53C710 SCSI driver for BVME6000"
-- depends on BVME6000 && SCSI && BROKEN
-+ depends on BVME6000 && SCSI
- help
- The BVME4000 and BVME6000 boards from BVM Ltd use the NCR53C710
- SCSI controller chip. Almost everyone using one of these boards
diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/NCR5380.c linux-2.6.13/drivers/scsi/NCR5380.c
--- linux-2.6.13-i386/drivers/scsi/NCR5380.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13/drivers/scsi/NCR5380.c 2005-08-30 16:33:54.000000000 +0200
@@ -4639,981 +1493,6 @@
static struct {
unsigned char mask;
const char *name;
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/amiga7xx.c linux-2.6.13/drivers/scsi/amiga7xx.c
---- linux-2.6.13-i386/drivers/scsi/amiga7xx.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/scsi/amiga7xx.c 2004-10-30 16:35:43.000000000 +0200
-@@ -27,8 +27,14 @@
- #include "scsi.h"
- #include <scsi/scsi_host.h>
- #include "53c7xx.h"
--#include "amiga7xx.h"
-
-+#ifndef CMD_PER_LUN
-+#define CMD_PER_LUN 3
-+#endif
-+
-+#ifndef CAN_QUEUE
-+#define CAN_QUEUE 24
-+#endif
-
- static int amiga7xx_register_one(Scsi_Host_Template *tpnt,
- unsigned long address)
-@@ -115,8 +121,10 @@
- {
- if (shost->irq)
- free_irq(shost->irq, NULL);
-+#ifdef CONFIG_ISA
- if (shost->dma_channel != 0xff)
- free_dma(shost->dma_channel);
-+#endif
- if (shost->io_port && shost->n_io_port)
- release_region(shost->io_port, shost->n_io_port);
- scsi_unregister(shost);
-@@ -128,8 +136,9 @@
- .detect = amiga7xx_detect,
- .release = amiga7xx_release,
- .queuecommand = NCR53c7xx_queue_command,
-- .abort = NCR53c7xx_abort,
-- .reset = NCR53c7xx_reset,
-+ .eh_abort_handler = NCR53c7xx_abort,
-+ .eh_bus_reset_handler = NCR53c7xx_reset,
-+ .slave_configure = NCR53c7xx_slave_configure,
- .can_queue = 24,
- .this_id = 7,
- .sg_tablesize = 63,
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/amiga7xx.h linux-2.6.13/drivers/scsi/amiga7xx.h
---- linux-2.6.13-i386/drivers/scsi/amiga7xx.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/scsi/amiga7xx.h 1970-01-01 01:00:00.000000000 +0100
-@@ -1,23 +0,0 @@
--#ifndef AMIGA7XX_H
--
--#include <linux/types.h>
--
--int amiga7xx_detect(Scsi_Host_Template *);
--const char *NCR53c7x0_info(void);
--int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
--int NCR53c7xx_abort(Scsi_Cmnd *);
--int NCR53c7x0_release (struct Scsi_Host *);
--int NCR53c7xx_reset(Scsi_Cmnd *, unsigned int);
--void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs);
--
--#ifndef CMD_PER_LUN
--#define CMD_PER_LUN 3
--#endif
--
--#ifndef CAN_QUEUE
--#define CAN_QUEUE 24
--#endif
--
--#include <scsi/scsicam.h>
--
--#endif /* AMIGA7XX_H */
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/bvme6000.c linux-2.6.13/drivers/scsi/bvme6000.c
---- linux-2.6.13-i386/drivers/scsi/bvme6000.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/scsi/bvme6000.c 2004-10-30 16:35:43.000000000 +0200
-@@ -19,10 +19,16 @@
- #include "scsi.h"
- #include <scsi/scsi_host.h>
- #include "53c7xx.h"
--#include "bvme6000.h"
-
- #include<linux/stat.h>
-
-+#ifndef CMD_PER_LUN
-+#define CMD_PER_LUN 3
-+#endif
-+
-+#ifndef CAN_QUEUE
-+#define CAN_QUEUE 24
-+#endif
-
- int bvme6000_scsi_detect(Scsi_Host_Template *tpnt)
- {
-@@ -52,8 +58,10 @@
- {
- if (shost->irq)
- free_irq(shost->irq, NULL);
-+#ifdef CONFIG_ISA
- if (shost->dma_channel != 0xff)
- free_dma(shost->dma_channel);
-+#endif
- if (shost->io_port && shost->n_io_port)
- release_region(shost->io_port, shost->n_io_port);
- scsi_unregister(shost);
-@@ -65,8 +73,9 @@
- .detect = bvme6000_scsi_detect,
- .release = bvme6000_scsi_release,
- .queuecommand = NCR53c7xx_queue_command,
-- .abort = NCR53c7xx_abort,
-- .reset = NCR53c7xx_reset,
-+ .eh_abort_handler = NCR53c7xx_abort,
-+ .eh_bus_reset_handler = NCR53c7xx_reset,
-+ .slave_configure = NCR53c7xx_slave_configure,
- .can_queue = 24,
- .this_id = 7,
- .sg_tablesize = 63,
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/bvme6000.h linux-2.6.13/drivers/scsi/bvme6000.h
---- linux-2.6.13-i386/drivers/scsi/bvme6000.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/scsi/bvme6000.h 1970-01-01 01:00:00.000000000 +0100
-@@ -1,24 +0,0 @@
--#ifndef BVME6000_SCSI_H
--#define BVME6000_SCSI_H
--
--#include <linux/types.h>
--
--int bvme6000_scsi_detect(Scsi_Host_Template *);
--const char *NCR53c7x0_info(void);
--int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
--int NCR53c7xx_abort(Scsi_Cmnd *);
--int NCR53c7x0_release (struct Scsi_Host *);
--int NCR53c7xx_reset(Scsi_Cmnd *, unsigned int);
--void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs);
--
--#ifndef CMD_PER_LUN
--#define CMD_PER_LUN 3
--#endif
--
--#ifndef CAN_QUEUE
--#define CAN_QUEUE 24
--#endif
--
--#include <scsi/scsicam.h>
--
--#endif /* BVME6000_SCSI_H */
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/mvme16x.c linux-2.6.13/drivers/scsi/mvme16x.c
---- linux-2.6.13-i386/drivers/scsi/mvme16x.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/scsi/mvme16x.c 2004-10-30 16:35:43.000000000 +0200
-@@ -17,10 +17,16 @@
- #include "scsi.h"
- #include <scsi/scsi_host.h>
- #include "53c7xx.h"
--#include "mvme16x.h"
-
- #include<linux/stat.h>
-
-+#ifndef CMD_PER_LUN
-+#define CMD_PER_LUN 3
-+#endif
-+
-+#ifndef CAN_QUEUE
-+#define CAN_QUEUE 24
-+#endif
-
- int mvme16x_scsi_detect(Scsi_Host_Template *tpnt)
- {
-@@ -54,8 +60,10 @@
- {
- if (shost->irq)
- free_irq(shost->irq, NULL);
-+#ifdef CONFIG_ISA
- if (shost->dma_channel != 0xff)
- free_dma(shost->dma_channel);
-+#endif
- if (shost->io_port && shost->n_io_port)
- release_region(shost->io_port, shost->n_io_port);
- scsi_unregister(shost);
-@@ -67,8 +75,9 @@
- .detect = mvme16x_scsi_detect,
- .release = mvme16x_scsi_release,
- .queuecommand = NCR53c7xx_queue_command,
-- .abort = NCR53c7xx_abort,
-- .reset = NCR53c7xx_reset,
-+ .eh_abort_handler = NCR53c7xx_abort,
-+ .eh_bus_reset_handler = NCR53c7xx_reset,
-+ .slave_configure = NCR53c7xx_slave_configure,
- .can_queue = 24,
- .this_id = 7,
- .sg_tablesize = 63,
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/mvme16x.h linux-2.6.13/drivers/scsi/mvme16x.h
---- linux-2.6.13-i386/drivers/scsi/mvme16x.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/scsi/mvme16x.h 1970-01-01 01:00:00.000000000 +0100
-@@ -1,24 +0,0 @@
--#ifndef MVME16x_SCSI_H
--#define MVME16x_SCSI_H
--
--#include <linux/types.h>
--
--int mvme16x_scsi_detect(Scsi_Host_Template *);
--const char *NCR53c7x0_info(void);
--int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
--int NCR53c7xx_abort(Scsi_Cmnd *);
--int NCR53c7x0_release (struct Scsi_Host *);
--int NCR53c7xx_reset(Scsi_Cmnd *, unsigned int);
--void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs);
--
--#ifndef CMD_PER_LUN
--#define CMD_PER_LUN 3
--#endif
--
--#ifndef CAN_QUEUE
--#define CAN_QUEUE 24
--#endif
--
--#include <scsi/scsicam.h>
--
--#endif /* MVME16x_SCSI_H */
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/fs/fat/inode.c linux-2.6.13/fs/fat/inode.c
---- linux-2.6.13-i386/fs/fat/inode.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/fs/fat/inode.c 2005-08-30 16:35:05.000000000 +0200
-@@ -11,12 +11,14 @@
- */
-
- #include <linux/module.h>
-+#include <linux/config.h>
- #include <linux/init.h>
- #include <linux/time.h>
- #include <linux/slab.h>
- #include <linux/smp_lock.h>
- #include <linux/seq_file.h>
- #include <linux/msdos_fs.h>
-+#include <linux/major.h>
- #include <linux/pagemap.h>
- #include <linux/buffer_head.h>
- #include <linux/mount.h>
-@@ -751,7 +753,7 @@
- Opt_check_n, Opt_check_r, Opt_check_s, Opt_uid, Opt_gid,
- Opt_umask, Opt_dmask, Opt_fmask, Opt_codepage, Opt_nocase,
- Opt_quiet, Opt_showexec, Opt_debug, Opt_immutable,
-- Opt_dots, Opt_nodots,
-+ Opt_dots, Opt_nodots, Opt_atari_no, Opt_atari_yes,
- Opt_charset, Opt_shortname_lower, Opt_shortname_win95,
- Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,
- Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,
-@@ -776,6 +778,9 @@
- {Opt_showexec, "showexec"},
- {Opt_debug, "debug"},
- {Opt_immutable, "sys_immutable"},
-+ {Opt_atari_yes, "atari=yes"},
-+ {Opt_atari_yes, "atari"},
-+ {Opt_atari_no, "atari=no"},
- {Opt_obsolate, "conv=binary"},
- {Opt_obsolate, "conv=text"},
- {Opt_obsolate, "conv=auto"},
-@@ -850,6 +855,13 @@
- opts->utf8 = opts->unicode_xlate = 0;
- opts->numtail = 1;
- opts->nocase = 0;
-+ opts->atari = 0;
-+
-+#ifdef CONFIG_ATARI
-+ if(MACH_IS_ATARI)
-+ /* make Atari GEMDOS format the default if machine is an Atari */
-+ opts->atari = 1;
-+#endif
- *debug = 0;
-
- if (!options)
-@@ -898,6 +910,12 @@
- case Opt_immutable:
- opts->sys_immutable = 1;
- break;
-+ case Opt_atari_yes:
-+ opts->atari = 1;
-+ break;
-+ case Opt_atari_no:
-+ opts->atari = 0;
-+ break;
- case Opt_uid:
- if (match_int(&args[0], &option))
- return 0;
-@@ -1230,8 +1248,31 @@
-
- total_clusters = (total_sectors - sbi->data_start) / sbi->sec_per_clus;
-
-- if (sbi->fat_bits != 32)
-- sbi->fat_bits = (total_clusters > MAX_FAT12) ? 16 : 12;
-+ if (!sbi->options.atari) {
-+ if (sbi->fat_bits != 32)
-+ sbi->fat_bits = (total_clusters > MAX_FAT12) ? 16 : 12;
-+ } else {
-+ int sectors;
-+ /* Atari GEMDOS partitions always have 16-bit fat */
-+ if (sbi->fat_bits != 32)
-+ sbi->fat_bits = 16;
-+ /* If more clusters than fat entries in 16-bit fat, we assume
-+ * it's a real MSDOS partition with 12-bit fat.
-+ */
-+ if (sbi->fat_bits != 32 && total_clusters+2 > sbi->
-+ fat_length*SECTOR_SIZE*8/sbi->fat_bits)
-+ sbi->fat_bits = 12;
-+ /* if it's a floppy disk --> 12bit fat */
-+ if (sbi->fat_bits != 32 && MAJOR(sb->s_dev) == FLOPPY_MAJOR)
-+ sbi->fat_bits = 12;
-+ /* if it's a ramdisk or loopback device and has one of the usual
-+ * floppy sizes -> 12bit FAT */
-+ sectors = total_sectors + sbi->data_start;
-+ if (sbi->fat_bits != 32 && (MAJOR(sb->s_dev) == RAMDISK_MAJOR ||
-+ MAJOR(sb->s_dev) == LOOP_MAJOR) &&
-+ (sectors == 720 || sectors == 1440 || sectors == 2880))
-+ sbi->fat_bits = 12;
-+ }
-
- /* check that FAT table does not overflow */
- fat_clusters = sbi->fat_length * sb->s_blocksize * 8 / sbi->fat_bits;
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/cacheflush.h linux-2.6.13/include/asm-m68k/cacheflush.h
---- linux-2.6.13-i386/include/asm-m68k/cacheflush.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/include/asm-m68k/cacheflush.h 2005-08-30 16:36:03.000000000 +0200
-@@ -130,20 +130,25 @@
- #define flush_dcache_mmap_lock(mapping) do { } while (0)
- #define flush_dcache_mmap_unlock(mapping) do { } while (0)
- #define flush_icache_page(vma, page) __flush_page_to_ram(page_address(page))
--#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
--
--#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-- do { \
-- flush_cache_page(vma, vaddr, page_to_pfn(page));\
-- memcpy(dst, src, len); \
-- } while (0)
--
--#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-- do { \
-- flush_cache_page(vma, vaddr, page_to_pfn(page));\
-- memcpy(dst, src, len); \
-- } while (0)
-
-+extern void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-+ unsigned long addr, int len);
- extern void flush_icache_range(unsigned long address, unsigned long endaddr);
-
-+static inline void copy_to_user_page(struct vm_area_struct *vma,
-+ struct page *page, unsigned long vaddr,
-+ void *dst, void *src, int len)
-+{
-+ flush_cache_page(vma, vaddr, page_to_pfn(page));
-+ memcpy(dst, src, len);
-+ flush_icache_user_range(vma, page, vaddr, len);
-+}
-+static inline void copy_from_user_page(struct vm_area_struct *vma,
-+ struct page *page, unsigned long vaddr,
-+ void *dst, void *src, int len)
-+{
-+ flush_cache_page(vma, vaddr, page_to_pfn(page));
-+ memcpy(dst, src, len);
-+}
-+
- #endif /* _M68K_CACHEFLUSH_H */
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/io.h linux-2.6.13/include/asm-m68k/io.h
---- linux-2.6.13-i386/include/asm-m68k/io.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/include/asm-m68k/io.h 2005-06-19 16:35:42.000000000 +0200
-@@ -324,8 +324,6 @@
- #define writel(val,addr) out_le32((addr),(val))
- #endif
-
--#define mmiowb()
--
- static inline void *ioremap(unsigned long physaddr, unsigned long size)
- {
- return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/processor.h linux-2.6.13/include/asm-m68k/processor.h
---- linux-2.6.13-i386/include/asm-m68k/processor.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/include/asm-m68k/processor.h 2005-05-30 16:33:26.000000000 +0200
-@@ -14,6 +14,7 @@
- #define current_text_addr() ({ __label__ _l; _l: &&_l;})
-
- #include <linux/config.h>
-+#include <linux/thread_info.h>
- #include <asm/segment.h>
- #include <asm/fpu.h>
- #include <asm/ptrace.h>
-@@ -55,17 +56,6 @@
- #endif
- #define TASK_UNMAPPED_ALIGN(addr, off) PAGE_ALIGN(addr)
-
--struct task_work {
-- unsigned char sigpending;
-- unsigned char notify_resume; /* request for notification on
-- userspace execution resumption */
-- char need_resched;
-- unsigned char delayed_trace; /* single step a syscall */
-- unsigned char syscall_trace; /* count of syscall interceptors */
-- unsigned char memdie; /* task was selected to be killed */
-- unsigned char pad[2];
--};
--
- struct thread_struct {
- unsigned long ksp; /* kernel stack pointer */
- unsigned long usp; /* user stack pointer */
-@@ -78,7 +68,7 @@
- unsigned long fp[8*3];
- unsigned long fpcntl[3]; /* fp control regs */
- unsigned char fpstate[FPSTATESIZE]; /* floating point state */
-- struct task_work work;
-+ struct thread_info info;
- };
-
- #define INIT_THREAD { \
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/serial.h linux-2.6.13/include/asm-m68k/serial.h
---- linux-2.6.13-i386/include/asm-m68k/serial.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/include/asm-m68k/serial.h 2005-08-30 16:36:03.000000000 +0200
-@@ -26,9 +26,11 @@
- #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
- #endif
-
-+#ifdef CONFIG_ISA
- #define SERIAL_PORT_DFNS \
- /* UART CLK PORT IRQ FLAGS */ \
- { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
- { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
- { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
- { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
-+#endif
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/string.h linux-2.6.13/include/asm-m68k/string.h
---- linux-2.6.13-i386/include/asm-m68k/string.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/include/asm-m68k/string.h 2005-08-30 16:36:03.000000000 +0200
-@@ -80,43 +80,6 @@
- return( (char *) s);
- }
-
--#if 0
--#define __HAVE_ARCH_STRPBRK
--static inline char *strpbrk(const char *cs,const char *ct)
--{
-- const char *sc1,*sc2;
--
-- for( sc1 = cs; *sc1 != '\0'; ++sc1)
-- for( sc2 = ct; *sc2 != '\0'; ++sc2)
-- if (*sc1 == *sc2)
-- return((char *) sc1);
-- return( NULL );
--}
--#endif
--
--#if 0
--#define __HAVE_ARCH_STRSPN
--static inline size_t strspn(const char *s, const char *accept)
--{
-- const char *p;
-- const char *a;
-- size_t count = 0;
--
-- for (p = s; *p != '\0'; ++p)
-- {
-- for (a = accept; *a != '\0'; ++a)
-- if (*p == *a)
-- break;
-- if (*a == '\0')
-- return count;
-- else
-- ++count;
-- }
--
-- return count;
--}
--#endif
--
- /* strstr !! */
-
- #define __HAVE_ARCH_STRLEN
-@@ -173,370 +136,18 @@
- }
-
- #define __HAVE_ARCH_MEMSET
--/*
-- * This is really ugly, but its highly optimizatiable by the
-- * compiler and is meant as compensation for gcc's missing
-- * __builtin_memset(). For the 680[23]0 it might be worth considering
-- * the optimal number of misaligned writes compared to the number of
-- * tests'n'branches needed to align the destination address. The
-- * 680[46]0 doesn't really care due to their copy-back caches.
-- * 10/09/96 - Jes Sorensen
-- */
--static inline void * __memset_g(void * s, int c, size_t count)
--{
-- void *xs = s;
-- size_t temp;
--
-- if (!count)
-- return xs;
--
-- c &= 0xff;
-- c |= c << 8;
-- c |= c << 16;
--
-- if (count < 36){
-- long *ls = s;
--
-- switch(count){
-- case 32: case 33: case 34: case 35:
-- *ls++ = c;
-- case 28: case 29: case 30: case 31:
-- *ls++ = c;
-- case 24: case 25: case 26: case 27:
-- *ls++ = c;
-- case 20: case 21: case 22: case 23:
-- *ls++ = c;
-- case 16: case 17: case 18: case 19:
-- *ls++ = c;
-- case 12: case 13: case 14: case 15:
-- *ls++ = c;
-- case 8: case 9: case 10: case 11:
-- *ls++ = c;
-- case 4: case 5: case 6: case 7:
-- *ls++ = c;
-- break;
-- default:
-- break;
-- }
-- s = ls;
-- if (count & 0x02){
-- short *ss = s;
-- *ss++ = c;
-- s = ss;
-- }
-- if (count & 0x01){
-- char *cs = s;
-- *cs++ = c;
-- s = cs;
-- }
-- return xs;
-- }
--
-- if ((long) s & 1)
-- {
-- char *cs = s;
-- *cs++ = c;
-- s = cs;
-- count--;
-- }
-- if (count > 2 && (long) s & 2)
-- {
-- short *ss = s;
-- *ss++ = c;
-- s = ss;
-- count -= 2;
-- }
-- temp = count >> 2;
-- if (temp)
-- {
-- long *ls = s;
-- temp--;
-- do
-- *ls++ = c;
-- while (temp--);
-- s = ls;
-- }
-- if (count & 2)
-- {
-- short *ss = s;
-- *ss++ = c;
-- s = ss;
-- }
-- if (count & 1)
-- {
-- char *cs = s;
-- *cs = c;
-- }
-- return xs;
--}
--
--/*
-- * __memset_page assumes that data is longword aligned. Most, if not
-- * all, of these page sized memsets are performed on page aligned
-- * areas, thus we do not need to check if the destination is longword
-- * aligned. Of course we suffer a serious performance loss if this is
-- * not the case but I think the risk of this ever happening is
-- * extremely small. We spend a lot of time clearing pages in
-- * get_empty_page() so I think it is worth it anyway. Besides, the
-- * 680[46]0 do not really care about misaligned writes due to their
-- * copy-back cache.
-- *
-- * The optimized case for the 680[46]0 is implemented using the move16
-- * instruction. My tests showed that this implementation is 35-45%
-- * faster than the original implementation using movel, the only
-- * caveat is that the destination address must be 16-byte aligned.
-- * 01/09/96 - Jes Sorensen
-- */
--static inline void * __memset_page(void * s,int c,size_t count)
--{
-- unsigned long data, tmp;
-- void *xs = s;
--
-- c = c & 255;
-- data = c | (c << 8);
-- data |= data << 16;
--
--#ifdef CPU_M68040_OR_M68060_ONLY
--
-- if (((unsigned long) s) & 0x0f)
-- __memset_g(s, c, count);
-- else{
-- unsigned long *sp = s;
-- *sp++ = data;
-- *sp++ = data;
-- *sp++ = data;
-- *sp++ = data;
--
-- __asm__ __volatile__("1:\t"
-- ".chip 68040\n\t"
-- "move16 %2 at +,%0 at +\n\t"
-- ".chip 68k\n\t"
-- "subqw #8,%2\n\t"
-- "subqw #8,%2\n\t"
-- "dbra %1,1b\n\t"
-- : "=a" (sp), "=d" (tmp)
-- : "a" (s), "0" (sp), "1" ((count - 16) / 16 - 1)
-- );
-- }
--
--#else
-- __asm__ __volatile__("1:\t"
-- "movel %2,%0 at +\n\t"
-- "movel %2,%0 at +\n\t"
-- "movel %2,%0 at +\n\t"
-- "movel %2,%0 at +\n\t"
-- "movel %2,%0 at +\n\t"
-- "movel %2,%0 at +\n\t"
-- "movel %2,%0 at +\n\t"
-- "movel %2,%0 at +\n\t"
-- "dbra %1,1b\n\t"
-- : "=a" (s), "=d" (tmp)
-- : "d" (data), "0" (s), "1" (count / 32 - 1)
-- );
--#endif
--
-- return xs;
--}
--
--extern void *memset(void *,int,__kernel_size_t);
--
--#define __memset_const(s,c,count) \
--((count==PAGE_SIZE) ? \
-- __memset_page((s),(c),(count)) : \
-- __memset_g((s),(c),(count)))
--
--#define memset(s, c, count) \
--(__builtin_constant_p(count) ? \
-- __memset_const((s),(c),(count)) : \
-- __memset_g((s),(c),(count)))
-+extern void *memset(void *, int, __kernel_size_t);
-+#define memset(d, c, n) __builtin_memset(d, c, n)
-
- #define __HAVE_ARCH_MEMCPY
--extern void * memcpy(void *, const void *, size_t );
--/*
-- * __builtin_memcpy() does not handle page-sized memcpys very well,
-- * thus following the same assumptions as for page-sized memsets, this
-- * function copies page-sized areas using an unrolled loop, without
-- * considering alignment.
-- *
-- * For the 680[46]0 only kernels we use the move16 instruction instead
-- * as it writes through the data-cache, invalidating the cache-lines
-- * touched. In this way we do not use up the entire data-cache (well,
-- * half of it on the 68060) by copying a page. An unrolled loop of two
-- * move16 instructions seem to the fastest. The only caveat is that
-- * both source and destination must be 16-byte aligned, if not we fall
-- * back to the generic memcpy function. - Jes
-- */
--static inline void * __memcpy_page(void * to, const void * from, size_t count)
--{
-- unsigned long tmp;
-- void *xto = to;
--
--#ifdef CPU_M68040_OR_M68060_ONLY
--
-- if (((unsigned long) to | (unsigned long) from) & 0x0f)
-- return memcpy(to, from, count);
--
-- __asm__ __volatile__("1:\t"
-- ".chip 68040\n\t"
-- "move16 %1 at +,%0 at +\n\t"
-- "move16 %1 at +,%0 at +\n\t"
-- ".chip 68k\n\t"
-- "dbra %2,1b\n\t"
-- : "=a" (to), "=a" (from), "=d" (tmp)
-- : "0" (to), "1" (from) , "2" (count / 32 - 1)
-- );
--#else
-- __asm__ __volatile__("1:\t"
-- "movel %1 at +,%0 at +\n\t"
-- "movel %1 at +,%0 at +\n\t"
-- "movel %1 at +,%0 at +\n\t"
-- "movel %1 at +,%0 at +\n\t"
-- "movel %1 at +,%0 at +\n\t"
-- "movel %1 at +,%0 at +\n\t"
-- "movel %1 at +,%0 at +\n\t"
-- "movel %1 at +,%0 at +\n\t"
-- "dbra %2,1b\n\t"
-- : "=a" (to), "=a" (from), "=d" (tmp)
-- : "0" (to), "1" (from) , "2" (count / 32 - 1)
-- );
--#endif
-- return xto;
--}
--
--#define __memcpy_const(to, from, n) \
--((n==PAGE_SIZE) ? \
-- __memcpy_page((to),(from),(n)) : \
-- __builtin_memcpy((to),(from),(n)))
--
--#define memcpy(to, from, n) \
--(__builtin_constant_p(n) ? \
-- __memcpy_const((to),(from),(n)) : \
-- memcpy((to),(from),(n)))
-+extern void *memcpy(void *, const void *, __kernel_size_t);
-+#define memcpy(d, s, n) __builtin_memcpy(d, s, n)
-
- #define __HAVE_ARCH_MEMMOVE
--static inline void * memmove(void * dest,const void * src, size_t n)
--{
-- void *xdest = dest;
-- size_t temp;
--
-- if (!n)
-- return xdest;
--
-- if (dest < src)
-- {
-- if ((long) dest & 1)
-- {
-- char *cdest = dest;
-- const char *csrc = src;
-- *cdest++ = *csrc++;
-- dest = cdest;
-- src = csrc;
-- n--;
-- }
-- if (n > 2 && (long) dest & 2)
-- {
-- short *sdest = dest;
-- const short *ssrc = src;
-- *sdest++ = *ssrc++;
-- dest = sdest;
-- src = ssrc;
-- n -= 2;
-- }
-- temp = n >> 2;
-- if (temp)
-- {
-- long *ldest = dest;
-- const long *lsrc = src;
-- temp--;
-- do
-- *ldest++ = *lsrc++;
-- while (temp--);
-- dest = ldest;
-- src = lsrc;
-- }
-- if (n & 2)
-- {
-- short *sdest = dest;
-- const short *ssrc = src;
-- *sdest++ = *ssrc++;
-- dest = sdest;
-- src = ssrc;
-- }
-- if (n & 1)
-- {
-- char *cdest = dest;
-- const char *csrc = src;
-- *cdest = *csrc;
-- }
-- }
-- else
-- {
-- dest = (char *) dest + n;
-- src = (const char *) src + n;
-- if ((long) dest & 1)
-- {
-- char *cdest = dest;
-- const char *csrc = src;
-- *--cdest = *--csrc;
-- dest = cdest;
-- src = csrc;
-- n--;
-- }
-- if (n > 2 && (long) dest & 2)
-- {
-- short *sdest = dest;
-- const short *ssrc = src;
-- *--sdest = *--ssrc;
-- dest = sdest;
-- src = ssrc;
-- n -= 2;
-- }
-- temp = n >> 2;
-- if (temp)
-- {
-- long *ldest = dest;
-- const long *lsrc = src;
-- temp--;
-- do
-- *--ldest = *--lsrc;
-- while (temp--);
-- dest = ldest;
-- src = lsrc;
-- }
-- if (n & 2)
-- {
-- short *sdest = dest;
-- const short *ssrc = src;
-- *--sdest = *--ssrc;
-- dest = sdest;
-- src = ssrc;
-- }
-- if (n & 1)
-- {
-- char *cdest = dest;
-- const char *csrc = src;
-- *--cdest = *--csrc;
-- }
-- }
-- return xdest;
--}
-+extern void *memmove(void *, const void *, __kernel_size_t);
-
- #define __HAVE_ARCH_MEMCMP
--extern int memcmp(const void * ,const void * ,size_t );
--#define memcmp(cs, ct, n) \
--(__builtin_constant_p(n) ? \
-- __builtin_memcmp((cs),(ct),(n)) : \
-- memcmp((cs),(ct),(n)))
--
--#define __HAVE_ARCH_MEMCHR
--static inline void *memchr(const void *cs, int c, size_t count)
--{
-- /* Someone else can optimize this, I don't care - tonym at mac.linux-m68k.org */
-- unsigned char *ret = (unsigned char *)cs;
-- for(;count>0;count--,ret++)
-- if(*ret == c) return ret;
--
-- return NULL;
--}
-+extern int memcmp(const void *, const void *, __kernel_size_t);
-+#define memcmp(d, s, n) __builtin_memcmp(d, s, n)
-
- #endif /* _M68K_STRING_H_ */
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/thread_info.h linux-2.6.13/include/asm-m68k/thread_info.h
---- linux-2.6.13-i386/include/asm-m68k/thread_info.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/include/asm-m68k/thread_info.h 2005-08-30 16:36:04.000000000 +0200
-@@ -2,17 +2,15 @@
- #define _ASM_M68K_THREAD_INFO_H
-
- #include <asm/types.h>
--#include <asm/processor.h>
- #include <asm/page.h>
-
- struct thread_info {
- struct task_struct *task; /* main task structure */
-+ unsigned long flags;
- struct exec_domain *exec_domain; /* execution domain */
- int preempt_count; /* 0 => preemptable, <0 => BUG */
- __u32 cpu; /* should always be 0 on m68k */
- struct restart_block restart_block;
--
-- __u8 supervisor_stack[0];
- };
-
- #define PREEMPT_ACTIVE 0x4000000
-@@ -28,91 +26,34 @@
-
- /* THREAD_SIZE should be 8k, so handle differently for 4k and 8k machines */
- #if PAGE_SHIFT == 13 /* 8k machines */
--#define alloc_thread_info(tsk) ((struct thread_info *)__get_free_pages(GFP_KERNEL,0))
--#define free_thread_info(ti) free_pages((unsigned long)(ti),0)
-+#define alloc_thread_stack(tsk) ((void *)__get_free_pages(GFP_KERNEL,0))
-+#define free_thread_stack(ti) free_pages((unsigned long)(ti),0)
- #else /* otherwise assume 4k pages */
--#define alloc_thread_info(tsk) ((struct thread_info *)__get_free_pages(GFP_KERNEL,1))
--#define free_thread_info(ti) free_pages((unsigned long)(ti),1)
-+#define alloc_thread_stack(tsk) ((void *)__get_free_pages(GFP_KERNEL,1))
-+#define free_thread_stack(ti) free_pages((unsigned long)(ti),1)
- #endif /* PAGE_SHIFT == 13 */
-
- //#define init_thread_info (init_task.thread.info)
- #define init_stack (init_thread_union.stack)
-
--#define current_thread_info() (current->thread_info)
-+#define task_thread_info(tsk) (&(tsk)->thread.info)
-+#define current_thread_info() task_thread_info(current)
-
-+#define setup_thread_stack(p, org) ({ \
-+ *(struct task_struct **)(p)->stack = (p); \
-+ task_thread_info(p)->task = (p); \
-+})
-
- #define __HAVE_THREAD_FUNCTIONS
-
--#define TIF_SYSCALL_TRACE 0 /* syscall trace active */
--#define TIF_DELAYED_TRACE 1 /* single step a syscall */
--#define TIF_NOTIFY_RESUME 2 /* resumption notification requested */
--#define TIF_SIGPENDING 3 /* signal pending */
--#define TIF_NEED_RESCHED 4 /* rescheduling necessary */
--#define TIF_MEMDIE 5
--
--extern int thread_flag_fixme(void);
--
--/*
-- * flag set/clear/test wrappers
-- * - pass TIF_xxxx constants to these functions
-+/* entry.S relies on these definitions!
-+ * bits 0-7 are tested at every exception exit
-+ * bits 8-15 are also tested at syscall exit
- */
--
--#define __set_tsk_thread_flag(tsk, flag, val) ({ \
-- switch (flag) { \
-- case TIF_SIGPENDING: \
-- tsk->thread.work.sigpending = val; \
-- break; \
-- case TIF_NEED_RESCHED: \
-- tsk->thread.work.need_resched = val; \
-- break; \
-- case TIF_SYSCALL_TRACE: \
-- tsk->thread.work.syscall_trace = val; \
-- break; \
-- case TIF_MEMDIE: \
-- tsk->thread.work.memdie = val; \
-- break; \
-- default: \
-- thread_flag_fixme(); \
-- } \
--})
--
--#define __get_tsk_thread_flag(tsk, flag) ({ \
-- int ___res; \
-- switch (flag) { \
-- case TIF_SIGPENDING: \
-- ___res = tsk->thread.work.sigpending; \
-- break; \
-- case TIF_NEED_RESCHED: \
-- ___res = tsk->thread.work.need_resched; \
-- break; \
-- case TIF_SYSCALL_TRACE: \
-- ___res = tsk->thread.work.syscall_trace;\
-- break; \
-- case TIF_MEMDIE: \
-- ___res = tsk->thread.work.memdie;\
-- break; \
-- default: \
-- ___res = thread_flag_fixme(); \
-- } \
-- ___res; \
--})
--
--#define __get_set_tsk_thread_flag(tsk, flag, val) ({ \
-- int __res = __get_tsk_thread_flag(tsk, flag); \
-- __set_tsk_thread_flag(tsk, flag, val); \
-- __res; \
--})
--
--#define set_tsk_thread_flag(tsk, flag) __set_tsk_thread_flag(tsk, flag, ~0)
--#define clear_tsk_thread_flag(tsk, flag) __set_tsk_thread_flag(tsk, flag, 0)
--#define test_and_set_tsk_thread_flag(tsk, flag) __get_set_tsk_thread_flag(tsk, flag, ~0)
--#define test_tsk_thread_flag(tsk, flag) __get_tsk_thread_flag(tsk, flag)
--
--#define set_thread_flag(flag) set_tsk_thread_flag(current, flag)
--#define clear_thread_flag(flag) clear_tsk_thread_flag(current, flag)
--#define test_thread_flag(flag) test_tsk_thread_flag(current, flag)
--
--#define set_need_resched() set_thread_flag(TIF_NEED_RESCHED)
--#define clear_need_resched() clear_thread_flag(TIF_NEED_RESCHED)
-+#define TIF_SIGPENDING 6 /* signal pending */
-+#define TIF_NEED_RESCHED 7 /* rescheduling necessary */
-+#define TIF_DELAYED_TRACE 14 /* single step a syscall */
-+#define TIF_SYSCALL_TRACE 15 /* syscall trace active */
-+#define TIF_MEMDIE 16
-
- #endif /* _ASM_M68K_THREAD_INFO_H */
diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/linux/adb.h linux-2.6.13/include/linux/adb.h
--- linux-2.6.13-i386/include/linux/adb.h 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13/include/linux/adb.h 2003-03-25 20:25:16.000000000 +0100
@@ -5822,107 +1701,6 @@
+#endif /* __KERNEL__ */
#endif /* _LINUX_THREAD_INFO_H */
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/kernel/exit.c linux-2.6.13/kernel/exit.c
---- linux-2.6.13-i386/kernel/exit.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/kernel/exit.c 2005-08-30 16:36:41.000000000 +0200
-@@ -846,7 +846,7 @@
- if (group_dead && tsk->signal->leader)
- disassociate_ctty(1);
-
-- module_put(tsk->thread_info->exec_domain->module);
-+ module_put(task_thread_info(tsk)->exec_domain->module);
- if (tsk->binfmt)
- module_put(tsk->binfmt->module);
-
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/kernel/fork.c linux-2.6.13/kernel/fork.c
---- linux-2.6.13-i386/kernel/fork.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/kernel/fork.c 2005-08-30 16:36:41.000000000 +0200
-@@ -100,7 +100,7 @@
-
- void free_task(struct task_struct *tsk)
- {
-- free_thread_info(tsk->thread_info);
-+ free_thread_stack(tsk->stack);
- free_task_struct(tsk);
- }
- EXPORT_SYMBOL(free_task);
-@@ -155,7 +155,7 @@
- static struct task_struct *dup_task_struct(struct task_struct *orig)
- {
- struct task_struct *tsk;
-- struct thread_info *ti;
-+ void *stack;
-
- prepare_to_copy(orig);
-
-@@ -163,16 +163,16 @@
- if (!tsk)
- return NULL;
-
-- ti = alloc_thread_info(tsk);
-- if (!ti) {
-+ stack = alloc_thread_stack(tsk);
-+ if (!stack) {
- free_task_struct(tsk);
- return NULL;
- }
-
-- *ti = *orig->thread_info;
- *tsk = *orig;
-- tsk->thread_info = ti;
-- ti->task = tsk;
-+ tsk->stack = stack;
-+ *(struct task_struct **)tsk->stack = tsk;
-+ setup_thread_stack(tsk, orig);
-
- /* One for us, one for whoever does the "release_task()" (usually parent) */
- atomic_set(&tsk->usage,2);
-@@ -898,7 +898,7 @@
- if (nr_threads >= max_threads)
- goto bad_fork_cleanup_count;
-
-- if (!try_module_get(p->thread_info->exec_domain->module))
-+ if (!try_module_get(task_thread_info(p)->exec_domain->module))
- goto bad_fork_cleanup_count;
-
- if (p->binfmt && !try_module_get(p->binfmt->module))
-@@ -1151,7 +1151,7 @@
- if (p->binfmt)
- module_put(p->binfmt->module);
- bad_fork_cleanup_put_domain:
-- module_put(p->thread_info->exec_domain->module);
-+ module_put(task_thread_info(p)->exec_domain->module);
- bad_fork_cleanup_count:
- put_group_info(p->group_info);
- atomic_dec(&p->user->processes);
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/kernel/sched.c linux-2.6.13/kernel/sched.c
---- linux-2.6.13-i386/kernel/sched.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/kernel/sched.c 2005-08-30 16:36:43.000000000 +0200
-@@ -4121,10 +4121,10 @@
- #endif
- #ifdef CONFIG_DEBUG_STACK_USAGE
- {
-- unsigned long * n = (unsigned long *) (p->thread_info+1);
-+ unsigned long * n = end_of_stack(p);
- while (!*n)
- n++;
-- free = (unsigned long) n - (unsigned long)(p->thread_info+1);
-+ free = (unsigned long) n - (unsigned long) end_of_stack(p);
- }
- #endif
- printk("%5lu %5d %6d ", free, p->pid, p->parent->pid);
-@@ -4204,9 +4204,9 @@
-
- /* Set the preempt count _outside_ the spinlocks! */
- #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
-- idle->thread_info->preempt_count = (idle->lock_depth >= 0);
-+ task_thread_info(idle)->preempt_count = (idle->lock_depth >= 0);
- #else
-- idle->thread_info->preempt_count = 0;
-+ task_thread_info(idle)->preempt_count = 0;
- #endif
- }
-
diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/mm/bootmem.c linux-2.6.13/mm/bootmem.c
--- linux-2.6.13-i386/mm/bootmem.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13/mm/bootmem.c 2005-08-30 16:36:44.000000000 +0200
@@ -5972,38 +1750,3 @@
}
total += count;
-diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/sound/oss/dmasound/dmasound_paula.c linux-2.6.13/sound/oss/dmasound/dmasound_paula.c
---- linux-2.6.13-i386/sound/oss/dmasound/dmasound_paula.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/sound/oss/dmasound/dmasound_paula.c 2005-05-30 16:34:14.000000000 +0200
-@@ -244,6 +244,7 @@
- u_char frame[], ssize_t *frameUsed, \
- ssize_t frameLeft) \
- { \
-+ const u_short *ptr = (const u_short *)userPtr; \
- ssize_t count, used; \
- u_short data; \
- \
-@@ -253,7 +254,7 @@
- count = min_t(size_t, userCount, frameLeft)>>1 & ~1; \
- used = count*2; \
- while (count > 0) { \
-- if (get_user(data, ((u_short *)userPtr)++)) \
-+ if (get_user(data, ptr++)) \
- return -EFAULT; \
- data = convsample(data); \
- *high++ = data>>8; \
-@@ -268,12 +269,12 @@
- count = min_t(size_t, userCount, frameLeft)>>2 & ~1; \
- used = count*4; \
- while (count > 0) { \
-- if (get_user(data, ((u_short *)userPtr)++)) \
-+ if (get_user(data, ptr++)) \
- return -EFAULT; \
- data = convsample(data); \
- *lefth++ = data>>8; \
- *leftl++ = (data>>2) & 0x3f; \
-- if (get_user(data, ((u_short *)userPtr)++)) \
-+ if (get_user(data, ptr++)) \
- return -EFAULT; \
- data = convsample(data); \
- *righth++ = data>>8; \
Added: dists/trunk/linux-2.6/debian/patches-debian/m68k-arch.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/m68k-arch.patch 2005-10-17 14:39:01 UTC (rev 4510)
+++ dists/trunk/linux-2.6/debian/patches-debian/m68k-arch.patch 2005-10-17 16:51:12 UTC (rev 4511)
@@ -0,0 +1,1528 @@
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/Kconfig linux-2.6.13/arch/m68k/Kconfig
+--- linux-2.6.13-i386/arch/m68k/Kconfig 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/Kconfig 2005-10-12 16:31:22.000000000 +0200
+@@ -613,7 +613,7 @@
+
+ config SERIAL167
+ bool "CD2401 support for MVME166/7 serial ports"
+- depends on MVME16x && BROKEN
++ depends on MVME16x
+ help
+ This is the driver for the serial ports on the Motorola MVME166,
+ 167, and 172 boards. Everyone using one of these boards should say
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/amiga/config.c linux-2.6.13/arch/m68k/amiga/config.c
+--- linux-2.6.13-i386/arch/m68k/amiga/config.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/amiga/config.c 2005-10-12 16:31:23.000000000 +0200
+@@ -431,9 +431,6 @@
+ mach_floppy_setup = amiga_floppy_setup;
+ #endif
+ mach_reset = amiga_reset;
+-#ifdef CONFIG_DUMMY_CONSOLE
+- conswitchp = &dummy_con;
+-#endif
+ #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
+ mach_beep = amiga_mksound;
+ #endif
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/apollo/config.c linux-2.6.13/arch/m68k/apollo/config.c
+--- linux-2.6.13-i386/arch/m68k/apollo/config.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/apollo/config.c 2005-10-12 16:31:23.000000000 +0200
+@@ -176,9 +176,6 @@
+ mach_set_clock_mmss = dn_dummy_set_clock_mmss; /* */
+ mach_process_int = dn_process_int;
+ mach_reset = dn_dummy_reset; /* */
+-#ifdef CONFIG_DUMMY_CONSOLE
+- conswitchp = &dummy_con;
+-#endif
+ #ifdef CONFIG_HEARTBEAT
+ mach_heartbeat = dn_heartbeat;
+ #endif
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/atari/config.c linux-2.6.13/arch/m68k/atari/config.c
+--- linux-2.6.13-i386/arch/m68k/atari/config.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/atari/config.c 2005-10-12 16:31:23.000000000 +0200
+@@ -247,9 +247,6 @@
+ #ifdef CONFIG_ATARI_FLOPPY
+ mach_floppy_setup = atari_floppy_setup;
+ #endif
+-#ifdef CONFIG_DUMMY_CONSOLE
+- conswitchp = &dummy_con;
+-#endif
+ mach_max_dma_address = 0xffffff;
+ #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
+ mach_beep = atari_mksound;
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/fpsp040/skeleton.S linux-2.6.13/arch/m68k/fpsp040/skeleton.S
+--- linux-2.6.13-i386/arch/m68k/fpsp040/skeleton.S 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/fpsp040/skeleton.S 2005-05-30 16:31:21.000000000 +0200
+@@ -381,10 +381,8 @@
+ .Lnotkern:
+ SAVE_ALL_INT
+ GET_CURRENT(%d0)
+- tstb %curptr@(TASK_NEEDRESCHED)
+- jne ret_from_exception | deliver signals,
+- | reschedule etc..
+- RESTORE_ALL
++ | deliver signals, reschedule etc..
++ jra ret_from_exception
+
+ |
+ | mem_write --- write to user or supervisor address space
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/hp300/config.c linux-2.6.13/arch/m68k/hp300/config.c
+--- linux-2.6.13-i386/arch/m68k/hp300/config.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/hp300/config.c 2005-10-12 16:31:23.000000000 +0200
+@@ -261,9 +261,6 @@
+ #ifdef CONFIG_HEARTBEAT
+ mach_heartbeat = hp300_pulse;
+ #endif
+-#ifdef CONFIG_DUMMY_CONSOLE
+- conswitchp = &dummy_con;
+-#endif
+ mach_max_dma_address = 0xffffffff;
+
+ if (hp300_model >= HP_330 && hp300_model <= HP_433S && hp300_model != HP_350) {
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/ifpsp060/iskeleton.S linux-2.6.13/arch/m68k/ifpsp060/iskeleton.S
+--- linux-2.6.13-i386/arch/m68k/ifpsp060/iskeleton.S 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/ifpsp060/iskeleton.S 2005-05-30 16:31:22.000000000 +0200
+@@ -75,10 +75,8 @@
+ .Lnotkern:
+ SAVE_ALL_INT
+ GET_CURRENT(%d0)
+- tstb %curptr@(TASK_NEEDRESCHED)
+- jne ret_from_exception | deliver signals,
+- | reschedule etc..
+- RESTORE_ALL
++ | deliver signals, reschedule etc..
++ jra ret_from_exception
+
+ |
+ | _060_real_chk():
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/asm-offsets.c linux-2.6.13/arch/m68k/kernel/asm-offsets.c
+--- linux-2.6.13-i386/arch/m68k/kernel/asm-offsets.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/kernel/asm-offsets.c 2005-05-30 16:31:22.000000000 +0200
+@@ -25,12 +25,8 @@
+ DEFINE(TASK_STATE, offsetof(struct task_struct, state));
+ DEFINE(TASK_FLAGS, offsetof(struct task_struct, flags));
+ DEFINE(TASK_PTRACE, offsetof(struct task_struct, ptrace));
+- DEFINE(TASK_WORK, offsetof(struct task_struct, thread.work));
+- DEFINE(TASK_NEEDRESCHED, offsetof(struct task_struct, thread.work.need_resched));
+- DEFINE(TASK_SYSCALL_TRACE, offsetof(struct task_struct, thread.work.syscall_trace));
+- DEFINE(TASK_SIGPENDING, offsetof(struct task_struct, thread.work.sigpending));
+- DEFINE(TASK_NOTIFY_RESUME, offsetof(struct task_struct, thread.work.notify_resume));
+ DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
++ DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));
+ DEFINE(TASK_MM, offsetof(struct task_struct, mm));
+ DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
+
+@@ -45,6 +41,10 @@
+ DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl));
+ DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
+
++ /* offsets into the thread_info struct */
++ DEFINE(TINFO_PREEMPT, offsetof(struct thread_info, preempt_count));
++ DEFINE(TINFO_FLAGS, offsetof(struct thread_info, flags));
++
+ /* offsets into the pt_regs */
+ DEFINE(PT_D0, offsetof(struct pt_regs, d0));
+ DEFINE(PT_ORIG_D0, offsetof(struct pt_regs, orig_d0));
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/bios32.c linux-2.6.13/arch/m68k/kernel/bios32.c
+--- linux-2.6.13-i386/arch/m68k/kernel/bios32.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/kernel/bios32.c 2004-10-20 16:38:00.000000000 +0200
+@@ -285,7 +285,7 @@
+
+ DBG_DEVS(("layout_bus: starting bus %d\n", bus->number));
+
+- if (!bus->devices && !bus->children)
++ if (list_empty(&bus->devices) && list_empty(&bus->children))
+ return;
+
+ /*
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/entry.S linux-2.6.13/arch/m68k/kernel/entry.S
+--- linux-2.6.13-i386/arch/m68k/kernel/entry.S 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/kernel/entry.S 2005-05-30 16:31:22.000000000 +0200
+@@ -44,9 +44,7 @@
+
+ #include <asm/offsets.h>
+
+-.globl system_call, buserr, trap
+-.globl resume, ret_from_exception
+-.globl ret_from_signal
++.globl system_call, buserr, trap, resume
+ .globl inthandler, sys_call_table
+ .globl sys_fork, sys_clone, sys_vfork
+ .globl ret_from_interrupt, bad_interrupt
+@@ -58,7 +56,7 @@
+ movel %sp,%sp at - | stack frame pointer argument
+ bsrl buserr_c
+ addql #4,%sp
+- jra ret_from_exception
++ jra .Lret_from_exception
+
+ ENTRY(trap)
+ SAVE_ALL_INT
+@@ -66,7 +64,7 @@
+ movel %sp,%sp at - | stack frame pointer argument
+ bsrl trap_c
+ addql #4,%sp
+- jra ret_from_exception
++ jra .Lret_from_exception
+
+ | After a fork we jump here directly from resume,
+ | so that %d1 contains the previous task
+@@ -75,30 +73,31 @@
+ movel %d1,%sp at -
+ jsr schedule_tail
+ addql #4,%sp
+- jra ret_from_exception
++ jra .Lret_from_exception
+
+-badsys:
+- movel #-ENOSYS,%sp@(PT_D0)
+- jra ret_from_exception
+-
+-do_trace:
++do_trace_entry:
+ movel #-ENOSYS,%sp@(PT_D0) | needed for strace
+ subql #4,%sp
+ SAVE_SWITCH_STACK
+ jbsr syscall_trace
+ RESTORE_SWITCH_STACK
+ addql #4,%sp
+- movel %sp@(PT_ORIG_D0),%d1
+- movel #-ENOSYS,%d0
+- cmpl #NR_syscalls,%d1
+- jcc 1f
+- jbsr @(sys_call_table,%d1:l:4)@(0)
+-1: movel %d0,%sp@(PT_D0) | save the return value
+- subql #4,%sp | dummy return address
++ movel %sp@(PT_ORIG_D0),%d0
++ cmpl #NR_syscalls,%d0
++ jcs syscall
++badsys:
++ movel #-ENOSYS,%sp@(PT_D0)
++ jra ret_from_syscall
++
++do_trace_exit:
++ subql #4,%sp
+ SAVE_SWITCH_STACK
+ jbsr syscall_trace
++ RESTORE_SWITCH_STACK
++ addql #4,%sp
++ jra .Lret_from_exception
+
+-ret_from_signal:
++ENTRY(ret_from_signal)
+ RESTORE_SWITCH_STACK
+ addql #4,%sp
+ /* on 68040 complete pending writebacks if any */
+@@ -111,7 +110,7 @@
+ addql #4,%sp
+ 1:
+ #endif
+- jra ret_from_exception
++ jra .Lret_from_exception
+
+ ENTRY(system_call)
+ SAVE_ALL_SYS
+@@ -120,30 +119,34 @@
+ | save top of frame
+ movel %sp,%curptr@(TASK_THREAD+THREAD_ESP0)
+
+- tstb %curptr@(TASK_SYSCALL_TRACE)
+- jne do_trace
++ | syscall trace?
++ tstb %curptr@(TASK_INFO+TINFO_FLAGS+2)
++ jmi do_trace_entry
+ cmpl #NR_syscalls,%d0
+ jcc badsys
++syscall:
+ jbsr @(sys_call_table,%d0:l:4)@(0)
+ movel %d0,%sp@(PT_D0) | save the return value
+-
++ret_from_syscall:
+ |oriw #0x0700,%sr
+- movel %curptr@(TASK_WORK),%d0
++ movew %curptr@(TASK_INFO+TINFO_FLAGS+2),%d0
+ jne syscall_exit_work
+ 1: RESTORE_ALL
+
+ syscall_exit_work:
+ btst #5,%sp@(PT_SR) | check if returning to kernel
+ bnes 1b | if so, skip resched, signals
+- tstw %d0
+- jeq do_signal_return
+- tstb %d0
+- jne do_delayed_trace
+-
++ lslw #1,%d0
++ jcs do_trace_exit
++ jmi do_delayed_trace
++ lslw #8,%d0
++ jmi do_signal_return
+ pea resume_userspace
+- jmp schedule
++ jra schedule
++
+
+-ret_from_exception:
++ENTRY(ret_from_exception)
++.Lret_from_exception:
+ btst #5,%sp@(PT_SR) | check if returning to kernel
+ bnes 1f | if so, skip resched, signals
+ | only allow interrupts when we are really the last one on the
+@@ -152,19 +155,18 @@
+ andw #ALLOWINT,%sr
+
+ resume_userspace:
+- movel %curptr@(TASK_WORK),%d0
+- lsrl #8,%d0
++ moveb %curptr@(TASK_INFO+TINFO_FLAGS+3),%d0
+ jne exit_work
+ 1: RESTORE_ALL
+
+ exit_work:
+ | save top of frame
+ movel %sp,%curptr@(TASK_THREAD+THREAD_ESP0)
+- tstb %d0
+- jeq do_signal_return
+-
++ lslb #1,%d0
++ jmi do_signal_return
+ pea resume_userspace
+- jmp schedule
++ jra schedule
++
+
+ do_signal_return:
+ |andw #ALLOWINT,%sr
+@@ -254,7 +256,7 @@
+
+ /* check if we need to do software interrupts */
+ tstl irq_stat+CPUSTAT_SOFTIRQ_PENDING
+- jeq ret_from_exception
++ jeq .Lret_from_exception
+ pea ret_from_exception
+ jra do_softirq
+
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/m68k_ksyms.c linux-2.6.13/arch/m68k/kernel/m68k_ksyms.c
+--- linux-2.6.13-i386/arch/m68k/kernel/m68k_ksyms.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/kernel/m68k_ksyms.c 2005-08-30 16:31:36.000000000 +0200
+@@ -74,9 +74,6 @@
+ EXPORT_SYMBOL(__ashldi3);
+ EXPORT_SYMBOL(__ashrdi3);
+ EXPORT_SYMBOL(__lshrdi3);
+-EXPORT_SYMBOL(memcpy);
+-EXPORT_SYMBOL(memset);
+-EXPORT_SYMBOL(memcmp);
+ EXPORT_SYMBOL(memscan);
+ EXPORT_SYMBOL(__muldi3);
+
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/process.c linux-2.6.13/arch/m68k/kernel/process.c
+--- linux-2.6.13-i386/arch/m68k/kernel/process.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/kernel/process.c 2005-08-30 16:31:36.000000000 +0200
+@@ -239,7 +239,7 @@
+ unsigned long stack_offset, *retp;
+
+ stack_offset = THREAD_SIZE - sizeof(struct pt_regs);
+- childregs = (struct pt_regs *) ((unsigned long) (p->thread_info) + stack_offset);
++ childregs = (struct pt_regs *) ((unsigned long)p->stack + stack_offset);
+
+ *childregs = *regs;
+ childregs->d0 = 0;
+@@ -384,7 +384,7 @@
+ if (!p || p == current || p->state == TASK_RUNNING)
+ return 0;
+
+- stack_page = (unsigned long)(p->thread_info);
++ stack_page = (unsigned long)p->stack;
+ fp = ((struct switch_stack *)p->thread.ksp)->a6;
+ do {
+ if (fp < stack_page+sizeof(struct thread_info) ||
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/ptrace.c linux-2.6.13/arch/m68k/kernel/ptrace.c
+--- linux-2.6.13-i386/arch/m68k/kernel/ptrace.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/kernel/ptrace.c 2005-06-19 16:32:04.000000000 +0200
+@@ -95,7 +95,7 @@
+ if (regno == PT_USP)
+ addr = &task->thread.usp;
+ else if (regno < sizeof(regoff)/sizeof(regoff[0]))
+- addr = (unsigned long *) (task->thread.esp0 + regoff[regno]);
++ addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
+ else
+ return -1;
+ *addr = data;
+@@ -103,48 +103,56 @@
+ }
+
+ /*
+- * Called by kernel/ptrace.c when detaching..
+- *
+ * Make sure the single step bit is not set.
+ */
+-void ptrace_disable(struct task_struct *child)
++static inline void singlestep_disable(struct task_struct *child)
+ {
+- unsigned long tmp;
+- /* make sure the single step bit is not set. */
+- tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
++ unsigned long tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
+ put_reg(child, PT_SR, tmp);
+- child->thread.work.delayed_trace = 0;
+- child->thread.work.syscall_trace = 0;
++ clear_tsk_thread_flag(child, TIF_DELAYED_TRACE);
++}
++
++/*
++ * Called by kernel/ptrace.c when detaching..
++ */
++void ptrace_disable(struct task_struct *child)
++{
++ singlestep_disable(child);
++ clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
+ }
+
+ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
+ {
+ struct task_struct *child;
+- int ret;
++ unsigned long tmp;
++ int i, ret = 0;
+
+ lock_kernel();
+- ret = -EPERM;
+ if (request == PTRACE_TRACEME) {
+ /* are we already being traced? */
+- if (current->ptrace & PT_PTRACED)
++ if (current->ptrace & PT_PTRACED) {
++ ret = -EPERM;
+ goto out;
++ }
+ /* set the ptrace bit in the process flags. */
+ current->ptrace |= PT_PTRACED;
+- ret = 0;
+ goto out;
+ }
+- ret = -ESRCH;
+ read_lock(&tasklist_lock);
+ child = find_task_by_pid(pid);
+ if (child)
+ get_task_struct(child);
+ read_unlock(&tasklist_lock);
+- if (!child)
++ if (unlikely(!child)) {
++ ret = -ESRCH;
+ goto out;
++ }
+
+- ret = -EPERM;
+- if (pid == 1) /* you may not mess with init */
++ /* you may not mess with init */
++ if (unlikely(pid == 1)) {
++ ret = -EPERM;
+ goto out_tsk;
++ }
+
+ if (request == PTRACE_ATTACH) {
+ ret = ptrace_attach(child);
+@@ -152,234 +160,175 @@
+ }
+
+ ret = ptrace_check_attach(child, request == PTRACE_KILL);
+- if (ret < 0)
++ if (ret)
+ goto out_tsk;
+
+ switch (request) {
+ /* when I and D space are separate, these will need to be fixed. */
+- case PTRACE_PEEKTEXT: /* read word at location addr. */
+- case PTRACE_PEEKDATA: {
+- unsigned long tmp;
+- int copied;
+-
+- copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
+- ret = -EIO;
+- if (copied != sizeof(tmp))
+- break;
+- ret = put_user(tmp,(unsigned long *) data);
+- break;
+- }
++ case PTRACE_PEEKTEXT: /* read word at location addr. */
++ case PTRACE_PEEKDATA:
++ i = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
++ if (i != sizeof(tmp))
++ goto out_eio;
++ ret = put_user(tmp, (unsigned long *)data);
++ break;
+
+ /* read the word at location addr in the USER area. */
+- case PTRACE_PEEKUSR: {
+- unsigned long tmp;
+-
+- ret = -EIO;
+- if ((addr & 3) || addr < 0 ||
+- addr > sizeof(struct user) - 3)
+- break;
+-
+- tmp = 0; /* Default return condition */
+- addr = addr >> 2; /* temporary hack. */
+- ret = -EIO;
+- if (addr < 19) {
+- tmp = get_reg(child, addr);
+- if (addr == PT_SR)
+- tmp >>= 16;
+- } else if (addr >= 21 && addr < 49) {
+- tmp = child->thread.fp[addr - 21];
+-#ifdef CONFIG_M68KFPU_EMU
+- /* Convert internal fpu reg representation
+- * into long double format
+- */
+- if (FPU_IS_EMU && (addr < 45) && !(addr % 3))
+- tmp = ((tmp & 0xffff0000) << 15) |
+- ((tmp & 0x0000ffff) << 16);
+-#endif
+- } else
+- break;
+- ret = put_user(tmp,(unsigned long *) data);
+- break;
+- }
+-
+- /* when I and D space are separate, this will have to be fixed. */
+- case PTRACE_POKETEXT: /* write the word at location addr. */
+- case PTRACE_POKEDATA:
+- ret = 0;
+- if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
+- break;
+- ret = -EIO;
+- break;
+-
+- case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
+- ret = -EIO;
+- if ((addr & 3) || addr < 0 ||
+- addr > sizeof(struct user) - 3)
+- break;
+-
+- addr = addr >> 2; /* temporary hack. */
+-
+- if (addr == PT_SR) {
+- data &= SR_MASK;
+- data <<= 16;
+- data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
+- }
+- if (addr < 19) {
+- if (put_reg(child, addr, data))
+- break;
+- ret = 0;
+- break;
+- }
+- if (addr >= 21 && addr < 48)
+- {
+-#ifdef CONFIG_M68KFPU_EMU
+- /* Convert long double format
+- * into internal fpu reg representation
+- */
+- if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) {
+- data = (unsigned long)data << 15;
+- data = (data & 0xffff0000) |
+- ((data & 0x0000ffff) >> 1);
+- }
+-#endif
+- child->thread.fp[addr - 21] = data;
+- ret = 0;
+- }
+- break;
+-
+- case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
+- case PTRACE_CONT: { /* restart after signal. */
+- long tmp;
+-
+- ret = -EIO;
+- if (!valid_signal(data))
+- break;
+- if (request == PTRACE_SYSCALL) {
+- child->thread.work.syscall_trace = ~0;
+- } else {
+- child->thread.work.syscall_trace = 0;
+- }
+- child->exit_code = data;
+- /* make sure the single step bit is not set. */
+- tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
+- put_reg(child, PT_SR, tmp);
+- child->thread.work.delayed_trace = 0;
+- wake_up_process(child);
+- ret = 0;
+- break;
+- }
+-
+-/*
+- * make the child exit. Best I can do is send it a sigkill.
+- * perhaps it should be put in the status that it wants to
+- * exit.
+- */
+- case PTRACE_KILL: {
+- long tmp;
+-
+- ret = 0;
+- if (child->exit_state == EXIT_ZOMBIE) /* already dead */
+- break;
+- child->exit_code = SIGKILL;
+- /* make sure the single step bit is not set. */
+- tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
+- put_reg(child, PT_SR, tmp);
+- child->thread.work.delayed_trace = 0;
+- wake_up_process(child);
+- break;
+- }
+-
+- case PTRACE_SINGLESTEP: { /* set the trap flag. */
+- long tmp;
+-
+- ret = -EIO;
+- if (!valid_signal(data))
+- break;
+- child->thread.work.syscall_trace = 0;
+- tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
+- put_reg(child, PT_SR, tmp);
+- child->thread.work.delayed_trace = 1;
+-
+- child->exit_code = data;
+- /* give it a chance to run. */
+- wake_up_process(child);
+- ret = 0;
+- break;
+- }
++ case PTRACE_PEEKUSR:
++ if (addr & 3)
++ goto out_eio;
++ addr >>= 2; /* temporary hack. */
++
++ if (addr >= 0 && addr < 19) {
++ tmp = get_reg(child, addr);
++ if (addr == PT_SR)
++ tmp >>= 16;
++ } else if (addr >= 21 && addr < 49) {
++ tmp = child->thread.fp[addr - 21];
++ /* Convert internal fpu reg representation
++ * into long double format
++ */
++ if (FPU_IS_EMU && (addr < 45) && !(addr % 3))
++ tmp = ((tmp & 0xffff0000) << 15) |
++ ((tmp & 0x0000ffff) << 16);
++ } else
++ break;
++ ret = put_user(tmp, (unsigned long *)data);
++ break;
++
++ /* when I and D space are separate, this will have to be fixed. */
++ case PTRACE_POKETEXT: /* write the word at location addr. */
++ case PTRACE_POKEDATA:
++ if (access_process_vm(child, addr, &data, sizeof(data), 1) != sizeof(data))
++ goto out_eio;
++ break;
++
++ case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
++ if (addr & 3)
++ goto out_eio;
++ addr >>= 2; /* temporary hack. */
++
++ if (addr == PT_SR) {
++ data &= SR_MASK;
++ data <<= 16;
++ data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
++ } else if (addr >= 0 && addr < 19) {
++ if (put_reg(child, addr, data))
++ goto out_eio;
++ } else if (addr >= 21 && addr < 48) {
++ /* Convert long double format
++ * into internal fpu reg representation
++ */
++ if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) {
++ data = (unsigned long)data << 15;
++ data = (data & 0xffff0000) |
++ ((data & 0x0000ffff) >> 1);
++ }
++ child->thread.fp[addr - 21] = data;
++ } else
++ goto out_eio;
++ break;
++
++ case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
++ case PTRACE_CONT: /* restart after signal. */
++ if (!valid_signal(data))
++ goto out_eio;
++
++ if (request == PTRACE_SYSCALL)
++ set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
++ else
++ clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
++ child->exit_code = data;
++ singlestep_disable(child);
++ wake_up_process(child);
++ break;
+
+- case PTRACE_DETACH: /* detach a process that was attached. */
+- ret = ptrace_detach(child, data);
++ /*
++ * make the child exit. Best I can do is send it a sigkill.
++ * perhaps it should be put in the status that it wants to
++ * exit.
++ */
++ case PTRACE_KILL:
++ if (child->exit_state == EXIT_ZOMBIE) /* already dead */
+ break;
+-
+- case PTRACE_GETREGS: { /* Get all gp regs from the child. */
+- int i;
+- unsigned long tmp;
+- for (i = 0; i < 19; i++) {
+- tmp = get_reg(child, i);
+- if (i == PT_SR)
++ child->exit_code = SIGKILL;
++ singlestep_disable(child);
++ wake_up_process(child);
++ break;
++
++ case PTRACE_SINGLESTEP: /* set the trap flag. */
++ if (!valid_signal(data))
++ goto out_eio;
++
++ clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
++ tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
++ put_reg(child, PT_SR, tmp);
++ set_tsk_thread_flag(child, TIF_DELAYED_TRACE);
++
++ child->exit_code = data;
++ /* give it a chance to run. */
++ wake_up_process(child);
++ break;
++
++ case PTRACE_DETACH: /* detach a process that was attached. */
++ ret = ptrace_detach(child, data);
++ break;
++
++ case PTRACE_GETREGS: /* Get all gp regs from the child. */
++ for (i = 0; i < 19; i++) {
++ tmp = get_reg(child, i);
++ if (i == PT_SR)
+ tmp >>= 16;
+- if (put_user(tmp, (unsigned long *) data)) {
+- ret = -EFAULT;
++ ret = put_user(tmp, (unsigned long *)data);
++ if (ret)
+ break;
+- }
+- data += sizeof(long);
+- }
+- ret = 0;
+- break;
++ data += sizeof(long);
+ }
++ break;
+
+- case PTRACE_SETREGS: { /* Set all gp regs in the child. */
+- int i;
+- unsigned long tmp;
+- for (i = 0; i < 19; i++) {
+- if (get_user(tmp, (unsigned long *) data)) {
+- ret = -EFAULT;
++ case PTRACE_SETREGS: /* Set all gp regs in the child. */
++ for (i = 0; i < 19; i++) {
++ ret = get_user(tmp, (unsigned long *)data);
++ if (ret)
+ break;
+- }
+- if (i == PT_SR) {
++ if (i == PT_SR) {
+ tmp &= SR_MASK;
+ tmp <<= 16;
+ tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
+- }
+- put_reg(child, i, tmp);
+- data += sizeof(long);
+ }
+- ret = 0;
+- break;
+- }
+-
+- case PTRACE_GETFPREGS: { /* Get the child FPU state. */
+- ret = 0;
+- if (copy_to_user((void *)data, &child->thread.fp,
+- sizeof(struct user_m68kfp_struct)))
+- ret = -EFAULT;
+- break;
++ put_reg(child, i, tmp);
++ data += sizeof(long);
+ }
++ break;
+
+- case PTRACE_SETFPREGS: { /* Set the child FPU state. */
+- ret = 0;
+- if (copy_from_user(&child->thread.fp, (void *)data,
+- sizeof(struct user_m68kfp_struct)))
+- ret = -EFAULT;
+- break;
+- }
+-
+- default:
+- ret = ptrace_request(child, request, addr, data);
+- break;
++ case PTRACE_GETFPREGS: /* Get the child FPU state. */
++ if (copy_to_user((void *)data, &child->thread.fp,
++ sizeof(struct user_m68kfp_struct)))
++ ret = -EFAULT;
++ break;
++
++ case PTRACE_SETFPREGS: /* Set the child FPU state. */
++ if (copy_from_user(&child->thread.fp, (void *)data,
++ sizeof(struct user_m68kfp_struct)))
++ ret = -EFAULT;
++ break;
++
++ default:
++ ret = ptrace_request(child, request, addr, data);
++ break;
+ }
+ out_tsk:
+ put_task_struct(child);
+ out:
+ unlock_kernel();
+ return ret;
++out_eio:
++ ret = -EIO;
++ goto out_tsk;
+ }
+
+ asmlinkage void syscall_trace(void)
+ {
+- if (!current->thread.work.delayed_trace &&
+- !current->thread.work.syscall_trace)
+- return;
+ ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+ ? 0x80 : 0));
+ /*
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/kernel/setup.c linux-2.6.13/arch/m68k/kernel/setup.c
+--- linux-2.6.13-i386/arch/m68k/kernel/setup.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/kernel/setup.c 2005-10-12 16:31:24.000000000 +0200
+@@ -280,6 +280,10 @@
+ }
+ }
+
++#ifdef CONFIG_DUMMY_CONSOLE
++ conswitchp = &dummy_con;
++#endif
++
+ switch (m68k_machtype) {
+ #ifdef CONFIG_AMIGA
+ case MACH_AMIGA:
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/Makefile linux-2.6.13/arch/m68k/lib/Makefile
+--- linux-2.6.13-i386/arch/m68k/lib/Makefile 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/lib/Makefile 2005-08-30 16:31:36.000000000 +0200
+@@ -5,4 +5,4 @@
+ EXTRA_AFLAGS := -traditional
+
+ lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
+- checksum.o memcmp.o memcpy.o memset.o semaphore.o
++ checksum.o string.o semaphore.o
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/memcmp.c linux-2.6.13/arch/m68k/lib/memcmp.c
+--- linux-2.6.13-i386/arch/m68k/lib/memcmp.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/lib/memcmp.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,11 +0,0 @@
+-#include <linux/types.h>
+-
+-int memcmp(const void * cs,const void * ct,size_t count)
+-{
+- const unsigned char *su1, *su2;
+-
+- for( su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
+- if (*su1 != *su2)
+- return((*su1 < *su2) ? -1 : +1);
+- return(0);
+-}
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/memcpy.c linux-2.6.13/arch/m68k/lib/memcpy.c
+--- linux-2.6.13-i386/arch/m68k/lib/memcpy.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/lib/memcpy.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,75 +0,0 @@
+-#include <linux/types.h>
+-
+-void * memcpy(void * to, const void * from, size_t n)
+-{
+- void *xto = to;
+- size_t temp, temp1;
+-
+- if (!n)
+- return xto;
+- if ((long) to & 1)
+- {
+- char *cto = to;
+- const char *cfrom = from;
+- *cto++ = *cfrom++;
+- to = cto;
+- from = cfrom;
+- n--;
+- }
+- if (n > 2 && (long) to & 2)
+- {
+- short *sto = to;
+- const short *sfrom = from;
+- *sto++ = *sfrom++;
+- to = sto;
+- from = sfrom;
+- n -= 2;
+- }
+- temp = n >> 2;
+- if (temp)
+- {
+- long *lto = to;
+- const long *lfrom = from;
+-
+- __asm__ __volatile__("movel %2,%3\n\t"
+- "andw #7,%3\n\t"
+- "lsrl #3,%2\n\t"
+- "negw %3\n\t"
+- "jmp %%pc@(1f,%3:w:2)\n\t"
+- "4:\t"
+- "movel %0 at +,%1 at +\n\t"
+- "movel %0 at +,%1 at +\n\t"
+- "movel %0 at +,%1 at +\n\t"
+- "movel %0 at +,%1 at +\n\t"
+- "movel %0 at +,%1 at +\n\t"
+- "movel %0 at +,%1 at +\n\t"
+- "movel %0 at +,%1 at +\n\t"
+- "movel %0 at +,%1 at +\n\t"
+- "1:\t"
+- "dbra %2,4b\n\t"
+- "clrw %2\n\t"
+- "subql #1,%2\n\t"
+- "jpl 4b\n\t"
+- : "=a" (lfrom), "=a" (lto), "=d" (temp),
+- "=&d" (temp1)
+- : "0" (lfrom), "1" (lto), "2" (temp)
+- );
+- to = lto;
+- from = lfrom;
+- }
+- if (n & 2)
+- {
+- short *sto = to;
+- const short *sfrom = from;
+- *sto++ = *sfrom++;
+- to = sto;
+- from = sfrom;
+- }
+- if (n & 1)
+- {
+- char *cto = to;
+- const char *cfrom = from;
+- *cto = *cfrom;
+- }
+- return xto;
+-}
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/memset.c linux-2.6.13/arch/m68k/lib/memset.c
+--- linux-2.6.13-i386/arch/m68k/lib/memset.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/lib/memset.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,68 +0,0 @@
+-#include <linux/types.h>
+-
+-void * memset(void * s, int c, size_t count)
+-{
+- void *xs = s;
+- size_t temp, temp1;
+-
+- if (!count)
+- return xs;
+- c &= 0xff;
+- c |= c << 8;
+- c |= c << 16;
+- if ((long) s & 1)
+- {
+- char *cs = s;
+- *cs++ = c;
+- s = cs;
+- count--;
+- }
+- if (count > 2 && (long) s & 2)
+- {
+- short *ss = s;
+- *ss++ = c;
+- s = ss;
+- count -= 2;
+- }
+- temp = count >> 2;
+- if (temp)
+- {
+- long *ls = s;
+-
+- __asm__ __volatile__("movel %1,%2\n\t"
+- "andw #7,%2\n\t"
+- "lsrl #3,%1\n\t"
+- "negw %2\n\t"
+- "jmp %%pc@(2f,%2:w:2)\n\t"
+- "1:\t"
+- "movel %3,%0 at +\n\t"
+- "movel %3,%0 at +\n\t"
+- "movel %3,%0 at +\n\t"
+- "movel %3,%0 at +\n\t"
+- "movel %3,%0 at +\n\t"
+- "movel %3,%0 at +\n\t"
+- "movel %3,%0 at +\n\t"
+- "movel %3,%0 at +\n\t"
+- "2:\t"
+- "dbra %1,1b\n\t"
+- "clrw %1\n\t"
+- "subql #1,%1\n\t"
+- "jpl 1b\n\t"
+- : "=a" (ls), "=d" (temp), "=&d" (temp1)
+- : "d" (c), "0" (ls), "1" (temp)
+- );
+- s = ls;
+- }
+- if (count & 2)
+- {
+- short *ss = s;
+- *ss++ = c;
+- s = ss;
+- }
+- if (count & 1)
+- {
+- char *cs = s;
+- *cs = c;
+- }
+- return xs;
+-}
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/lib/string.c linux-2.6.13/arch/m68k/lib/string.c
+--- linux-2.6.13-i386/arch/m68k/lib/string.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13/arch/m68k/lib/string.c 2005-08-30 13:26:30.000000000 +0200
+@@ -0,0 +1,237 @@
++
++#include <linux/types.h>
++#include <linux/module.h>
++
++void *memset(void *s, int c, size_t count)
++{
++ void *xs = s;
++ size_t temp, temp1;
++
++ if (!count)
++ return xs;
++ c &= 0xff;
++ c |= c << 8;
++ c |= c << 16;
++ if ((long)s & 1) {
++ char *cs = s;
++ *cs++ = c;
++ s = cs;
++ count--;
++ }
++ if (count > 2 && (long)s & 2) {
++ short *ss = s;
++ *ss++ = c;
++ s = ss;
++ count -= 2;
++ }
++ temp = count >> 2;
++ if (temp) {
++ long *ls = s;
++
++ asm volatile (
++ " movel %1,%2\n"
++ " andw #7,%2\n"
++ " lsrl #3,%1\n"
++ " negw %2\n"
++ " jmp %%pc@(2f,%2:w:2)\n"
++ "1: movel %3,%0 at +\n"
++ " movel %3,%0 at +\n"
++ " movel %3,%0 at +\n"
++ " movel %3,%0 at +\n"
++ " movel %3,%0 at +\n"
++ " movel %3,%0 at +\n"
++ " movel %3,%0 at +\n"
++ " movel %3,%0 at +\n"
++ "2: dbra %1,1b\n"
++ " clrw %1\n"
++ " subql #1,%1\n"
++ " jpl 1b"
++ : "=a" (ls), "=d" (temp), "=&d" (temp1)
++ : "d" (c), "0" (ls), "1" (temp));
++ s = ls;
++ }
++ if (count & 2) {
++ short *ss = s;
++ *ss++ = c;
++ s = ss;
++ }
++ if (count & 1) {
++ char *cs = s;
++ *cs = c;
++ }
++ return xs;
++}
++EXPORT_SYMBOL(memset);
++
++void *memcpy(void *to, const void *from, size_t n)
++{
++ void *xto = to;
++ size_t temp, temp1;
++
++ if (!n)
++ return xto;
++ if ((long)to & 1) {
++ char *cto = to;
++ const char *cfrom = from;
++ *cto++ = *cfrom++;
++ to = cto;
++ from = cfrom;
++ n--;
++ }
++ if (n > 2 && (long)to & 2) {
++ short *sto = to;
++ const short *sfrom = from;
++ *sto++ = *sfrom++;
++ to = sto;
++ from = sfrom;
++ n -= 2;
++ }
++ temp = n >> 2;
++ if (temp) {
++ long *lto = to;
++ const long *lfrom = from;
++
++ asm volatile (
++ " movel %2,%3\n"
++ " andw #7,%3\n"
++ " lsrl #3,%2\n"
++ " negw %3\n"
++ " jmp %%pc@(1f,%3:w:2)\n"
++ "4: movel %0 at +,%1 at +\n"
++ " movel %0 at +,%1 at +\n"
++ " movel %0 at +,%1 at +\n"
++ " movel %0 at +,%1 at +\n"
++ " movel %0 at +,%1 at +\n"
++ " movel %0 at +,%1 at +\n"
++ " movel %0 at +,%1 at +\n"
++ " movel %0 at +,%1 at +\n"
++ "1: dbra %2,4b\n"
++ " clrw %2\n"
++ " subql #1,%2\n"
++ " jpl 4b"
++ : "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1)
++ : "0" (lfrom), "1" (lto), "2" (temp));
++ to = lto;
++ from = lfrom;
++ }
++ if (n & 2) {
++ short *sto = to;
++ const short *sfrom = from;
++ *sto++ = *sfrom++;
++ to = sto;
++ from = sfrom;
++ }
++ if (n & 1) {
++ char *cto = to;
++ const char *cfrom = from;
++ *cto = *cfrom;
++ }
++ return xto;
++}
++EXPORT_SYMBOL(memcpy);
++
++void *memmove(void *dest, const void *src, size_t n)
++{
++ void *xdest = dest;
++ size_t temp;
++
++ if (!n)
++ return xdest;
++
++ if (dest < src) {
++ if ((long)dest & 1) {
++ char *cdest = dest;
++ const char *csrc = src;
++ *cdest++ = *csrc++;
++ dest = cdest;
++ src = csrc;
++ n--;
++ }
++ if (n > 2 && (long)dest & 2) {
++ short *sdest = dest;
++ const short *ssrc = src;
++ *sdest++ = *ssrc++;
++ dest = sdest;
++ src = ssrc;
++ n -= 2;
++ }
++ temp = n >> 2;
++ if (temp) {
++ long *ldest = dest;
++ const long *lsrc = src;
++ temp--;
++ do
++ *ldest++ = *lsrc++;
++ while (temp--);
++ dest = ldest;
++ src = lsrc;
++ }
++ if (n & 2) {
++ short *sdest = dest;
++ const short *ssrc = src;
++ *sdest++ = *ssrc++;
++ dest = sdest;
++ src = ssrc;
++ }
++ if (n & 1) {
++ char *cdest = dest;
++ const char *csrc = src;
++ *cdest = *csrc;
++ }
++ } else {
++ dest = (char *)dest + n;
++ src = (const char *)src + n;
++ if ((long)dest & 1) {
++ char *cdest = dest;
++ const char *csrc = src;
++ *--cdest = *--csrc;
++ dest = cdest;
++ src = csrc;
++ n--;
++ }
++ if (n > 2 && (long)dest & 2) {
++ short *sdest = dest;
++ const short *ssrc = src;
++ *--sdest = *--ssrc;
++ dest = sdest;
++ src = ssrc;
++ n -= 2;
++ }
++ temp = n >> 2;
++ if (temp) {
++ long *ldest = dest;
++ const long *lsrc = src;
++ temp--;
++ do
++ *--ldest = *--lsrc;
++ while (temp--);
++ dest = ldest;
++ src = lsrc;
++ }
++ if (n & 2) {
++ short *sdest = dest;
++ const short *ssrc = src;
++ *--sdest = *--ssrc;
++ dest = sdest;
++ src = ssrc;
++ }
++ if (n & 1) {
++ char *cdest = dest;
++ const char *csrc = src;
++ *--cdest = *--csrc;
++ }
++ }
++ return xdest;
++}
++EXPORT_SYMBOL(memmove);
++
++int memcmp(const void *cs, const void *ct, size_t count)
++{
++ const unsigned char *su1, *su2;
++
++ for (su1 = cs, su2 = ct; count > 0; ++su1, ++su2, count--)
++ if (*su1 != *su2)
++ return *su1 < *su2 ? -1 : +1;
++ return 0;
++}
++EXPORT_SYMBOL(memcmp);
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/mac/config.c linux-2.6.13/arch/m68k/mac/config.c
+--- linux-2.6.13-i386/arch/m68k/mac/config.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/mac/config.c 2005-10-12 16:31:24.000000000 +0200
+@@ -212,9 +212,6 @@
+ mach_reset = mac_reset;
+ mach_halt = mac_poweroff;
+ mach_power_off = mac_poweroff;
+-#ifdef CONFIG_DUMMY_CONSOLE
+- conswitchp = &dummy_con;
+-#endif
+ mach_max_dma_address = 0xffffffff;
+ #if 0
+ mach_debug_init = mac_debug_init;
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/mm/Makefile linux-2.6.13/arch/m68k/mm/Makefile
+--- linux-2.6.13-i386/arch/m68k/mm/Makefile 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/mm/Makefile 2004-02-06 14:59:40.000000000 +0100
+@@ -2,7 +2,7 @@
+ # Makefile for the linux m68k-specific parts of the memory manager.
+ #
+
+-obj-y := init.o fault.o hwtest.o
++obj-y := cache.o init.o fault.o hwtest.o
+
+ obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o
+ obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/mm/cache.c linux-2.6.13/arch/m68k/mm/cache.c
+--- linux-2.6.13-i386/arch/m68k/mm/cache.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13/arch/m68k/mm/cache.c 2005-08-30 16:31:37.000000000 +0200
+@@ -0,0 +1,118 @@
++/*
++ * linux/arch/m68k/mm/cache.c
++ *
++ * Instruction cache handling
++ *
++ * Copyright (C) 1995 Hamish Macdonald
++ */
++
++#include <linux/module.h>
++#include <asm/pgalloc.h>
++#include <asm/traps.h>
++
++
++static unsigned long virt_to_phys_slow(unsigned long vaddr)
++{
++ if (CPU_IS_060) {
++ unsigned long paddr;
++
++ /* The PLPAR instruction causes an access error if the translation
++ * is not possible. To catch this we use the same exception mechanism
++ * as for user space accesses in <asm/uaccess.h>. */
++ asm volatile (".chip 68060\n"
++ "1: plpar (%0)\n"
++ ".chip 68k\n"
++ "2:\n"
++ ".section .fixup,\"ax\"\n"
++ " .even\n"
++ "3: sub.l %0,%0\n"
++ " jra 2b\n"
++ ".previous\n"
++ ".section __ex_table,\"a\"\n"
++ " .align 4\n"
++ " .long 1b,3b\n"
++ ".previous"
++ : "=a" (paddr)
++ : "0" (vaddr));
++ return paddr;
++ } else if (CPU_IS_040) {
++ unsigned long mmusr;
++
++ asm volatile (".chip 68040\n\t"
++ "ptestr (%1)\n\t"
++ "movec %%mmusr, %0\n\t"
++ ".chip 68k"
++ : "=r" (mmusr)
++ : "a" (vaddr));
++
++ if (mmusr & MMU_R_040)
++ return (mmusr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
++ } else {
++ unsigned short mmusr;
++ unsigned long *descaddr;
++
++ asm volatile ("ptestr %3,%2@,#7,%0\n\t"
++ "pmove %%psr,%1@"
++ : "=a&" (descaddr)
++ : "a" (&mmusr), "a" (vaddr), "d" (get_fs().seg));
++ if (mmusr & (MMU_I|MMU_B|MMU_L))
++ return 0;
++ descaddr = phys_to_virt((unsigned long)descaddr);
++ switch (mmusr & MMU_NUM) {
++ case 1:
++ return (*descaddr & 0xfe000000) | (vaddr & 0x01ffffff);
++ case 2:
++ return (*descaddr & 0xfffc0000) | (vaddr & 0x0003ffff);
++ case 3:
++ return (*descaddr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
++ }
++ }
++ return 0;
++}
++
++/* Push n pages at kernel virtual address and clear the icache */
++/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
++void flush_icache_range(unsigned long address, unsigned long endaddr)
++{
++
++ if (CPU_IS_040_OR_060) {
++ address &= PAGE_MASK;
++
++ do {
++ asm volatile ("nop\n\t"
++ ".chip 68040\n\t"
++ "cpushp %%bc,(%0)\n\t"
++ ".chip 68k"
++ : : "a" (virt_to_phys_slow(address)));
++ address += PAGE_SIZE;
++ } while (address < endaddr);
++ } else {
++ unsigned long tmp;
++ asm volatile ("movec %%cacr,%0\n\t"
++ "orw %1,%0\n\t"
++ "movec %0,%%cacr"
++ : "=&d" (tmp)
++ : "di" (FLUSH_I));
++ }
++}
++EXPORT_SYMBOL(flush_icache_range);
++
++void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
++ unsigned long addr, int len)
++{
++ if (CPU_IS_040_OR_060) {
++ asm volatile ("nop\n\t"
++ ".chip 68040\n\t"
++ "cpushp %%bc,(%0)\n\t"
++ ".chip 68k"
++ : : "a" (page_to_phys(page)));
++ } else {
++ unsigned long tmp;
++ asm volatile ("movec %%cacr,%0\n\t"
++ "orw %1,%0\n\t"
++ "movec %0,%%cacr"
++ : "=&d" (tmp)
++ : "di" (FLUSH_I));
++ }
++}
++
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/mm/memory.c linux-2.6.13/arch/m68k/mm/memory.c
+--- linux-2.6.13-i386/arch/m68k/mm/memory.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/mm/memory.c 2004-10-03 16:35:42.000000000 +0200
+@@ -354,110 +354,6 @@
+ #endif
+ }
+
+-static unsigned long virt_to_phys_slow(unsigned long vaddr)
+-{
+- if (CPU_IS_060) {
+- mm_segment_t fs = get_fs();
+- unsigned long paddr;
+-
+- set_fs(get_ds());
+-
+- /* The PLPAR instruction causes an access error if the translation
+- * is not possible. To catch this we use the same exception mechanism
+- * as for user space accesses in <asm/uaccess.h>. */
+- asm volatile (".chip 68060\n"
+- "1: plpar (%0)\n"
+- ".chip 68k\n"
+- "2:\n"
+- ".section .fixup,\"ax\"\n"
+- " .even\n"
+- "3: sub.l %0,%0\n"
+- " jra 2b\n"
+- ".previous\n"
+- ".section __ex_table,\"a\"\n"
+- " .align 4\n"
+- " .long 1b,3b\n"
+- ".previous"
+- : "=a" (paddr)
+- : "0" (vaddr));
+- set_fs(fs);
+- return paddr;
+- } else if (CPU_IS_040) {
+- mm_segment_t fs = get_fs();
+- unsigned long mmusr;
+-
+- set_fs(get_ds());
+-
+- asm volatile (".chip 68040\n\t"
+- "ptestr (%1)\n\t"
+- "movec %%mmusr, %0\n\t"
+- ".chip 68k"
+- : "=r" (mmusr)
+- : "a" (vaddr));
+- set_fs(fs);
+-
+- if (mmusr & MMU_R_040)
+- return (mmusr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
+- } else {
+- unsigned short mmusr;
+- unsigned long *descaddr;
+-
+- asm volatile ("ptestr #5,%2@,#7,%0\n\t"
+- "pmove %%psr,%1@"
+- : "=a&" (descaddr)
+- : "a" (&mmusr), "a" (vaddr));
+- if (mmusr & (MMU_I|MMU_B|MMU_L))
+- return 0;
+- descaddr = phys_to_virt((unsigned long)descaddr);
+- switch (mmusr & MMU_NUM) {
+- case 1:
+- return (*descaddr & 0xfe000000) | (vaddr & 0x01ffffff);
+- case 2:
+- return (*descaddr & 0xfffc0000) | (vaddr & 0x0003ffff);
+- case 3:
+- return (*descaddr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
+- }
+- }
+- return 0;
+-}
+-
+-/* Push n pages at kernel virtual address and clear the icache */
+-/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
+-void flush_icache_range(unsigned long address, unsigned long endaddr)
+-{
+- if (CPU_IS_040_OR_060) {
+- address &= PAGE_MASK;
+-
+- if (address >= PAGE_OFFSET && address < (unsigned long)high_memory) {
+- do {
+- asm volatile ("nop\n\t"
+- ".chip 68040\n\t"
+- "cpushp %%bc,(%0)\n\t"
+- ".chip 68k"
+- : : "a" (virt_to_phys((void *)address)));
+- address += PAGE_SIZE;
+- } while (address < endaddr);
+- } else {
+- do {
+- asm volatile ("nop\n\t"
+- ".chip 68040\n\t"
+- "cpushp %%bc,(%0)\n\t"
+- ".chip 68k"
+- : : "a" (virt_to_phys_slow(address)));
+- address += PAGE_SIZE;
+- } while (address < endaddr);
+- }
+- } else {
+- unsigned long tmp;
+- asm volatile ("movec %%cacr,%0\n\t"
+- "orw %1,%0\n\t"
+- "movec %0,%%cacr"
+- : "=&d" (tmp)
+- : "di" (FLUSH_I));
+- }
+-}
+-
+-
+ #ifndef CONFIG_SINGLE_MEMORY_CHUNK
+ int mm_end_of_chunk (unsigned long addr, int len)
+ {
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/q40/config.c linux-2.6.13/arch/m68k/q40/config.c
+--- linux-2.6.13-i386/arch/m68k/q40/config.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/q40/config.c 2005-10-12 16:31:25.000000000 +0200
+@@ -194,9 +194,6 @@
+ mach_heartbeat = q40_heartbeat;
+ #endif
+ mach_halt = q40_halt;
+-#ifdef CONFIG_DUMMY_CONSOLE
+- conswitchp = &dummy_con;
+-#endif
+
+ /* disable a few things that SMSQ might have left enabled */
+ q40_disable_irqs();
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/sun3/config.c linux-2.6.13/arch/m68k/sun3/config.c
+--- linux-2.6.13-i386/arch/m68k/sun3/config.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/sun3/config.c 2005-10-12 16:31:25.000000000 +0200
+@@ -160,9 +160,6 @@
+ mach_hwclk = sun3_hwclk;
+ mach_halt = sun3_halt;
+ mach_get_hardware_list = sun3_get_hardware_list;
+-#if defined(CONFIG_DUMMY_CONSOLE)
+- conswitchp = &dummy_con;
+-#endif
+
+ memory_start = ((((int)&_end) + 0x2000) & ~0x1fff);
+ // PROM seems to want the last couple of physical pages. --m
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/arch/m68k/sun3x/config.c linux-2.6.13/arch/m68k/sun3x/config.c
+--- linux-2.6.13-i386/arch/m68k/sun3x/config.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/arch/m68k/sun3x/config.c 2005-10-12 16:31:25.000000000 +0200
+@@ -71,10 +71,6 @@
+ mach_get_model = sun3_get_model;
+ mach_get_hardware_list = sun3x_get_hardware_list;
+
+-#ifdef CONFIG_DUMMY_CONSOLE
+- conswitchp = &dummy_con;
+-#endif
+-
+ sun3_intreg = (unsigned char *)SUN3X_INTREG;
+
+ /* only the serial console is known to work anyway... */
Added: dists/trunk/linux-2.6/debian/patches-debian/m68k-drivers.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/m68k-drivers.patch 2005-10-17 14:39:01 UTC (rev 4510)
+++ dists/trunk/linux-2.6/debian/patches-debian/m68k-drivers.patch 2005-10-17 16:51:12 UTC (rev 4511)
@@ -0,0 +1,2075 @@
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/16c552.h linux-2.6.13/drivers/char/16c552.h
+--- linux-2.6.13-i386/drivers/char/16c552.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13/drivers/char/16c552.h 2001-10-22 11:34:32.000000000 +0200
+@@ -0,0 +1,165 @@
++/*
++ * Definitions for the 16c552 DACE
++ * (dual-asynchronous-communications-element) used on the GVP
++ * IO-Extender.
++ *
++ * Basically this is two 16c550 uarts's and a parallel port, which is
++ * why the serial definitions should be valid for the 16c550 uart
++ * aswell.
++ *
++ * Data was taken from National Semiconductors duart 16c552
++ * data-sheets and the Texas Instruments DACE 16c552 data-sheets (the
++ * NS version of the chip is _non_ standard and their data-sheets did
++ * cost me several wasted hours of work).
++ *
++ * This file is (C) 1995 Jes Sorensen (jds at kom.auc.dk)
++ *
++ * Moved from drivers/char/ to include/linux/, because it's useful
++ * on more than just the one card. I'm using it on the hp300 DCA
++ * serial driver, for example.
++ * -- Peter Maydell <pmaydell at chiark.greenend.org.uk> 05/1998
++ */
++
++#ifndef _16C552_H_
++#define _16C552_H_
++
++/* Serial stuff */
++
++struct uart_16c550 {
++ volatile u_char skip0;
++ volatile u_char RBR;
++ volatile u_char skip1;
++ volatile u_char IER;
++ volatile u_char skip2;
++ volatile u_char IIR;
++ volatile u_char skip3;
++ volatile u_char LCR;
++ volatile u_char skip4;
++ volatile u_char MCR;
++ volatile u_char skip5;
++ volatile u_char LSR;
++ volatile u_char skip6;
++ volatile u_char MSR;
++ volatile u_char skip7;
++ volatile u_char SCR;
++};
++
++#define THR RBR
++#define FCR IIR
++#define DLL RBR
++#define DLM IER
++#define AFR IIR
++
++/*
++ * Bit-defines for the various registers.
++ */
++
++
++/* IER */
++
++#define ERDAI (1<<0)
++#define ETHREI (1<<1)
++#define ELSI (1<<2)
++#define EMSI (1<<3)
++
++/* IIR - Interrupt Ident. Register */
++
++#define IRQ_PEND (1<<0) /* NOTE: IRQ_PEND=0 implies irq pending */
++#define IRQ_ID1 (1<<1)
++#define IRQ_ID2 (1<<2)
++#define IRQ_ID3 (1<<3)
++#define FIFO_ENA0 (1<<6) /* Both these are set when FCR(1<<0)=1 */
++#define FIFO_ENA1 (1<<7)
++
++#define IRQ_RLS (IRQ_ID1 | IRQ_ID2)
++#define IRQ_RDA (IRQ_ID2)
++#define IRQ_CTI (IRQ_ID2 | IRQ_ID3)
++#define IRQ_THRE (IRQ_ID1)
++#define IRQ_MS 0
++
++/* FCR - FIFO Control Register */
++
++#define FIFO_ENA (1<<0)
++#define RCVR_FIFO_RES (1<<1)
++#define XMIT_FIFO_RES (1<<2)
++#define DMA_MODE_SEL (1<<3)
++#define RCVR_TRIG_LSB (1<<6)
++#define RCVR_TRIG_MSB (1<<7)
++
++#define FIFO_TRIG_1 0x00
++#define FIFO_TRIG_4 RCVR_TRIG_LSB
++#define FIFO_TRIG_8 RCVR_TRIG_MSB
++#define FIFO_TRIG_14 RCVR_TRIG_LSB|RCVR_TRIG_MSB
++
++/* LCR - Line Control Register */
++
++#define WLS0 (1<<0)
++#define WLS1 (1<<1)
++#define STB (1<<2)
++#define PEN (1<<3)
++#define EPS (1<<4)
++#define STICK_PARITY (1<<5)
++#define SET_BREAK (1<<6)
++#define DLAB (1<<7)
++
++#define data_5bit 0x00
++#define data_6bit 0x01
++#define data_7bit 0x02
++#define data_8bit 0x03
++
++
++/* MCR - Modem Control Register */
++
++#define DTR (1<<0)
++#define RTS (1<<1)
++#define OUT1 (1<<2)
++#define OUT2 (1<<3)
++#define LOOP (1<<4)
++
++/* LSR - Line Status Register */
++
++#define DR (1<<0)
++#define OE (1<<1)
++#define PE (1<<2)
++#define FE (1<<3)
++#define BI (1<<4)
++#define THRE (1<<5)
++#define TEMT (1<<6)
++#define RCVR_FIFO_ERR (1<<7)
++
++/* MSR - Modem Status Register */
++
++#define DCTS (1<<0)
++#define DDSR (1<<1)
++#define TERI (1<<2)
++#define DDCD (1<<3)
++#define CTS (1<<4)
++#define DSR (1<<5)
++#define RING_I (1<<6)
++#define DCD (1<<7)
++
++/* AFR - Alternate Function Register */
++
++#define CONCUR_WRITE (1<<0)
++#define BAUDOUT (1<<1)
++#define RXRDY (1<<2)
++
++/* Parallel stuff */
++
++/*
++ * Unfortunately National Semiconductors did not supply the
++ * specifications for the parallel port in the chip :-(
++ * TI succed though, so here they are :-)
++ *
++ * Defines for the bits can be found by including <linux/lp.h>
++ */
++struct IOEXT_par {
++ volatile u_char skip0;
++ volatile u_char DATA;
++ volatile u_char skip1;
++ volatile u_char STATUS;
++ volatile u_char skip2;
++ volatile u_char CTRL;
++};
++
++#endif
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/ioext.h linux-2.6.13/drivers/char/ioext.h
+--- linux-2.6.13-i386/drivers/char/ioext.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13/drivers/char/ioext.h 2001-10-22 11:34:32.000000000 +0200
+@@ -0,0 +1,108 @@
++/*
++ * Shared data structure for GVP IO-Extender support.
++ *
++ * Merge of ioext.h and ser_ioext.h
++ */
++#ifndef _IOEXT_H_
++#define _IOEXT_H_
++
++#include <linux/config.h>
++#include <linux/netdevice.h>
++
++#include "16c552.h"
++
++#define MAX_IOEXT 5 /*
++ * The maximum number of io-extenders is 5, as you
++ * can't have more than 5 ZII boards in any Amiga.
++ */
++
++#define UART_CLK 7372800
++
++#define IOEXT_BAUD_BASE (UART_CLK / 16)
++
++#define IOEXT_MAX_LINES 2
++
++#define IOEXT_PAR_PLIP 0x0001
++#define IOEXT_PAR_LP 0x0002
++
++
++/*
++ * Macros for the serial driver.
++ */
++#define curruart(info) ((struct uart_16c550 *)(info->port))
++
++#define ser_DTRon(info) curruart(info)->MCR |= DTR
++#define ser_RTSon(info) curruart(info)->MCR |= RTS
++#define ser_DTRoff(info) curruart(info)->MCR &= ~DTR
++#define ser_RTSoff(info) curruart(info)->MCR &= ~RTS
++
++
++/*
++ * CNTR defines (copied from the GVP SCSI-driver file gvp11.h
++ */
++#define GVP_BUSY (1<<0)
++#define GVP_IRQ_PEND (1<<1)
++#define GVP_IRQ_ENA (1<<3)
++#define GVP_DIR_WRITE (1<<4)
++
++
++/*
++ * CTRL defines
++ */
++#define PORT0_MIDI (1<<0) /* CLR = DRIVERS SET = MIDI */
++#define PORT1_MIDI (1<<1) /* CLR = DRIVERS SET = MIDI */
++#define PORT0_DRIVER (1<<2) /* CLR = RS232, SET = MIDI */
++#define PORT1_DRIVER (1<<3) /* CLR = RS232, SET = MIDI */
++#define IRQ_SEL (1<<4) /* CLR = INT2, SET = INT6 */
++#define ROM_BANK_SEL (1<<5) /* CLR = LOW 32K, SET = HIGH 32K */
++#define PORT0_CTRL (1<<6) /* CLR = RTSx or RXRDYx, SET = RTSx ONLY */
++#define PORT1_CTRL (1<<7) /* CLR = RTSx or RXRDYx, SET = RTSx ONLY */
++
++
++/*
++ * This is the struct describing the registers on the IO-Extender.
++ * NOTE: The board uses a dual uart (16c552), which should be equal to
++ * two 16c550 uarts.
++ */
++typedef struct {
++ char gap0[0x41];
++ volatile unsigned char CNTR; /* GVP DMAC CNTR (status register) */
++ char gap1[0x11e];
++ struct uart_16c550 uart0; /* The first uart */
++ char gap2[0xf0];
++ struct uart_16c550 uart1; /* The second uart */
++ char gap3[0xf0];
++ struct IOEXT_par par; /* The parallel port */
++ char gap4[0xfb];
++ volatile unsigned char CTRL; /* The control-register on the board */
++} IOEXT_struct;
++
++
++typedef struct {
++ int num_uarts;
++ int line[IOEXT_MAX_LINES];
++ volatile struct uart_16c550 *uart[IOEXT_MAX_LINES];
++ IOEXT_struct *board;
++ int spurious_count;
++ unsigned char par_use; /* IOEXT_PAR_xxx */
++#if defined(CONFIG_GVPIOEXT_PLIP) || defined(CONFIG_GVPIOEXT_PLIP_MODULE)
++ struct nt_device *dev;
++#endif
++#if defined(CONFIG_GVPIOEXT_LP) || defined(CONFIG_GVPIOEXT_LP_MODULE)
++ struct lp_struct *lp_table;
++ int lp_dev;
++ int lp_interrupt;
++#endif
++} IOExtInfoType;
++
++/* Number of detected boards. */
++extern int ioext_num;
++extern IOExtInfoType ioext_info[MAX_IOEXT];
++
++void ioext_plip_interrupt(struct net_device *dev, int *spurious_count);
++void ioext_lp_interrupt(int dev, int *spurious_count);
++
++extern struct net_device ioext_dev_plip[3];
++extern struct lp_struct ioext_lp_table[1];
++
++#endif
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/mc68681.h linux-2.6.13/drivers/char/mc68681.h
+--- linux-2.6.13-i386/drivers/char/mc68681.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13/drivers/char/mc68681.h 2001-10-22 11:34:32.000000000 +0200
+@@ -0,0 +1,131 @@
++#ifndef _MC68681_H_
++#define _MC68681_H_
++
++/*
++ * This describes an MC68681 DUART. It has almost only overlayed registers, which
++ * the structure very ugly.
++ * Note that the ri-register isn't really a register of the duart but a kludge of bsc
++ * to make the ring indicator available.
++ *
++ * The data came from the MFC-31-Developer Kit (from Ralph Seidel,
++ * zodiac at darkness.gun.de) and the data sheet of Phillip's clone device (SCN68681)
++ * (from Richard Hirst, srh at gpt.co.uk)
++ *
++ * 11.11.95 copyright Joerg Dorchain (dorchain at mpi-sb.mpg.de)
++ *
++ */
++
++struct duarthalf {
++union {
++volatile u_char mr1; /* rw */
++volatile u_char mr2; /* rw */
++} mr;
++volatile u_char ri; /* special, read */
++union {
++volatile u_char sr; /* read */
++volatile u_char csr; /* write */
++} sr_csr;
++u_char pad1;
++volatile u_char cr; /* write */
++u_char pad2;
++union {
++volatile u_char rhr; /* read */
++volatile u_char thr; /* write */
++} hr;
++u_char pad3;
++};
++
++struct duart {
++struct duarthalf pa;
++union {
++volatile u_char ipcr; /* read */
++volatile u_char acr; /* write */
++} ipcr_acr;
++u_char pad1;
++union {
++volatile u_char isr; /* read */
++volatile u_char imr; /* write */
++} ir;
++u_char pad2;
++volatile u_char ctu;
++u_char pad3;
++volatile u_char ctl;
++u_char pad4;
++struct duarthalf pb;
++volatile u_char ivr;
++u_char pad5;
++union {
++volatile u_char ipr; /* read */
++volatile u_char opcr; /* write */
++} ipr_opcr;
++u_char pad6;
++union {
++volatile u_char start; /* read */
++volatile u_char sopc; /* write */
++} start_sopc;
++u_char pad7;
++union {
++volatile u_char stop; /* read */
++volatile u_char ropc; /* write */
++} stop_ropc;
++u_char pad8;
++};
++
++#define MR1_BITS 3
++#define MR1_5BITS 0
++#define MR1_6BITS 1
++#define MR1_7BITS 2
++#define MR1_8BITS 3
++
++#define MR1_PARITY_ODD 4
++
++#define MR1_PARITY 24
++#define MR1_PARITY_WITH 0
++#define MR1_PARITY_FORCE 8
++#define MR1_PARITY_NO 16
++#define MR1_PARITY_MULTIDROP 24
++
++#define MR1_ERROR_BLOCK 32
++#define MR1_FFULL_IRQ 64
++#define MR1_RxRTS_ON 128
++
++#define MR2_STOPS 15
++#define MR2_1STOP 7
++#define MR2_2STOP 15
++
++#define MR2_CTS_ON 16
++#define MR2_TxRTS_ON 32
++
++#define MR2_MODE 192
++#define MR2_NORMAL 0
++#define MR2_ECHO 64
++#define MR2_LOCALLOOP 128
++#define MR2_REMOTELOOP 192
++
++#define CR_RXCOMMAND 3
++#define CR_NONE 0
++#define CR_RX_ON 1
++#define CR_RX_OFF 2
++#define CR_TXCOMMAND 12
++#define CR_TX_ON 4
++#define CR_TX_OFF 8
++#define CR_MISC 112
++#define CR_RESET_MR 16
++#define CR_RESET_RX 32
++#define CR_RESET_TX 48
++#define CR_RESET_ERR 64
++#define CR_RESET_BREAK 80
++#define CR_START_BREAK 96
++#define CR_STOP_BREAK 112
++
++#define SR_RXRDY 1
++#define SR_FFULL 2
++#define SR_TXRDY 4
++#define SR_TXEMPT 8
++#define SR_OVERRUN 16
++#define SR_PARITY 32
++#define SR_FRAMING 64
++#define SR_BREAK 128
++
++
++#endif
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/plip_ioext.c linux-2.6.13/drivers/char/plip_ioext.c
+--- linux-2.6.13-i386/drivers/char/plip_ioext.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.13/drivers/char/plip_ioext.c 2004-10-25 16:38:25.000000000 +0200
+@@ -0,0 +1,1058 @@
++/*
++ * plip_ioext: A parallel port "network" driver for GVP IO-Extender.
++ *
++ * Authors: See drivers/net/plip.c
++ * IO-Extender version by Steve Bennett, <msteveb at ozemail.com.au>
++ *
++ * This driver is for use with a 5-bit cable (LapLink (R) cable).
++ */
++
++static const char *version = "NET3 PLIP version 2.2/m68k";
++
++#define __NO_VERSION__
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/sched.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/slab.h>
++#include <linux/termios.h>
++#include <linux/tty.h>
++#include <linux/serial.h>
++
++#include <asm/setup.h>
++#include <asm/irq.h>
++#include <asm/amigahw.h>
++#include <asm/amigaints.h>
++#include <linux/zorro.h>
++
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/fcntl.h>
++#include <linux/string.h>
++#include <linux/ptrace.h>
++#include <linux/if_ether.h>
++
++#include <asm/system.h>
++
++#include <linux/in.h>
++#include <linux/delay.h>
++/*#include <linux/lp_m68k.h>*/
++
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/inetdevice.h>
++#include <linux/skbuff.h>
++#include <linux/if_plip.h>
++
++#include <linux/tqueue.h>
++#include <linux/ioport.h>
++#include <linux/bitops.h>
++#include <asm/byteorder.h>
++
++#include "ioext.h"
++
++#define DEBUG 0
++
++/* Map 'struct device *' to our control structure */
++#define PLIP_DEV(DEV) (&ioext_info[(DEV)->irq])
++
++/************************************************************************
++**
++** PLIP definitions
++**
++*************************************************************************
++*/
++
++/* Use 0 for production, 1 for verification, >2 for debug */
++#ifndef NET_DEBUG
++#define NET_DEBUG 2
++#endif
++static unsigned int net_debug = NET_DEBUG;
++
++/* In micro second */
++#define PLIP_DELAY_UNIT 1
++
++/* Connection time out = PLIP_TRIGGER_WAIT * PLIP_DELAY_UNIT usec */
++#define PLIP_TRIGGER_WAIT 500
++
++/* Nibble time out = PLIP_NIBBLE_WAIT * PLIP_DELAY_UNIT usec */
++#define PLIP_NIBBLE_WAIT 3000
++
++#define PAR_DATA(dev) ((dev)->base_addr+0)
++#define PAR_STATUS(dev) ((dev)->base_addr+2)
++#define PAR_CONTROL(dev) ((dev)->base_addr+4)
++
++static void enable_par_irq(struct device *dev, int on);
++static int plip_init(struct device *dev);
++
++/* Bottom halfs */
++static void plip_kick_bh(struct device *dev);
++static void plip_bh(struct device *dev);
++
++/* Functions for DEV methods */
++static int plip_rebuild_header(struct sk_buff *skb);
++static int plip_tx_packet(struct sk_buff *skb, struct device *dev);
++static int plip_open(struct device *dev);
++static int plip_close(struct device *dev);
++static struct enet_statistics *plip_get_stats(struct device *dev);
++static int plip_config(struct device *dev, struct ifmap *map);
++static int plip_ioctl(struct device *dev, struct ifreq *ifr, int cmd);
++
++enum plip_connection_state {
++ PLIP_CN_NONE=0,
++ PLIP_CN_RECEIVE,
++ PLIP_CN_SEND,
++ PLIP_CN_CLOSING,
++ PLIP_CN_ERROR
++};
++
++enum plip_packet_state {
++ PLIP_PK_DONE=0,
++ PLIP_PK_TRIGGER,
++ PLIP_PK_LENGTH_LSB,
++ PLIP_PK_LENGTH_MSB,
++ PLIP_PK_DATA,
++ PLIP_PK_CHECKSUM
++};
++
++enum plip_nibble_state {
++ PLIP_NB_BEGIN,
++ PLIP_NB_1,
++ PLIP_NB_2,
++};
++
++struct plip_local {
++ enum plip_packet_state state;
++ enum plip_nibble_state nibble;
++ union {
++ struct {
++#if defined(__LITTLE_ENDIAN)
++ unsigned char lsb;
++ unsigned char msb;
++#elif defined(__BIG_ENDIAN)
++ unsigned char msb;
++ unsigned char lsb;
++#else
++#error "Please fix the endianness defines in <asm/byteorder.h>"
++#endif
++ } b;
++ unsigned short h;
++ } length;
++ unsigned short byte;
++ unsigned char checksum;
++ unsigned char data;
++ struct sk_buff *skb;
++};
++
++struct net_local {
++ struct enet_statistics enet_stats;
++ struct tq_struct immediate;
++ struct tq_struct deferred;
++ struct plip_local snd_data;
++ struct plip_local rcv_data;
++ unsigned long trigger;
++ unsigned long nibble;
++ enum plip_connection_state connection;
++ unsigned short timeout_count;
++ char is_deferred;
++ int (*orig_rebuild_header)(struct sk_buff *skb);
++};
++
++struct device ioext_dev_plip[] = {
++ {
++ "plip0",
++ 0, 0, 0, 0, /* memory */
++ 0, 0, /* base, irq */
++ 0, 0, 0, NULL, plip_init
++ },
++ {
++ "plip1",
++ 0, 0, 0, 0, /* memory */
++ 0, 0, /* base, irq */
++ 0, 0, 0, NULL, plip_init
++ },
++ {
++ "plip2",
++ 0, 0, 0, 0, /* memory */
++ 0, 0, /* base, irq */
++ 0, 0, 0, NULL, plip_init
++ }
++};
++
++/*
++ * Check for and handle an interrupt for this PLIP device.
++ *
++ */
++void ioext_plip_interrupt(struct device *dev, int *spurious_count)
++{
++ struct net_local *nl;
++ struct plip_local *rcv;
++ unsigned char c0;
++ unsigned long flags;
++
++ nl = (struct net_local *)dev->priv;
++ rcv = &nl->rcv_data;
++
++ c0 = z_readb(PAR_STATUS(dev));
++
++ if (dev->interrupt) {
++ return;
++ }
++
++ if ((c0 & 0xf8) != 0xc0) {
++ /* Not for us */
++ ++*spurious_count;
++ return;
++ }
++
++ *spurious_count = 0;
++ dev->interrupt = 1;
++
++ local_irq_save(flags);
++
++ switch (nl->connection) {
++ case PLIP_CN_CLOSING:
++ dev->tbusy = 0;
++ case PLIP_CN_NONE:
++ case PLIP_CN_SEND:
++ dev->last_rx = jiffies;
++ rcv->state = PLIP_PK_TRIGGER;
++ nl->connection = PLIP_CN_RECEIVE;
++ nl->timeout_count = 0;
++ queue_task(&nl->immediate, &tq_immediate);
++ mark_bh(IMMEDIATE_BH);
++ local_irq_restore(flags);
++#if 0
++ printk("%s: receive irq in SEND/NONE/CLOSING (%d) ok\n",
++ dev->name, nl->connection);
++#endif
++ break;
++
++ case PLIP_CN_RECEIVE:
++ local_irq_restore(flags);
++ printk("%s: receive interrupt when receiving packet\n",
++ dev->name);
++ break;
++
++ case PLIP_CN_ERROR:
++ local_irq_restore(flags);
++ printk("%s: receive interrupt in error state\n", dev->name);
++ break;
++ }
++}
++
++
++/* Bottom half handler for the delayed request.
++ This routine is kicked by do_timer().
++ Request `plip_bh' to be invoked. */
++static void
++plip_kick_bh(struct device *dev)
++{
++ struct net_local *nl = (struct net_local *)dev->priv;
++
++ if (nl->is_deferred) {
++ queue_task(&nl->immediate, &tq_immediate);
++ mark_bh(IMMEDIATE_BH);
++ }
++}
++
++/* Forward declarations of internal routines */
++static int plip_none(struct device *, struct net_local *,
++ struct plip_local *, struct plip_local *);
++static int plip_receive_packet(struct device *, struct net_local *,
++ struct plip_local *, struct plip_local *);
++static int plip_send_packet(struct device *, struct net_local *,
++ struct plip_local *, struct plip_local *);
++static int plip_connection_close(struct device *, struct net_local *,
++ struct plip_local *, struct plip_local *);
++static int plip_error(struct device *, struct net_local *,
++ struct plip_local *, struct plip_local *);
++static int plip_bh_timeout_error(struct device *dev, struct net_local *nl,
++ struct plip_local *snd,
++ struct plip_local *rcv,
++ int error);
++
++#define OK 0
++#define TIMEOUT 1
++#define ERROR 2
++
++typedef int (*plip_func)(struct device *dev, struct net_local *nl,
++ struct plip_local *snd, struct plip_local *rcv);
++
++static plip_func connection_state_table[] =
++{
++ plip_none,
++ plip_receive_packet,
++ plip_send_packet,
++ plip_connection_close,
++ plip_error
++};
++
++/*
++** enable_par_irq()
++**
++** Enable or disable parallel irq for 'dev' according to 'on'.
++**
++** It is NOT possible to disable only the parallel irq.
++** So we disable the board interrupt instead. This means that
++** during reception of a PLIP packet, no serial interrupts can
++** happen. Sorry.
++*/
++static void enable_par_irq(struct device *dev, int on)
++{
++ if (on) {
++ PLIP_DEV(dev)->board->CNTR |= GVP_IRQ_ENA;
++ }
++ else {
++ PLIP_DEV(dev)->board->CNTR &= ~GVP_IRQ_ENA;
++ }
++}
++
++/* Bottom half handler of PLIP. */
++static void
++plip_bh(struct device *dev)
++{
++ struct net_local *nl = (struct net_local *)dev->priv;
++ struct plip_local *snd = &nl->snd_data;
++ struct plip_local *rcv = &nl->rcv_data;
++ plip_func f;
++ int r;
++
++ nl->is_deferred = 0;
++ f = connection_state_table[nl->connection];
++ if ((r = (*f)(dev, nl, snd, rcv)) != OK
++ && (r = plip_bh_timeout_error(dev, nl, snd, rcv, r)) != OK) {
++ nl->is_deferred = 1;
++ queue_task(&nl->deferred, &tq_timer);
++ }
++}
++
++static int
++plip_bh_timeout_error(struct device *dev, struct net_local *nl,
++ struct plip_local *snd, struct plip_local *rcv,
++ int error)
++{
++ unsigned char c0;
++ unsigned long flags;
++
++ local_irq_save(flags);
++ if (nl->connection == PLIP_CN_SEND) {
++
++ if (error != ERROR) { /* Timeout */
++ nl->timeout_count++;
++ if ((snd->state == PLIP_PK_TRIGGER
++ && nl->timeout_count <= 10)
++ || nl->timeout_count <= 3) {
++ local_irq_restore(flags);
++ /* Try again later */
++ return TIMEOUT;
++ }
++ c0 = z_readb(PAR_STATUS(dev));
++ printk(KERN_INFO "%s: transmit timeout(%d,%02x)\n",
++ dev->name, snd->state, c0);
++ }
++ nl->enet_stats.tx_errors++;
++ nl->enet_stats.tx_aborted_errors++;
++ } else if (nl->connection == PLIP_CN_RECEIVE) {
++ if (rcv->state == PLIP_PK_TRIGGER) {
++ /* Transmission was interrupted. */
++ local_irq_restore(flags);
++ return OK;
++ }
++ if (error != ERROR) { /* Timeout */
++ if (++nl->timeout_count <= 3) {
++ local_irq_restore(flags);
++ /* Try again later */
++ return TIMEOUT;
++ }
++ c0 = z_readb(PAR_STATUS(dev));
++ printk(KERN_INFO "%s: receive timeout(%d,%02x)\n",
++ dev->name, rcv->state, c0);
++ }
++ nl->enet_stats.rx_dropped++;
++ }
++ rcv->state = PLIP_PK_DONE;
++ if (rcv->skb) {
++ kfree_skb(rcv->skb);
++ rcv->skb = NULL;
++ }
++ snd->state = PLIP_PK_DONE;
++ if (snd->skb) {
++ dev_kfree_skb(snd->skb);
++ snd->skb = NULL;
++ }
++ enable_par_irq(dev, 0);
++ dev->tbusy = 1;
++ nl->connection = PLIP_CN_ERROR;
++ z_writeb(0x00, PAR_DATA(dev));
++ local_irq_restore(flags);
++
++ return TIMEOUT;
++}
++
++static int
++plip_none(struct device *dev, struct net_local *nl,
++ struct plip_local *snd, struct plip_local *rcv)
++{
++ return OK;
++}
++
++/* PLIP_RECEIVE --- receive a byte(two nibbles)
++ Returns OK on success, TIMEOUT on timeout */
++inline static int
++plip_receive(struct device *dev, unsigned short nibble_timeout,
++ enum plip_nibble_state *ns_p, unsigned char *data_p)
++{
++ unsigned char c0, c1;
++ unsigned int cx;
++
++ switch (*ns_p) {
++ case PLIP_NB_BEGIN:
++ cx = nibble_timeout;
++ while (1) {
++ c0 = z_readb(PAR_STATUS(dev));
++ udelay(PLIP_DELAY_UNIT);
++ if ((c0 & 0x80) == 0) {
++ c1 = z_readb(PAR_STATUS(dev));
++ if (c0 == c1)
++ break;
++ }
++ if (--cx == 0)
++ return TIMEOUT;
++ }
++#if 0
++ printk("received first nybble: %02X -> %02X\n",
++ c0, (c0 >> 3) & 0x0F);
++#endif
++ *data_p = (c0 >> 3) & 0x0f;
++ z_writeb(0x10, PAR_DATA(dev)); /* send ACK */
++ *ns_p = PLIP_NB_1;
++
++ case PLIP_NB_1:
++ cx = nibble_timeout;
++ while (1) {
++ c0 = z_readb(PAR_STATUS(dev));
++ udelay(PLIP_DELAY_UNIT);
++ if (c0 & 0x80) {
++ c1 = z_readb(PAR_STATUS(dev));
++ if (c0 == c1)
++ break;
++ }
++ if (--cx == 0)
++ return TIMEOUT;
++ }
++#if 0
++ printk("received second nybble: %02X -> %02X\n",
++ c0, (c0 << 1) & 0xF0);
++#endif
++ *data_p |= (c0 << 1) & 0xf0;
++ z_writeb(0x00, PAR_DATA(dev)); /* send ACK */
++ *ns_p = PLIP_NB_BEGIN;
++ case PLIP_NB_2:
++ break;
++ }
++ return OK;
++}
++
++/* PLIP_RECEIVE_PACKET --- receive a packet */
++static int
++plip_receive_packet(struct device *dev, struct net_local *nl,
++ struct plip_local *snd, struct plip_local *rcv)
++{
++ unsigned short nibble_timeout = nl->nibble;
++ unsigned char *lbuf;
++ unsigned long flags;
++
++ switch (rcv->state) {
++ case PLIP_PK_TRIGGER:
++ enable_par_irq(dev, 0);
++ dev->interrupt = 0;
++ z_writeb(0x01, PAR_DATA(dev)); /* send ACK */
++ if (net_debug > 2)
++ printk(KERN_DEBUG "%s: receive start\n", dev->name);
++ rcv->state = PLIP_PK_LENGTH_LSB;
++ rcv->nibble = PLIP_NB_BEGIN;
++
++ case PLIP_PK_LENGTH_LSB:
++ if (snd->state != PLIP_PK_DONE) {
++ if (plip_receive(dev, nl->trigger,
++ &rcv->nibble, &rcv->length.b.lsb)) {
++ /* collision, here dev->tbusy == 1 */
++ rcv->state = PLIP_PK_DONE;
++ nl->is_deferred = 1;
++ nl->connection = PLIP_CN_SEND;
++ queue_task(&nl->deferred, &tq_timer);
++ enable_par_irq(dev, 1);
++ return OK;
++ }
++ } else {
++ if (plip_receive(dev, nibble_timeout,
++ &rcv->nibble, &rcv->length.b.lsb))
++ return TIMEOUT;
++ }
++ rcv->state = PLIP_PK_LENGTH_MSB;
++
++ case PLIP_PK_LENGTH_MSB:
++ if (plip_receive(dev, nibble_timeout,
++ &rcv->nibble, &rcv->length.b.msb))
++ return TIMEOUT;
++ if (rcv->length.h > dev->mtu + dev->hard_header_len
++ || rcv->length.h < 8) {
++ printk(KERN_INFO "%s: bogus packet size %d.\n",
++ dev->name, rcv->length.h);
++ return ERROR;
++ }
++ /* Malloc up new buffer. */
++ rcv->skb = dev_alloc_skb(rcv->length.h);
++ if (rcv->skb == NULL) {
++ printk(KERN_INFO "%s: Memory squeeze.\n", dev->name);
++ return ERROR;
++ }
++ skb_put(rcv->skb,rcv->length.h);
++ rcv->skb->dev = dev;
++ rcv->state = PLIP_PK_DATA;
++ rcv->byte = 0;
++ rcv->checksum = 0;
++
++ case PLIP_PK_DATA:
++ lbuf = rcv->skb->data;
++ do
++ if (plip_receive(dev, nibble_timeout,
++ &rcv->nibble, &lbuf[rcv->byte]))
++ return TIMEOUT;
++ while (++rcv->byte < rcv->length.h);
++ do
++ rcv->checksum += lbuf[--rcv->byte];
++ while (rcv->byte);
++ rcv->state = PLIP_PK_CHECKSUM;
++
++ case PLIP_PK_CHECKSUM:
++ if (plip_receive(dev, nibble_timeout,
++ &rcv->nibble, &rcv->data))
++ return TIMEOUT;
++ if (rcv->data != rcv->checksum) {
++ nl->enet_stats.rx_crc_errors++;
++ if (net_debug)
++ printk(KERN_INFO "%s: checksum error\n",
++ dev->name);
++ return ERROR;
++ }
++ rcv->state = PLIP_PK_DONE;
++
++ case PLIP_PK_DONE:
++ /* Inform the upper layer for the arrival of a packet. */
++ rcv->skb->protocol=eth_type_trans(rcv->skb, dev);
++ netif_rx(rcv->skb);
++ nl->enet_stats.rx_packets++;
++ rcv->skb = NULL;
++ if (net_debug > 2)
++ printk(KERN_DEBUG "%s: receive end\n", dev->name);
++
++ /* Close the connection. */
++ z_writeb (0x00, PAR_DATA(dev));
++
++ local_irq_save(flags);
++ if (snd->state != PLIP_PK_DONE) {
++ nl->connection = PLIP_CN_SEND;
++ local_irq_restore(flags);
++ queue_task(&nl->immediate, &tq_immediate);
++ mark_bh(IMMEDIATE_BH);
++ enable_par_irq(dev, 1);
++ return OK;
++ } else {
++ nl->connection = PLIP_CN_NONE;
++ local_irq_restore(flags);
++ enable_par_irq(dev, 1);
++ return OK;
++ }
++ }
++ return OK;
++}
++
++/* PLIP_SEND --- send a byte (two nibbles)
++ Returns OK on success, TIMEOUT when timeout */
++inline static int
++plip_send(struct device *dev, unsigned short nibble_timeout,
++ enum plip_nibble_state *ns_p, unsigned char data)
++{
++ unsigned char c0;
++ unsigned int cx;
++
++ switch (*ns_p) {
++ case PLIP_NB_BEGIN:
++ z_writeb((data & 0x0f), PAR_DATA(dev));
++ *ns_p = PLIP_NB_1;
++
++ case PLIP_NB_1:
++ z_writeb(0x10 | (data & 0x0f), PAR_DATA(dev));
++ cx = nibble_timeout;
++ while (1) {
++ c0 = z_readb(PAR_STATUS(dev));
++ if ((c0 & 0x80) == 0)
++ break;
++ if (--cx == 0)
++ return TIMEOUT;
++ udelay(PLIP_DELAY_UNIT);
++ }
++ z_writeb(0x10 | (data >> 4), PAR_DATA(dev));
++ *ns_p = PLIP_NB_2;
++
++ case PLIP_NB_2:
++ z_writeb((data >> 4), PAR_DATA(dev));
++ cx = nibble_timeout;
++ while (1) {
++ c0 = z_readb(PAR_STATUS(dev));
++ if (c0 & 0x80)
++ break;
++ if (--cx == 0)
++ return TIMEOUT;
++ udelay(PLIP_DELAY_UNIT);
++ }
++ *ns_p = PLIP_NB_BEGIN;
++ return OK;
++ }
++ return OK;
++}
++
++/* PLIP_SEND_PACKET --- send a packet */
++static int
++plip_send_packet(struct device *dev, struct net_local *nl,
++ struct plip_local *snd, struct plip_local *rcv)
++{
++ unsigned short nibble_timeout = nl->nibble;
++ unsigned char *lbuf;
++ unsigned char c0;
++ unsigned int cx;
++ unsigned long flags;
++
++ if (snd->skb == NULL || (lbuf = snd->skb->data) == NULL) {
++ printk(KERN_INFO "%s: send skb lost\n", dev->name);
++ snd->state = PLIP_PK_DONE;
++ snd->skb = NULL;
++ return ERROR;
++ }
++
++ if (snd->length.h == 0) {
++ return OK;
++ }
++
++ switch (snd->state) {
++ case PLIP_PK_TRIGGER:
++ if ((z_readb(PAR_STATUS(dev)) & 0xf8) != 0x80)
++ return TIMEOUT;
++
++ /* Trigger remote rx interrupt. */
++ z_writeb(0x08, PAR_DATA(dev));
++ cx = nl->trigger;
++ while (1) {
++ udelay(PLIP_DELAY_UNIT);
++ local_irq_save(flags);
++ if (nl->connection == PLIP_CN_RECEIVE) {
++ local_irq_restore(flags);
++ /* interrupted */
++ nl->enet_stats.collisions++;
++ if (net_debug > 1)
++ printk(KERN_INFO "%s: collision.\n",
++ dev->name);
++ return OK;
++ }
++ c0 = z_readb(PAR_STATUS(dev));
++ if (c0 & 0x08) {
++ enable_par_irq(dev, 0);
++ if (net_debug > 2)
++ printk(KERN_DEBUG "%s: send start\n",
++ dev->name);
++ snd->state = PLIP_PK_LENGTH_LSB;
++ snd->nibble = PLIP_NB_BEGIN;
++ nl->timeout_count = 0;
++ local_irq_restore(flags);
++ break;
++ }
++ local_irq_restore(flags);
++ if (--cx == 0) {
++ z_writeb(0x00, PAR_DATA(dev));
++ return TIMEOUT;
++ }
++ }
++
++ case PLIP_PK_LENGTH_LSB:
++ if (plip_send(dev, nibble_timeout,
++ &snd->nibble, snd->length.b.lsb))
++ return TIMEOUT;
++ snd->state = PLIP_PK_LENGTH_MSB;
++
++ case PLIP_PK_LENGTH_MSB:
++ if (plip_send(dev, nibble_timeout,
++ &snd->nibble, snd->length.b.msb))
++ return TIMEOUT;
++ snd->state = PLIP_PK_DATA;
++ snd->byte = 0;
++ snd->checksum = 0;
++
++ case PLIP_PK_DATA:
++ do
++ if (plip_send(dev, nibble_timeout,
++ &snd->nibble, lbuf[snd->byte]))
++ return TIMEOUT;
++ while (++snd->byte < snd->length.h);
++ do
++ snd->checksum += lbuf[--snd->byte];
++ while (snd->byte);
++ snd->state = PLIP_PK_CHECKSUM;
++
++ case PLIP_PK_CHECKSUM:
++ if (plip_send(dev, nibble_timeout,
++ &snd->nibble, snd->checksum))
++ return TIMEOUT;
++
++ dev_kfree_skb(snd->skb);
++ nl->enet_stats.tx_packets++;
++ snd->state = PLIP_PK_DONE;
++
++ case PLIP_PK_DONE:
++ /* Close the connection */
++ z_writeb (0x00, PAR_DATA(dev));
++ snd->skb = NULL;
++ if (net_debug > 2)
++ printk(KERN_DEBUG "%s: send end\n", dev->name);
++ nl->connection = PLIP_CN_CLOSING;
++ nl->is_deferred = 1;
++ queue_task(&nl->deferred, &tq_timer);
++ enable_par_irq(dev, 1);
++ return OK;
++ }
++ return OK;
++}
++
++static int
++plip_connection_close(struct device *dev, struct net_local *nl,
++ struct plip_local *snd, struct plip_local *rcv)
++{
++ unsigned long flags;
++
++ local_irq_save(flags);
++ if (nl->connection == PLIP_CN_CLOSING) {
++ nl->connection = PLIP_CN_NONE;
++ dev->tbusy = 0;
++ mark_bh(NET_BH);
++ }
++ local_irq_restore(flags);
++ return OK;
++}
++
++/* PLIP_ERROR --- wait till other end settled */
++static int
++plip_error(struct device *dev, struct net_local *nl,
++ struct plip_local *snd, struct plip_local *rcv)
++{
++ unsigned char status;
++
++ status = z_readb(PAR_STATUS(dev));
++ if ((status & 0xf8) == 0x80) {
++ if (net_debug > 2)
++ printk(KERN_DEBUG "%s: reset interface.\n", dev->name);
++ nl->connection = PLIP_CN_NONE;
++ dev->tbusy = 0;
++ dev->interrupt = 0;
++ enable_par_irq(dev, 1);
++ mark_bh(NET_BH);
++ } else {
++ nl->is_deferred = 1;
++ queue_task(&nl->deferred, &tq_timer);
++ }
++
++ return OK;
++}
++
++/* We don't need to send arp, for plip is point-to-point. */
++static int
++plip_rebuild_header(struct sk_buff *skb)
++{
++ struct device *dev = skb->dev;
++ struct net_local *nl = (struct net_local *)dev->priv;
++ struct ethhdr *eth = (struct ethhdr *)skb->data;
++ int i;
++
++ if ((dev->flags & IFF_NOARP)==0)
++ return nl->orig_rebuild_header(skb);
++
++ if (eth->h_proto != __constant_htons(ETH_P_IP)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++ && eth->h_proto != __constant_htons(ETH_P_IPV6)
++#endif
++ ) {
++ printk(KERN_ERR "plip_rebuild_header: Don't know how to resolve type %d addresses?\n", (int)eth->h_proto);
++ memcpy(eth->h_source, dev->dev_addr, dev->addr_len);
++ return 0;
++ }
++
++ for (i=0; i < ETH_ALEN - sizeof(u32); i++)
++ eth->h_dest[i] = 0xfc;
++#if 0
++ *(u32 *)(eth->h_dest+i) = dst;
++#else
++ /* Do not want to include net/route.h here.
++ * In any case, it is TOP of silliness to emulate
++ * hardware addresses on PtP link. --ANK
++ */
++ *(u32 *)(eth->h_dest+i) = 0;
++#endif
++ return 0;
++}
++
++static int
++plip_tx_packet(struct sk_buff *skb, struct device *dev)
++{
++ struct net_local *nl = (struct net_local *)dev->priv;
++ struct plip_local *snd = &nl->snd_data;
++ unsigned long flags;
++
++ if (dev->tbusy)
++ return 1;
++
++ if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) {
++ printk(KERN_ERR "%s: Transmitter access conflict.\n",
++ dev->name);
++ return 1;
++ }
++
++ if (skb->len > dev->mtu + dev->hard_header_len) {
++ printk(KERN_ERR "%s: packet too big, %d.\n",
++ dev->name, (int)skb->len);
++ dev->tbusy = 0;
++ return 0;
++ }
++
++ if (net_debug > 2)
++ printk(KERN_DEBUG "%s: send request\n", dev->name);
++
++ local_irq_save(flags);
++ dev->trans_start = jiffies;
++ snd->skb = skb;
++ snd->length.h = skb->len;
++ snd->state = PLIP_PK_TRIGGER;
++ if (nl->connection == PLIP_CN_NONE) {
++ nl->connection = PLIP_CN_SEND;
++ nl->timeout_count = 0;
++ }
++ queue_task(&nl->immediate, &tq_immediate);
++ mark_bh(IMMEDIATE_BH);
++ local_irq_restore(flags);
++
++ return 0;
++}
++
++/* Open/initialize the board. This is called (in the current kernel)
++ sometime after booting when the 'ifconfig' program is run.
++
++ */
++static int
++plip_open(struct device *dev)
++{
++ struct net_local *nl = (struct net_local *)dev->priv;
++ struct in_device *in_dev;
++
++#if defined(CONFIG_GVPIOEXT_LP) || defined(CONFIG_GVPIOEXT_LP_MODULE)
++ /* Yes, there is a race condition here. Fix it later */
++ if (PLIP_DEV(dev)->par_use & IOEXT_PAR_LP) {
++ /* Can't open if lp is in use */
++#if DEBUG
++ printk("par is in use by lp\n");
++#endif
++ return(-EBUSY);
++ }
++#endif
++ PLIP_DEV(dev)->par_use |= IOEXT_PAR_PLIP;
++
++#if DEBUG
++ printk("plip_open(): sending 00 to data port\n");
++#endif
++
++ /* Clear the data port. */
++ z_writeb (0x00, PAR_DATA(dev));
++
++#if DEBUG
++ printk("plip_open(): sent\n");
++#endif
++
++ /* Initialize the state machine. */
++ nl->rcv_data.state = nl->snd_data.state = PLIP_PK_DONE;
++ nl->rcv_data.skb = nl->snd_data.skb = NULL;
++ nl->connection = PLIP_CN_NONE;
++ nl->is_deferred = 0;
++
++ /* Fill in the MAC-level header.
++ (ab)Use "dev->broadcast" to store point-to-point MAC address.
++
++ PLIP doesn't have a real mac address, but we need to create one
++ to be DOS compatible. */
++ memset(dev->dev_addr, 0xfc, ETH_ALEN);
++ memset(dev->broadcast, 0xfc, ETH_ALEN);
++
++ if ((in_dev=dev->ip_ptr) != NULL) {
++ /*
++ * Any address will do - we take the first
++ */
++ struct in_ifaddr *ifa=in_dev->ifa_list;
++ if (ifa != NULL) {
++ memcpy(dev->dev_addr+2, &ifa->ifa_local, 4);
++ memcpy(dev->broadcast+2, &ifa->ifa_address, 4);
++ }
++ }
++
++ dev->interrupt = 0;
++ dev->start = 1;
++ dev->tbusy = 0;
++
++ MOD_INC_USE_COUNT;
++
++ /* Enable rx interrupt. */
++ enable_par_irq(dev, 1);
++
++ return 0;
++}
++
++/* The inverse routine to plip_open (). */
++static int
++plip_close(struct device *dev)
++{
++ struct net_local *nl = (struct net_local *)dev->priv;
++ struct plip_local *snd = &nl->snd_data;
++ struct plip_local *rcv = &nl->rcv_data;
++ unsigned long flags;
++
++ dev->tbusy = 1;
++ dev->start = 0;
++ local_irq_save(flags);
++ nl->is_deferred = 0;
++ nl->connection = PLIP_CN_NONE;
++ local_irq_restore(flags);
++ z_writeb(0x00, PAR_DATA(dev));
++
++ snd->state = PLIP_PK_DONE;
++ if (snd->skb) {
++ dev_kfree_skb(snd->skb);
++ snd->skb = NULL;
++ }
++ rcv->state = PLIP_PK_DONE;
++ if (rcv->skb) {
++ kfree_skb(rcv->skb);
++ rcv->skb = NULL;
++ }
++
++ PLIP_DEV(dev)->par_use &= ~IOEXT_PAR_PLIP;
++
++ MOD_DEC_USE_COUNT;
++ return 0;
++}
++
++static struct enet_statistics *
++plip_get_stats(struct device *dev)
++{
++ struct net_local *nl = (struct net_local *)dev->priv;
++ struct enet_statistics *r = &nl->enet_stats;
++
++ return r;
++}
++
++static int
++plip_config(struct device *dev, struct ifmap *map)
++{
++ if (dev->flags & IFF_UP)
++ return -EBUSY;
++
++ printk(KERN_INFO "%s: This interface is autodetected (ignored).\n",
++ dev->name);
++
++ return 0;
++}
++
++static int
++plip_ioctl(struct device *dev, struct ifreq *rq, int cmd)
++{
++ struct net_local *nl = (struct net_local *) dev->priv;
++ struct plipconf *pc = (struct plipconf *) &rq->ifr_data;
++
++ switch(pc->pcmd) {
++ case PLIP_GET_TIMEOUT:
++ pc->trigger = nl->trigger;
++ pc->nibble = nl->nibble;
++ break;
++ case PLIP_SET_TIMEOUT:
++ nl->trigger = pc->trigger;
++ nl->nibble = pc->nibble;
++ break;
++ default:
++ return -EOPNOTSUPP;
++ }
++ return 0;
++}
++
++/*
++ * Detect and initialize all IO-Extenders in this system.
++ *
++ * Both PLIP and serial devices are configured.
++ */
++int plip_init(struct device *dev)
++{
++ IOEXT_struct *board;
++ struct net_local *nl;
++
++ if (ioext_num == 0) {
++ printk(KERN_INFO "%s\n", version);
++ }
++
++ board = PLIP_DEV(dev)->board;
++ dev->base_addr = (unsigned long)&board->par.DATA;
++
++ /* Cheat and use irq to index into our table */
++ dev->irq = ioext_num;
++
++ printk(KERN_INFO "%s: IO-Extender parallel port at 0x%08lX\n", dev->name, dev->base_addr);
++
++ /* Fill in the generic fields of the device structure. */
++ ether_setup(dev);
++
++ /* Then, override parts of it */
++ dev->hard_start_xmit = plip_tx_packet;
++ dev->open = plip_open;
++ dev->stop = plip_close;
++ dev->get_stats = plip_get_stats;
++ dev->set_config = plip_config;
++ dev->do_ioctl = plip_ioctl;
++ dev->tx_queue_len = 10;
++ dev->flags = IFF_POINTOPOINT|IFF_NOARP;
++
++ /* Set the private structure */
++ dev->priv = kmalloc(sizeof (struct net_local), GFP_KERNEL);
++ if (dev->priv == NULL) {
++ printk(KERN_ERR "%s: out of memory\n", dev->name);
++ return -ENOMEM;
++ }
++ memset(dev->priv, 0, sizeof(struct net_local));
++ nl = (struct net_local *) dev->priv;
++
++ nl->orig_rebuild_header = dev->rebuild_header;
++ dev->rebuild_header = plip_rebuild_header;
++
++ /* Initialize constants */
++ nl->trigger = PLIP_TRIGGER_WAIT;
++ nl->nibble = PLIP_NIBBLE_WAIT;
++
++ /* Initialize task queue structures */
++ nl->immediate.next = NULL;
++ nl->immediate.sync = 0;
++ nl->immediate.routine = (void *)(void *)plip_bh;
++ nl->immediate.data = dev;
++
++ nl->deferred.next = NULL;
++ nl->deferred.sync = 0;
++ nl->deferred.routine = (void *)(void *)plip_kick_bh;
++ nl->deferred.data = dev;
++
++ /* Don't enable interrupts yet */
++
++ return 0;
++}
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/char/serial167.c linux-2.6.13/drivers/char/serial167.c
+--- linux-2.6.13-i386/drivers/char/serial167.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/char/serial167.c 2005-10-12 16:32:10.000000000 +0200
+@@ -1450,7 +1450,6 @@
+ volatile unsigned char *base_addr = (u_char *)BASE_ADDR;
+ unsigned long flags;
+ unsigned char status;
+- unsigned int result;
+
+ channel = info->line;
+
+@@ -1474,7 +1473,6 @@
+ int channel;
+ volatile unsigned char *base_addr = (u_char *)BASE_ADDR;
+ unsigned long flags;
+- unsigned int arg;
+
+ channel = info->line;
+
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/ide/ide-iops.c linux-2.6.13/drivers/ide/ide-iops.c
+--- linux-2.6.13-i386/drivers/ide/ide-iops.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/ide/ide-iops.c 2005-08-30 16:32:55.000000000 +0200
+@@ -341,6 +341,23 @@
+ int i;
+ u16 *stringcast;
+
++#ifdef __mc68000__
++ if (!MACH_IS_AMIGA && !MACH_IS_MAC && !MACH_IS_Q40 && !MACH_IS_ATARI)
++ return;
++
++#ifdef M68K_IDE_SWAPW
++ if (M68K_IDE_SWAPW) { /* fix bus byteorder first */
++ u_char *p = (u_char *)id;
++ u_char t;
++ for (i = 0; i < 512; i += 2) {
++ t = p[i];
++ p[i] = p[i+1];
++ p[i+1] = t;
++ }
++ }
++#endif
++#endif /* __mc68000__ */
++
+ id->config = __le16_to_cpu(id->config);
+ id->cyls = __le16_to_cpu(id->cyls);
+ id->reserved2 = __le16_to_cpu(id->reserved2);
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/ide/legacy/gayle.c linux-2.6.13/drivers/ide/legacy/gayle.c
+--- linux-2.6.13-i386/drivers/ide/legacy/gayle.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/ide/legacy/gayle.c 2005-09-02 16:32:11.000000000 +0200
+@@ -161,6 +161,7 @@
+ base = (unsigned long)ZTWO_VADDR(phys_base);
+ ctrlport = GAYLE_HAS_CONTROL_REG ? (base + GAYLE_CONTROL) : 0;
+
++ memset(&hw, 0, sizeof(hw));
+ ide_setup_ports(&hw, base, gayle_offsets,
+ ctrlport, irqport, ack_intr,
+ // &gayle_iops,
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/input/keyboard/Kconfig linux-2.6.13/drivers/input/keyboard/Kconfig
+--- linux-2.6.13-i386/drivers/input/keyboard/Kconfig 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/input/keyboard/Kconfig 2005-08-30 16:33:05.000000000 +0200
+@@ -154,7 +154,7 @@
+
+ config KEYBOARD_HIL_OLD
+ tristate "HP HIL keyboard support (simple driver)"
+- depends on GSC
++ depends on GSC || HP300
+ default y
+ help
+ The "Human Interface Loop" is a older, 8-channel USB-like
+@@ -171,7 +171,7 @@
+
+ config KEYBOARD_HIL
+ tristate "HP HIL keyboard support"
+- depends on GSC
++ depends on GSC || HP300
+ default y
+ select HP_SDC
+ select HIL_MLC
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/input/misc/Kconfig linux-2.6.13/drivers/input/misc/Kconfig
+--- linux-2.6.13-i386/drivers/input/misc/Kconfig 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/input/misc/Kconfig 2005-08-30 16:33:05.000000000 +0200
+@@ -51,7 +51,7 @@
+
+ config HP_SDC_RTC
+ tristate "HP SDC Real Time Clock"
+- depends on GSC
++ depends on GSC || HP300
+ select HP_SDC
+ help
+ Say Y here if you want to support the built-in real time clock
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/input/mouse/Kconfig linux-2.6.13/drivers/input/mouse/Kconfig
+--- linux-2.6.13-i386/drivers/input/mouse/Kconfig 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/input/mouse/Kconfig 2005-08-30 16:33:05.000000000 +0200
+@@ -129,7 +129,7 @@
+
+ config MOUSE_HIL
+ tristate "HIL pointers (mice etc)."
+- depends on GSC
++ depends on GSC || HP300
+ select HP_SDC
+ select HIL_MLC
+ help
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/input/serio/Kconfig linux-2.6.13/drivers/input/serio/Kconfig
+--- linux-2.6.13-i386/drivers/input/serio/Kconfig 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/input/serio/Kconfig 2005-08-30 16:33:05.000000000 +0200
+@@ -112,7 +112,7 @@
+
+ config HP_SDC
+ tristate "HP System Device Controller i8042 Support"
+- depends on GSC && SERIO
++ depends on (GSC || HP300) && SERIO
+ default y
+ ---help---
+ This option enables supports for the the "System Device
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/macintosh/adb.c linux-2.6.13/drivers/macintosh/adb.c
+--- linux-2.6.13-i386/drivers/macintosh/adb.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/macintosh/adb.c 2005-08-30 16:33:07.000000000 +0200
+@@ -476,13 +476,15 @@
+ use_sreq = 1;
+ } else
+ use_sreq = 0;
+- req->nbytes = nbytes+1;
++ i = (flags & ADBREQ_RAW) ? 0 : 1;
++ req->nbytes = nbytes+i;
+ req->done = done;
+ req->reply_expected = flags & ADBREQ_REPLY;
+ req->data[0] = ADB_PACKET;
+ va_start(list, nbytes);
+- for (i = 0; i < nbytes; ++i)
+- req->data[i+1] = va_arg(list, int);
++ while (i < req->nbytes) {
++ req->data[i++] = va_arg(list, int);
++ }
+ va_end(list);
+
+ if (flags & ADBREQ_NOSEND)
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/net/Kconfig linux-2.6.13/drivers/net/Kconfig
+--- linux-2.6.13-i386/drivers/net/Kconfig 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/net/Kconfig 2005-08-30 16:33:24.000000000 +0200
+@@ -294,7 +294,7 @@
+
+ config MAC89x0
+ tristate "Macintosh CS89x0 based ethernet cards"
+- depends on NET_ETHERNET && MAC && BROKEN
++ depends on NET_ETHERNET && MAC
+ ---help---
+ Support for CS89x0 chipset based Ethernet cards. If you have a
+ Nubus or LC-PDS network (Ethernet) card of this type, say Y and
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/net/hplance.c linux-2.6.13/drivers/net/hplance.c
+--- linux-2.6.13-i386/drivers/net/hplance.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/net/hplance.c 2005-10-12 16:32:43.000000000 +0200
+@@ -77,6 +77,7 @@
+ {
+ struct net_device *dev;
+ int err = -ENOMEM;
++ int i;
+
+ dev = alloc_etherdev(sizeof(struct hplance_private));
+ if (!dev)
+@@ -93,6 +94,15 @@
+ goto out_release_mem_region;
+
+ dio_set_drvdata(d, dev);
++
++ printk(KERN_INFO "%s: %s; select code %d, addr %2.2x", dev->name, d->name, d->scode, dev->dev_addr[0]);
++
++ for (i=1; i<6; i++) {
++ printk(":%2.2x", dev->dev_addr[i]);
++ }
++
++ printk(", irq %d\n", d->ipl);
++
+ return 0;
+
+ out_release_mem_region:
+@@ -118,9 +128,7 @@
+ unsigned long va = (d->resource.start + DIO_VIRADDRBASE);
+ struct hplance_private *lp;
+ int i;
+-
+- printk(KERN_INFO "%s: %s; select code %d, addr", dev->name, d->name, d->scode);
+-
++
+ /* reset the board */
+ out_8(va+DIO_IDOFF, 0xff);
+ udelay(100); /* ariba! ariba! udelay! udelay! */
+@@ -143,7 +151,6 @@
+ */
+ dev->dev_addr[i] = ((in_8(va + HPLANCE_NVRAMOFF + i*4 + 1) & 0xF) << 4)
+ | (in_8(va + HPLANCE_NVRAMOFF + i*4 + 3) & 0xF);
+- printk("%c%2.2x", i == 0 ? ' ' : ':', dev->dev_addr[i]);
+ }
+
+ lp = netdev_priv(dev);
+@@ -160,7 +167,6 @@
+ lp->lance.lance_log_tx_bufs = LANCE_LOG_TX_BUFFERS;
+ lp->lance.rx_ring_mod_mask = RX_RING_MOD_MASK;
+ lp->lance.tx_ring_mod_mask = TX_RING_MOD_MASK;
+- printk(", irq %d\n", lp->lance.irq);
+ }
+
+ /* This is disgusting. We have to check the DIO status register for ack every
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/net/mac89x0.c linux-2.6.13/drivers/net/mac89x0.c
+--- linux-2.6.13-i386/drivers/net/mac89x0.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/net/mac89x0.c 2004-12-30 16:38:24.000000000 +0100
+@@ -128,7 +128,7 @@
+ extern void reset_chip(struct net_device *dev);
+ #endif
+ static int net_open(struct net_device *dev);
+-static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
++static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
+ static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+ static void set_multicast_list(struct net_device *dev);
+ static void net_rx(struct net_device *dev);
+@@ -374,56 +374,37 @@
+ static int
+ net_send_packet(struct sk_buff *skb, struct net_device *dev)
+ {
+- if (dev->tbusy) {
+- /* If we get here, some higher level has decided we are broken.
+- There should really be a "kick me" function call instead. */
+- int tickssofar = jiffies - dev->trans_start;
+- if (tickssofar < 5)
+- return 1;
+- if (net_debug > 0) printk("%s: transmit timed out, %s?\n", dev->name,
+- tx_done(dev) ? "IRQ conflict" : "network cable problem");
+- /* Try to restart the adaptor. */
+- dev->tbusy=0;
+- dev->trans_start = jiffies;
+- }
+-
+- /* Block a timer-based transmit from overlapping. This could better be
+- done with atomic_swap(1, dev->tbusy), but set_bit() works as well. */
+- if (test_and_set_bit(0, (void*)&dev->tbusy) != 0)
+- printk("%s: Transmitter access conflict.\n", dev->name);
+- else {
+- struct net_local *lp = netdev_priv(dev);
+- unsigned long flags;
+-
+- if (net_debug > 3)
+- printk("%s: sent %d byte packet of type %x\n",
+- dev->name, skb->len,
+- (skb->data[ETH_ALEN+ETH_ALEN] << 8)
+- | skb->data[ETH_ALEN+ETH_ALEN+1]);
+-
+- /* keep the upload from being interrupted, since we
+- ask the chip to start transmitting before the
+- whole packet has been completely uploaded. */
+- local_irq_save(flags);
+-
+- /* initiate a transmit sequence */
+- writereg(dev, PP_TxCMD, lp->send_cmd);
+- writereg(dev, PP_TxLength, skb->len);
+-
+- /* Test to see if the chip has allocated memory for the packet */
+- if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) {
+- /* Gasp! It hasn't. But that shouldn't happen since
+- we're waiting for TxOk, so return 1 and requeue this packet. */
+- local_irq_restore(flags);
+- return 1;
+- }
++ struct net_local *lp = netdev_priv(dev);
++ unsigned long flags;
+
+- /* Write the contents of the packet */
+- memcpy_toio(dev->mem_start + PP_TxFrame, skb->data, skb->len+1);
++ if (net_debug > 3)
++ printk("%s: sent %d byte packet of type %x\n",
++ dev->name, skb->len,
++ (skb->data[ETH_ALEN+ETH_ALEN] << 8)
++ | skb->data[ETH_ALEN+ETH_ALEN+1]);
++
++ /* keep the upload from being interrupted, since we
++ ask the chip to start transmitting before the
++ whole packet has been completely uploaded. */
++ local_irq_save(flags);
+
++ /* initiate a transmit sequence */
++ writereg(dev, PP_TxCMD, lp->send_cmd);
++ writereg(dev, PP_TxLength, skb->len);
++
++ /* Test to see if the chip has allocated memory for the packet */
++ if ((readreg(dev, PP_BusST) & READY_FOR_TX_NOW) == 0) {
++ /* Gasp! It hasn't. But that shouldn't happen since
++ we're waiting for TxOk, so return 1 and requeue this packet. */
+ local_irq_restore(flags);
+- dev->trans_start = jiffies;
++ return 1;
+ }
++
++ /* Write the contents of the packet */
++ memcpy((void *)(dev->mem_start + PP_TxFrame), skb->data, skb->len+1);
++
++ local_irq_restore(flags);
++ dev->trans_start = jiffies;
+ dev_kfree_skb (skb);
+
+ return 0;
+@@ -441,9 +422,6 @@
+ printk ("net_interrupt(): irq %d for unknown device.\n", irq);
+ return IRQ_NONE;
+ }
+- if (dev->interrupt)
+- printk("%s: Re-entering the interrupt handler.\n", dev->name);
+- dev->interrupt = 1;
+
+ ioaddr = dev->base_addr;
+ lp = netdev_priv(dev);
+@@ -464,8 +442,7 @@
+ break;
+ case ISQ_TRANSMITTER_EVENT:
+ lp->stats.tx_packets++;
+- dev->tbusy = 0;
+- mark_bh(NET_BH); /* Inform upper layers. */
++ netif_wake_queue(dev);
+ if ((status & TX_OK) == 0) lp->stats.tx_errors++;
+ if (status & TX_LOST_CRS) lp->stats.tx_carrier_errors++;
+ if (status & TX_SQE_ERROR) lp->stats.tx_heartbeat_errors++;
+@@ -479,8 +456,7 @@
+ That shouldn't happen since we only ever
+ load one packet. Shrug. Do the right
+ thing anyway. */
+- dev->tbusy = 0;
+- mark_bh(NET_BH); /* Inform upper layers. */
++ netif_wake_queue(dev);
+ }
+ if (status & TX_UNDERRUN) {
+ if (net_debug > 0) printk("%s: transmit underrun\n", dev->name);
+@@ -497,7 +473,6 @@
+ break;
+ }
+ }
+- dev->interrupt = 0;
+ return IRQ_HANDLED;
+ }
+
+@@ -532,7 +507,7 @@
+ skb_put(skb, length);
+ skb->dev = dev;
+
+- memcpy_fromio(skb->data, dev->mem_start + PP_RxFrame, length);
++ memcpy(skb->data, (void *)(dev->mem_start + PP_RxFrame), length);
+
+ if (net_debug > 3)printk("%s: received %d byte packet of type %x\n",
+ dev->name, length,
+@@ -611,8 +586,6 @@
+ static int set_mac_address(struct net_device *dev, void *addr)
+ {
+ int i;
+- if (dev->start)
+- return -EBUSY;
+ printk("%s: Setting MAC address to ", dev->name);
+ for (i = 0; i < 6; i++)
+ printk(" %2.2x", dev->dev_addr[i] = ((unsigned char *)addr)[i]);
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/Kconfig linux-2.6.13/drivers/scsi/Kconfig
+--- linux-2.6.13-i386/drivers/scsi/Kconfig 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/scsi/Kconfig 2005-08-30 16:33:54.000000000 +0200
+@@ -1627,7 +1627,7 @@
+
+ config SCSI_AMIGA7XX
+ bool "Amiga NCR53c710 SCSI support (EXPERIMENTAL)"
+- depends on AMIGA && SCSI && EXPERIMENTAL && BROKEN
++ depends on AMIGA && SCSI && EXPERIMENTAL
+ help
+ Support for various NCR53c710-based SCSI controllers on the Amiga.
+ This includes:
+@@ -1724,7 +1724,7 @@
+
+ config MVME16x_SCSI
+ bool "NCR53C710 SCSI driver for MVME16x"
+- depends on MVME16x && SCSI && BROKEN
++ depends on MVME16x && SCSI
+ help
+ The Motorola MVME162, 166, 167, 172 and 177 boards use the NCR53C710
+ SCSI controller chip. Almost everyone using one of these boards
+@@ -1732,7 +1732,7 @@
+
+ config BVME6000_SCSI
+ bool "NCR53C710 SCSI driver for BVME6000"
+- depends on BVME6000 && SCSI && BROKEN
++ depends on BVME6000 && SCSI
+ help
+ The BVME4000 and BVME6000 boards from BVM Ltd use the NCR53C710
+ SCSI controller chip. Almost everyone using one of these boards
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/amiga7xx.c linux-2.6.13/drivers/scsi/amiga7xx.c
+--- linux-2.6.13-i386/drivers/scsi/amiga7xx.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/scsi/amiga7xx.c 2004-10-30 16:35:43.000000000 +0200
+@@ -27,8 +27,14 @@
+ #include "scsi.h"
+ #include <scsi/scsi_host.h>
+ #include "53c7xx.h"
+-#include "amiga7xx.h"
+
++#ifndef CMD_PER_LUN
++#define CMD_PER_LUN 3
++#endif
++
++#ifndef CAN_QUEUE
++#define CAN_QUEUE 24
++#endif
+
+ static int amiga7xx_register_one(Scsi_Host_Template *tpnt,
+ unsigned long address)
+@@ -115,8 +121,10 @@
+ {
+ if (shost->irq)
+ free_irq(shost->irq, NULL);
++#ifdef CONFIG_ISA
+ if (shost->dma_channel != 0xff)
+ free_dma(shost->dma_channel);
++#endif
+ if (shost->io_port && shost->n_io_port)
+ release_region(shost->io_port, shost->n_io_port);
+ scsi_unregister(shost);
+@@ -128,8 +136,9 @@
+ .detect = amiga7xx_detect,
+ .release = amiga7xx_release,
+ .queuecommand = NCR53c7xx_queue_command,
+- .abort = NCR53c7xx_abort,
+- .reset = NCR53c7xx_reset,
++ .eh_abort_handler = NCR53c7xx_abort,
++ .eh_bus_reset_handler = NCR53c7xx_reset,
++ .slave_configure = NCR53c7xx_slave_configure,
+ .can_queue = 24,
+ .this_id = 7,
+ .sg_tablesize = 63,
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/amiga7xx.h linux-2.6.13/drivers/scsi/amiga7xx.h
+--- linux-2.6.13-i386/drivers/scsi/amiga7xx.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/scsi/amiga7xx.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,23 +0,0 @@
+-#ifndef AMIGA7XX_H
+-
+-#include <linux/types.h>
+-
+-int amiga7xx_detect(Scsi_Host_Template *);
+-const char *NCR53c7x0_info(void);
+-int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
+-int NCR53c7xx_abort(Scsi_Cmnd *);
+-int NCR53c7x0_release (struct Scsi_Host *);
+-int NCR53c7xx_reset(Scsi_Cmnd *, unsigned int);
+-void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs);
+-
+-#ifndef CMD_PER_LUN
+-#define CMD_PER_LUN 3
+-#endif
+-
+-#ifndef CAN_QUEUE
+-#define CAN_QUEUE 24
+-#endif
+-
+-#include <scsi/scsicam.h>
+-
+-#endif /* AMIGA7XX_H */
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/bvme6000.c linux-2.6.13/drivers/scsi/bvme6000.c
+--- linux-2.6.13-i386/drivers/scsi/bvme6000.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/scsi/bvme6000.c 2004-10-30 16:35:43.000000000 +0200
+@@ -19,10 +19,16 @@
+ #include "scsi.h"
+ #include <scsi/scsi_host.h>
+ #include "53c7xx.h"
+-#include "bvme6000.h"
+
+ #include<linux/stat.h>
+
++#ifndef CMD_PER_LUN
++#define CMD_PER_LUN 3
++#endif
++
++#ifndef CAN_QUEUE
++#define CAN_QUEUE 24
++#endif
+
+ int bvme6000_scsi_detect(Scsi_Host_Template *tpnt)
+ {
+@@ -52,8 +58,10 @@
+ {
+ if (shost->irq)
+ free_irq(shost->irq, NULL);
++#ifdef CONFIG_ISA
+ if (shost->dma_channel != 0xff)
+ free_dma(shost->dma_channel);
++#endif
+ if (shost->io_port && shost->n_io_port)
+ release_region(shost->io_port, shost->n_io_port);
+ scsi_unregister(shost);
+@@ -65,8 +73,9 @@
+ .detect = bvme6000_scsi_detect,
+ .release = bvme6000_scsi_release,
+ .queuecommand = NCR53c7xx_queue_command,
+- .abort = NCR53c7xx_abort,
+- .reset = NCR53c7xx_reset,
++ .eh_abort_handler = NCR53c7xx_abort,
++ .eh_bus_reset_handler = NCR53c7xx_reset,
++ .slave_configure = NCR53c7xx_slave_configure,
+ .can_queue = 24,
+ .this_id = 7,
+ .sg_tablesize = 63,
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/bvme6000.h linux-2.6.13/drivers/scsi/bvme6000.h
+--- linux-2.6.13-i386/drivers/scsi/bvme6000.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/scsi/bvme6000.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,24 +0,0 @@
+-#ifndef BVME6000_SCSI_H
+-#define BVME6000_SCSI_H
+-
+-#include <linux/types.h>
+-
+-int bvme6000_scsi_detect(Scsi_Host_Template *);
+-const char *NCR53c7x0_info(void);
+-int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
+-int NCR53c7xx_abort(Scsi_Cmnd *);
+-int NCR53c7x0_release (struct Scsi_Host *);
+-int NCR53c7xx_reset(Scsi_Cmnd *, unsigned int);
+-void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs);
+-
+-#ifndef CMD_PER_LUN
+-#define CMD_PER_LUN 3
+-#endif
+-
+-#ifndef CAN_QUEUE
+-#define CAN_QUEUE 24
+-#endif
+-
+-#include <scsi/scsicam.h>
+-
+-#endif /* BVME6000_SCSI_H */
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/mvme16x.c linux-2.6.13/drivers/scsi/mvme16x.c
+--- linux-2.6.13-i386/drivers/scsi/mvme16x.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/scsi/mvme16x.c 2004-10-30 16:35:43.000000000 +0200
+@@ -17,10 +17,16 @@
+ #include "scsi.h"
+ #include <scsi/scsi_host.h>
+ #include "53c7xx.h"
+-#include "mvme16x.h"
+
+ #include<linux/stat.h>
+
++#ifndef CMD_PER_LUN
++#define CMD_PER_LUN 3
++#endif
++
++#ifndef CAN_QUEUE
++#define CAN_QUEUE 24
++#endif
+
+ int mvme16x_scsi_detect(Scsi_Host_Template *tpnt)
+ {
+@@ -54,8 +60,10 @@
+ {
+ if (shost->irq)
+ free_irq(shost->irq, NULL);
++#ifdef CONFIG_ISA
+ if (shost->dma_channel != 0xff)
+ free_dma(shost->dma_channel);
++#endif
+ if (shost->io_port && shost->n_io_port)
+ release_region(shost->io_port, shost->n_io_port);
+ scsi_unregister(shost);
+@@ -67,8 +75,9 @@
+ .detect = mvme16x_scsi_detect,
+ .release = mvme16x_scsi_release,
+ .queuecommand = NCR53c7xx_queue_command,
+- .abort = NCR53c7xx_abort,
+- .reset = NCR53c7xx_reset,
++ .eh_abort_handler = NCR53c7xx_abort,
++ .eh_bus_reset_handler = NCR53c7xx_reset,
++ .slave_configure = NCR53c7xx_slave_configure,
+ .can_queue = 24,
+ .this_id = 7,
+ .sg_tablesize = 63,
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/drivers/scsi/mvme16x.h linux-2.6.13/drivers/scsi/mvme16x.h
+--- linux-2.6.13-i386/drivers/scsi/mvme16x.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/drivers/scsi/mvme16x.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,24 +0,0 @@
+-#ifndef MVME16x_SCSI_H
+-#define MVME16x_SCSI_H
+-
+-#include <linux/types.h>
+-
+-int mvme16x_scsi_detect(Scsi_Host_Template *);
+-const char *NCR53c7x0_info(void);
+-int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
+-int NCR53c7xx_abort(Scsi_Cmnd *);
+-int NCR53c7x0_release (struct Scsi_Host *);
+-int NCR53c7xx_reset(Scsi_Cmnd *, unsigned int);
+-void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs);
+-
+-#ifndef CMD_PER_LUN
+-#define CMD_PER_LUN 3
+-#endif
+-
+-#ifndef CAN_QUEUE
+-#define CAN_QUEUE 24
+-#endif
+-
+-#include <scsi/scsicam.h>
+-
+-#endif /* MVME16x_SCSI_H */
Added: dists/trunk/linux-2.6/debian/patches-debian/m68k-include-m68k.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/m68k-include-m68k.patch 2005-10-17 14:39:01 UTC (rev 4510)
+++ dists/trunk/linux-2.6/debian/patches-debian/m68k-include-m68k.patch 2005-10-17 16:51:12 UTC (rev 4511)
@@ -0,0 +1,664 @@
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/cacheflush.h linux-2.6.13/include/asm-m68k/cacheflush.h
+--- linux-2.6.13-i386/include/asm-m68k/cacheflush.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/include/asm-m68k/cacheflush.h 2005-08-30 16:36:03.000000000 +0200
+@@ -130,20 +130,25 @@
+ #define flush_dcache_mmap_lock(mapping) do { } while (0)
+ #define flush_dcache_mmap_unlock(mapping) do { } while (0)
+ #define flush_icache_page(vma, page) __flush_page_to_ram(page_address(page))
+-#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
+-
+-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
+- do { \
+- flush_cache_page(vma, vaddr, page_to_pfn(page));\
+- memcpy(dst, src, len); \
+- } while (0)
+-
+-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
+- do { \
+- flush_cache_page(vma, vaddr, page_to_pfn(page));\
+- memcpy(dst, src, len); \
+- } while (0)
+
++extern void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
++ unsigned long addr, int len);
+ extern void flush_icache_range(unsigned long address, unsigned long endaddr);
+
++static inline void copy_to_user_page(struct vm_area_struct *vma,
++ struct page *page, unsigned long vaddr,
++ void *dst, void *src, int len)
++{
++ flush_cache_page(vma, vaddr, page_to_pfn(page));
++ memcpy(dst, src, len);
++ flush_icache_user_range(vma, page, vaddr, len);
++}
++static inline void copy_from_user_page(struct vm_area_struct *vma,
++ struct page *page, unsigned long vaddr,
++ void *dst, void *src, int len)
++{
++ flush_cache_page(vma, vaddr, page_to_pfn(page));
++ memcpy(dst, src, len);
++}
++
+ #endif /* _M68K_CACHEFLUSH_H */
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/io.h linux-2.6.13/include/asm-m68k/io.h
+--- linux-2.6.13-i386/include/asm-m68k/io.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/include/asm-m68k/io.h 2005-06-19 16:35:42.000000000 +0200
+@@ -324,8 +324,6 @@
+ #define writel(val,addr) out_le32((addr),(val))
+ #endif
+
+-#define mmiowb()
+-
+ static inline void *ioremap(unsigned long physaddr, unsigned long size)
+ {
+ return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/processor.h linux-2.6.13/include/asm-m68k/processor.h
+--- linux-2.6.13-i386/include/asm-m68k/processor.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/include/asm-m68k/processor.h 2005-05-30 16:33:26.000000000 +0200
+@@ -14,6 +14,7 @@
+ #define current_text_addr() ({ __label__ _l; _l: &&_l;})
+
+ #include <linux/config.h>
++#include <linux/thread_info.h>
+ #include <asm/segment.h>
+ #include <asm/fpu.h>
+ #include <asm/ptrace.h>
+@@ -55,17 +56,6 @@
+ #endif
+ #define TASK_UNMAPPED_ALIGN(addr, off) PAGE_ALIGN(addr)
+
+-struct task_work {
+- unsigned char sigpending;
+- unsigned char notify_resume; /* request for notification on
+- userspace execution resumption */
+- char need_resched;
+- unsigned char delayed_trace; /* single step a syscall */
+- unsigned char syscall_trace; /* count of syscall interceptors */
+- unsigned char memdie; /* task was selected to be killed */
+- unsigned char pad[2];
+-};
+-
+ struct thread_struct {
+ unsigned long ksp; /* kernel stack pointer */
+ unsigned long usp; /* user stack pointer */
+@@ -78,7 +68,7 @@
+ unsigned long fp[8*3];
+ unsigned long fpcntl[3]; /* fp control regs */
+ unsigned char fpstate[FPSTATESIZE]; /* floating point state */
+- struct task_work work;
++ struct thread_info info;
+ };
+
+ #define INIT_THREAD { \
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/serial.h linux-2.6.13/include/asm-m68k/serial.h
+--- linux-2.6.13-i386/include/asm-m68k/serial.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/include/asm-m68k/serial.h 2005-08-30 16:36:03.000000000 +0200
+@@ -26,9 +26,11 @@
+ #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
+ #endif
+
++#ifdef CONFIG_ISA
+ #define SERIAL_PORT_DFNS \
+ /* UART CLK PORT IRQ FLAGS */ \
+ { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
+ { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
+ { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
+ { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
++#endif
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/string.h linux-2.6.13/include/asm-m68k/string.h
+--- linux-2.6.13-i386/include/asm-m68k/string.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/include/asm-m68k/string.h 2005-08-30 16:36:03.000000000 +0200
+@@ -80,43 +80,6 @@
+ return( (char *) s);
+ }
+
+-#if 0
+-#define __HAVE_ARCH_STRPBRK
+-static inline char *strpbrk(const char *cs,const char *ct)
+-{
+- const char *sc1,*sc2;
+-
+- for( sc1 = cs; *sc1 != '\0'; ++sc1)
+- for( sc2 = ct; *sc2 != '\0'; ++sc2)
+- if (*sc1 == *sc2)
+- return((char *) sc1);
+- return( NULL );
+-}
+-#endif
+-
+-#if 0
+-#define __HAVE_ARCH_STRSPN
+-static inline size_t strspn(const char *s, const char *accept)
+-{
+- const char *p;
+- const char *a;
+- size_t count = 0;
+-
+- for (p = s; *p != '\0'; ++p)
+- {
+- for (a = accept; *a != '\0'; ++a)
+- if (*p == *a)
+- break;
+- if (*a == '\0')
+- return count;
+- else
+- ++count;
+- }
+-
+- return count;
+-}
+-#endif
+-
+ /* strstr !! */
+
+ #define __HAVE_ARCH_STRLEN
+@@ -173,370 +136,18 @@
+ }
+
+ #define __HAVE_ARCH_MEMSET
+-/*
+- * This is really ugly, but its highly optimizatiable by the
+- * compiler and is meant as compensation for gcc's missing
+- * __builtin_memset(). For the 680[23]0 it might be worth considering
+- * the optimal number of misaligned writes compared to the number of
+- * tests'n'branches needed to align the destination address. The
+- * 680[46]0 doesn't really care due to their copy-back caches.
+- * 10/09/96 - Jes Sorensen
+- */
+-static inline void * __memset_g(void * s, int c, size_t count)
+-{
+- void *xs = s;
+- size_t temp;
+-
+- if (!count)
+- return xs;
+-
+- c &= 0xff;
+- c |= c << 8;
+- c |= c << 16;
+-
+- if (count < 36){
+- long *ls = s;
+-
+- switch(count){
+- case 32: case 33: case 34: case 35:
+- *ls++ = c;
+- case 28: case 29: case 30: case 31:
+- *ls++ = c;
+- case 24: case 25: case 26: case 27:
+- *ls++ = c;
+- case 20: case 21: case 22: case 23:
+- *ls++ = c;
+- case 16: case 17: case 18: case 19:
+- *ls++ = c;
+- case 12: case 13: case 14: case 15:
+- *ls++ = c;
+- case 8: case 9: case 10: case 11:
+- *ls++ = c;
+- case 4: case 5: case 6: case 7:
+- *ls++ = c;
+- break;
+- default:
+- break;
+- }
+- s = ls;
+- if (count & 0x02){
+- short *ss = s;
+- *ss++ = c;
+- s = ss;
+- }
+- if (count & 0x01){
+- char *cs = s;
+- *cs++ = c;
+- s = cs;
+- }
+- return xs;
+- }
+-
+- if ((long) s & 1)
+- {
+- char *cs = s;
+- *cs++ = c;
+- s = cs;
+- count--;
+- }
+- if (count > 2 && (long) s & 2)
+- {
+- short *ss = s;
+- *ss++ = c;
+- s = ss;
+- count -= 2;
+- }
+- temp = count >> 2;
+- if (temp)
+- {
+- long *ls = s;
+- temp--;
+- do
+- *ls++ = c;
+- while (temp--);
+- s = ls;
+- }
+- if (count & 2)
+- {
+- short *ss = s;
+- *ss++ = c;
+- s = ss;
+- }
+- if (count & 1)
+- {
+- char *cs = s;
+- *cs = c;
+- }
+- return xs;
+-}
+-
+-/*
+- * __memset_page assumes that data is longword aligned. Most, if not
+- * all, of these page sized memsets are performed on page aligned
+- * areas, thus we do not need to check if the destination is longword
+- * aligned. Of course we suffer a serious performance loss if this is
+- * not the case but I think the risk of this ever happening is
+- * extremely small. We spend a lot of time clearing pages in
+- * get_empty_page() so I think it is worth it anyway. Besides, the
+- * 680[46]0 do not really care about misaligned writes due to their
+- * copy-back cache.
+- *
+- * The optimized case for the 680[46]0 is implemented using the move16
+- * instruction. My tests showed that this implementation is 35-45%
+- * faster than the original implementation using movel, the only
+- * caveat is that the destination address must be 16-byte aligned.
+- * 01/09/96 - Jes Sorensen
+- */
+-static inline void * __memset_page(void * s,int c,size_t count)
+-{
+- unsigned long data, tmp;
+- void *xs = s;
+-
+- c = c & 255;
+- data = c | (c << 8);
+- data |= data << 16;
+-
+-#ifdef CPU_M68040_OR_M68060_ONLY
+-
+- if (((unsigned long) s) & 0x0f)
+- __memset_g(s, c, count);
+- else{
+- unsigned long *sp = s;
+- *sp++ = data;
+- *sp++ = data;
+- *sp++ = data;
+- *sp++ = data;
+-
+- __asm__ __volatile__("1:\t"
+- ".chip 68040\n\t"
+- "move16 %2 at +,%0 at +\n\t"
+- ".chip 68k\n\t"
+- "subqw #8,%2\n\t"
+- "subqw #8,%2\n\t"
+- "dbra %1,1b\n\t"
+- : "=a" (sp), "=d" (tmp)
+- : "a" (s), "0" (sp), "1" ((count - 16) / 16 - 1)
+- );
+- }
+-
+-#else
+- __asm__ __volatile__("1:\t"
+- "movel %2,%0 at +\n\t"
+- "movel %2,%0 at +\n\t"
+- "movel %2,%0 at +\n\t"
+- "movel %2,%0 at +\n\t"
+- "movel %2,%0 at +\n\t"
+- "movel %2,%0 at +\n\t"
+- "movel %2,%0 at +\n\t"
+- "movel %2,%0 at +\n\t"
+- "dbra %1,1b\n\t"
+- : "=a" (s), "=d" (tmp)
+- : "d" (data), "0" (s), "1" (count / 32 - 1)
+- );
+-#endif
+-
+- return xs;
+-}
+-
+-extern void *memset(void *,int,__kernel_size_t);
+-
+-#define __memset_const(s,c,count) \
+-((count==PAGE_SIZE) ? \
+- __memset_page((s),(c),(count)) : \
+- __memset_g((s),(c),(count)))
+-
+-#define memset(s, c, count) \
+-(__builtin_constant_p(count) ? \
+- __memset_const((s),(c),(count)) : \
+- __memset_g((s),(c),(count)))
++extern void *memset(void *, int, __kernel_size_t);
++#define memset(d, c, n) __builtin_memset(d, c, n)
+
+ #define __HAVE_ARCH_MEMCPY
+-extern void * memcpy(void *, const void *, size_t );
+-/*
+- * __builtin_memcpy() does not handle page-sized memcpys very well,
+- * thus following the same assumptions as for page-sized memsets, this
+- * function copies page-sized areas using an unrolled loop, without
+- * considering alignment.
+- *
+- * For the 680[46]0 only kernels we use the move16 instruction instead
+- * as it writes through the data-cache, invalidating the cache-lines
+- * touched. In this way we do not use up the entire data-cache (well,
+- * half of it on the 68060) by copying a page. An unrolled loop of two
+- * move16 instructions seem to the fastest. The only caveat is that
+- * both source and destination must be 16-byte aligned, if not we fall
+- * back to the generic memcpy function. - Jes
+- */
+-static inline void * __memcpy_page(void * to, const void * from, size_t count)
+-{
+- unsigned long tmp;
+- void *xto = to;
+-
+-#ifdef CPU_M68040_OR_M68060_ONLY
+-
+- if (((unsigned long) to | (unsigned long) from) & 0x0f)
+- return memcpy(to, from, count);
+-
+- __asm__ __volatile__("1:\t"
+- ".chip 68040\n\t"
+- "move16 %1 at +,%0 at +\n\t"
+- "move16 %1 at +,%0 at +\n\t"
+- ".chip 68k\n\t"
+- "dbra %2,1b\n\t"
+- : "=a" (to), "=a" (from), "=d" (tmp)
+- : "0" (to), "1" (from) , "2" (count / 32 - 1)
+- );
+-#else
+- __asm__ __volatile__("1:\t"
+- "movel %1 at +,%0 at +\n\t"
+- "movel %1 at +,%0 at +\n\t"
+- "movel %1 at +,%0 at +\n\t"
+- "movel %1 at +,%0 at +\n\t"
+- "movel %1 at +,%0 at +\n\t"
+- "movel %1 at +,%0 at +\n\t"
+- "movel %1 at +,%0 at +\n\t"
+- "movel %1 at +,%0 at +\n\t"
+- "dbra %2,1b\n\t"
+- : "=a" (to), "=a" (from), "=d" (tmp)
+- : "0" (to), "1" (from) , "2" (count / 32 - 1)
+- );
+-#endif
+- return xto;
+-}
+-
+-#define __memcpy_const(to, from, n) \
+-((n==PAGE_SIZE) ? \
+- __memcpy_page((to),(from),(n)) : \
+- __builtin_memcpy((to),(from),(n)))
+-
+-#define memcpy(to, from, n) \
+-(__builtin_constant_p(n) ? \
+- __memcpy_const((to),(from),(n)) : \
+- memcpy((to),(from),(n)))
++extern void *memcpy(void *, const void *, __kernel_size_t);
++#define memcpy(d, s, n) __builtin_memcpy(d, s, n)
+
+ #define __HAVE_ARCH_MEMMOVE
+-static inline void * memmove(void * dest,const void * src, size_t n)
+-{
+- void *xdest = dest;
+- size_t temp;
+-
+- if (!n)
+- return xdest;
+-
+- if (dest < src)
+- {
+- if ((long) dest & 1)
+- {
+- char *cdest = dest;
+- const char *csrc = src;
+- *cdest++ = *csrc++;
+- dest = cdest;
+- src = csrc;
+- n--;
+- }
+- if (n > 2 && (long) dest & 2)
+- {
+- short *sdest = dest;
+- const short *ssrc = src;
+- *sdest++ = *ssrc++;
+- dest = sdest;
+- src = ssrc;
+- n -= 2;
+- }
+- temp = n >> 2;
+- if (temp)
+- {
+- long *ldest = dest;
+- const long *lsrc = src;
+- temp--;
+- do
+- *ldest++ = *lsrc++;
+- while (temp--);
+- dest = ldest;
+- src = lsrc;
+- }
+- if (n & 2)
+- {
+- short *sdest = dest;
+- const short *ssrc = src;
+- *sdest++ = *ssrc++;
+- dest = sdest;
+- src = ssrc;
+- }
+- if (n & 1)
+- {
+- char *cdest = dest;
+- const char *csrc = src;
+- *cdest = *csrc;
+- }
+- }
+- else
+- {
+- dest = (char *) dest + n;
+- src = (const char *) src + n;
+- if ((long) dest & 1)
+- {
+- char *cdest = dest;
+- const char *csrc = src;
+- *--cdest = *--csrc;
+- dest = cdest;
+- src = csrc;
+- n--;
+- }
+- if (n > 2 && (long) dest & 2)
+- {
+- short *sdest = dest;
+- const short *ssrc = src;
+- *--sdest = *--ssrc;
+- dest = sdest;
+- src = ssrc;
+- n -= 2;
+- }
+- temp = n >> 2;
+- if (temp)
+- {
+- long *ldest = dest;
+- const long *lsrc = src;
+- temp--;
+- do
+- *--ldest = *--lsrc;
+- while (temp--);
+- dest = ldest;
+- src = lsrc;
+- }
+- if (n & 2)
+- {
+- short *sdest = dest;
+- const short *ssrc = src;
+- *--sdest = *--ssrc;
+- dest = sdest;
+- src = ssrc;
+- }
+- if (n & 1)
+- {
+- char *cdest = dest;
+- const char *csrc = src;
+- *--cdest = *--csrc;
+- }
+- }
+- return xdest;
+-}
++extern void *memmove(void *, const void *, __kernel_size_t);
+
+ #define __HAVE_ARCH_MEMCMP
+-extern int memcmp(const void * ,const void * ,size_t );
+-#define memcmp(cs, ct, n) \
+-(__builtin_constant_p(n) ? \
+- __builtin_memcmp((cs),(ct),(n)) : \
+- memcmp((cs),(ct),(n)))
+-
+-#define __HAVE_ARCH_MEMCHR
+-static inline void *memchr(const void *cs, int c, size_t count)
+-{
+- /* Someone else can optimize this, I don't care - tonym at mac.linux-m68k.org */
+- unsigned char *ret = (unsigned char *)cs;
+- for(;count>0;count--,ret++)
+- if(*ret == c) return ret;
+-
+- return NULL;
+-}
++extern int memcmp(const void *, const void *, __kernel_size_t);
++#define memcmp(d, s, n) __builtin_memcmp(d, s, n)
+
+ #endif /* _M68K_STRING_H_ */
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/include/asm-m68k/thread_info.h linux-2.6.13/include/asm-m68k/thread_info.h
+--- linux-2.6.13-i386/include/asm-m68k/thread_info.h 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/include/asm-m68k/thread_info.h 2005-08-30 16:36:04.000000000 +0200
+@@ -2,17 +2,15 @@
+ #define _ASM_M68K_THREAD_INFO_H
+
+ #include <asm/types.h>
+-#include <asm/processor.h>
+ #include <asm/page.h>
+
+ struct thread_info {
+ struct task_struct *task; /* main task structure */
++ unsigned long flags;
+ struct exec_domain *exec_domain; /* execution domain */
+ int preempt_count; /* 0 => preemptable, <0 => BUG */
+ __u32 cpu; /* should always be 0 on m68k */
+ struct restart_block restart_block;
+-
+- __u8 supervisor_stack[0];
+ };
+
+ #define PREEMPT_ACTIVE 0x4000000
+@@ -28,91 +26,34 @@
+
+ /* THREAD_SIZE should be 8k, so handle differently for 4k and 8k machines */
+ #if PAGE_SHIFT == 13 /* 8k machines */
+-#define alloc_thread_info(tsk) ((struct thread_info *)__get_free_pages(GFP_KERNEL,0))
+-#define free_thread_info(ti) free_pages((unsigned long)(ti),0)
++#define alloc_thread_stack(tsk) ((void *)__get_free_pages(GFP_KERNEL,0))
++#define free_thread_stack(ti) free_pages((unsigned long)(ti),0)
+ #else /* otherwise assume 4k pages */
+-#define alloc_thread_info(tsk) ((struct thread_info *)__get_free_pages(GFP_KERNEL,1))
+-#define free_thread_info(ti) free_pages((unsigned long)(ti),1)
++#define alloc_thread_stack(tsk) ((void *)__get_free_pages(GFP_KERNEL,1))
++#define free_thread_stack(ti) free_pages((unsigned long)(ti),1)
+ #endif /* PAGE_SHIFT == 13 */
+
+ //#define init_thread_info (init_task.thread.info)
+ #define init_stack (init_thread_union.stack)
+
+-#define current_thread_info() (current->thread_info)
++#define task_thread_info(tsk) (&(tsk)->thread.info)
++#define current_thread_info() task_thread_info(current)
+
++#define setup_thread_stack(p, org) ({ \
++ *(struct task_struct **)(p)->stack = (p); \
++ task_thread_info(p)->task = (p); \
++})
+
+ #define __HAVE_THREAD_FUNCTIONS
+
+-#define TIF_SYSCALL_TRACE 0 /* syscall trace active */
+-#define TIF_DELAYED_TRACE 1 /* single step a syscall */
+-#define TIF_NOTIFY_RESUME 2 /* resumption notification requested */
+-#define TIF_SIGPENDING 3 /* signal pending */
+-#define TIF_NEED_RESCHED 4 /* rescheduling necessary */
+-#define TIF_MEMDIE 5
+-
+-extern int thread_flag_fixme(void);
+-
+-/*
+- * flag set/clear/test wrappers
+- * - pass TIF_xxxx constants to these functions
++/* entry.S relies on these definitions!
++ * bits 0-7 are tested at every exception exit
++ * bits 8-15 are also tested at syscall exit
+ */
+-
+-#define __set_tsk_thread_flag(tsk, flag, val) ({ \
+- switch (flag) { \
+- case TIF_SIGPENDING: \
+- tsk->thread.work.sigpending = val; \
+- break; \
+- case TIF_NEED_RESCHED: \
+- tsk->thread.work.need_resched = val; \
+- break; \
+- case TIF_SYSCALL_TRACE: \
+- tsk->thread.work.syscall_trace = val; \
+- break; \
+- case TIF_MEMDIE: \
+- tsk->thread.work.memdie = val; \
+- break; \
+- default: \
+- thread_flag_fixme(); \
+- } \
+-})
+-
+-#define __get_tsk_thread_flag(tsk, flag) ({ \
+- int ___res; \
+- switch (flag) { \
+- case TIF_SIGPENDING: \
+- ___res = tsk->thread.work.sigpending; \
+- break; \
+- case TIF_NEED_RESCHED: \
+- ___res = tsk->thread.work.need_resched; \
+- break; \
+- case TIF_SYSCALL_TRACE: \
+- ___res = tsk->thread.work.syscall_trace;\
+- break; \
+- case TIF_MEMDIE: \
+- ___res = tsk->thread.work.memdie;\
+- break; \
+- default: \
+- ___res = thread_flag_fixme(); \
+- } \
+- ___res; \
+-})
+-
+-#define __get_set_tsk_thread_flag(tsk, flag, val) ({ \
+- int __res = __get_tsk_thread_flag(tsk, flag); \
+- __set_tsk_thread_flag(tsk, flag, val); \
+- __res; \
+-})
+-
+-#define set_tsk_thread_flag(tsk, flag) __set_tsk_thread_flag(tsk, flag, ~0)
+-#define clear_tsk_thread_flag(tsk, flag) __set_tsk_thread_flag(tsk, flag, 0)
+-#define test_and_set_tsk_thread_flag(tsk, flag) __get_set_tsk_thread_flag(tsk, flag, ~0)
+-#define test_tsk_thread_flag(tsk, flag) __get_tsk_thread_flag(tsk, flag)
+-
+-#define set_thread_flag(flag) set_tsk_thread_flag(current, flag)
+-#define clear_thread_flag(flag) clear_tsk_thread_flag(current, flag)
+-#define test_thread_flag(flag) test_tsk_thread_flag(current, flag)
+-
+-#define set_need_resched() set_thread_flag(TIF_NEED_RESCHED)
+-#define clear_need_resched() clear_thread_flag(TIF_NEED_RESCHED)
++#define TIF_SIGPENDING 6 /* signal pending */
++#define TIF_NEED_RESCHED 7 /* rescheduling necessary */
++#define TIF_DELAYED_TRACE 14 /* single step a syscall */
++#define TIF_SYSCALL_TRACE 15 /* syscall trace active */
++#define TIF_MEMDIE 16
+
+ #endif /* _ASM_M68K_THREAD_INFO_H */
Added: dists/trunk/linux-2.6/debian/patches-debian/m68k-kernel.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/m68k-kernel.patch 2005-10-17 14:39:01 UTC (rev 4510)
+++ dists/trunk/linux-2.6/debian/patches-debian/m68k-kernel.patch 2005-10-17 16:51:12 UTC (rev 4511)
@@ -0,0 +1,101 @@
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/kernel/exit.c linux-2.6.13/kernel/exit.c
+--- linux-2.6.13-i386/kernel/exit.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/kernel/exit.c 2005-08-30 16:36:41.000000000 +0200
+@@ -846,7 +846,7 @@
+ if (group_dead && tsk->signal->leader)
+ disassociate_ctty(1);
+
+- module_put(tsk->thread_info->exec_domain->module);
++ module_put(task_thread_info(tsk)->exec_domain->module);
+ if (tsk->binfmt)
+ module_put(tsk->binfmt->module);
+
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/kernel/fork.c linux-2.6.13/kernel/fork.c
+--- linux-2.6.13-i386/kernel/fork.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/kernel/fork.c 2005-08-30 16:36:41.000000000 +0200
+@@ -100,7 +100,7 @@
+
+ void free_task(struct task_struct *tsk)
+ {
+- free_thread_info(tsk->thread_info);
++ free_thread_stack(tsk->stack);
+ free_task_struct(tsk);
+ }
+ EXPORT_SYMBOL(free_task);
+@@ -155,7 +155,7 @@
+ static struct task_struct *dup_task_struct(struct task_struct *orig)
+ {
+ struct task_struct *tsk;
+- struct thread_info *ti;
++ void *stack;
+
+ prepare_to_copy(orig);
+
+@@ -163,16 +163,16 @@
+ if (!tsk)
+ return NULL;
+
+- ti = alloc_thread_info(tsk);
+- if (!ti) {
++ stack = alloc_thread_stack(tsk);
++ if (!stack) {
+ free_task_struct(tsk);
+ return NULL;
+ }
+
+- *ti = *orig->thread_info;
+ *tsk = *orig;
+- tsk->thread_info = ti;
+- ti->task = tsk;
++ tsk->stack = stack;
++ *(struct task_struct **)tsk->stack = tsk;
++ setup_thread_stack(tsk, orig);
+
+ /* One for us, one for whoever does the "release_task()" (usually parent) */
+ atomic_set(&tsk->usage,2);
+@@ -898,7 +898,7 @@
+ if (nr_threads >= max_threads)
+ goto bad_fork_cleanup_count;
+
+- if (!try_module_get(p->thread_info->exec_domain->module))
++ if (!try_module_get(task_thread_info(p)->exec_domain->module))
+ goto bad_fork_cleanup_count;
+
+ if (p->binfmt && !try_module_get(p->binfmt->module))
+@@ -1151,7 +1151,7 @@
+ if (p->binfmt)
+ module_put(p->binfmt->module);
+ bad_fork_cleanup_put_domain:
+- module_put(p->thread_info->exec_domain->module);
++ module_put(task_thread_info(p)->exec_domain->module);
+ bad_fork_cleanup_count:
+ put_group_info(p->group_info);
+ atomic_dec(&p->user->processes);
+diff -urN --exclude-from=/usr/src/exclude-file linux-2.6.13-i386/kernel/sched.c linux-2.6.13/kernel/sched.c
+--- linux-2.6.13-i386/kernel/sched.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13/kernel/sched.c 2005-08-30 16:36:43.000000000 +0200
+@@ -4121,10 +4121,10 @@
+ #endif
+ #ifdef CONFIG_DEBUG_STACK_USAGE
+ {
+- unsigned long * n = (unsigned long *) (p->thread_info+1);
++ unsigned long * n = end_of_stack(p);
+ while (!*n)
+ n++;
+- free = (unsigned long) n - (unsigned long)(p->thread_info+1);
++ free = (unsigned long) n - (unsigned long) end_of_stack(p);
+ }
+ #endif
+ printk("%5lu %5d %6d ", free, p->pid, p->parent->pid);
+@@ -4204,9 +4204,9 @@
+
+ /* Set the preempt count _outside_ the spinlocks! */
+ #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
+- idle->thread_info->preempt_count = (idle->lock_depth >= 0);
++ task_thread_info(idle)->preempt_count = (idle->lock_depth >= 0);
+ #else
+- idle->thread_info->preempt_count = 0;
++ task_thread_info(idle)->preempt_count = 0;
+ #endif
+ }
+
More information about the Kernel-svn-changes
mailing list