Commit e1f2084e authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  input/atari: Fix mouse movement and button mapping
  input/atari: Fix atarimouse init
  input/atari: Use the correct mouse interrupt hook
  m68k/atari: Do not use "/" in interrupt names
  m68k: unistd - Comment out definitions for unimplemented syscalls
  m68k: Really wire up sys_pselect6 and sys_ppoll
  m68k: Merge mmu and non-mmu versions of sys_call_table
  MAINTAINERS: Roman Zippel has been MIA for several years.
  m68k: bitops - Never step beyond the end of the bitmap
  m68k: bitops - offset == ((long)p - (long)vaddr) * 8
parents e33ab8f2 659e6ed5
...@@ -405,8 +405,8 @@ S: Maintained ...@@ -405,8 +405,8 @@ S: Maintained
F: sound/oss/aedsp16.c F: sound/oss/aedsp16.c
AFFS FILE SYSTEM AFFS FILE SYSTEM
M: Roman Zippel <zippel@linux-m68k.org> L: linux-fsdevel@vger.kernel.org
S: Maintained S: Orphan
F: Documentation/filesystems/affs.txt F: Documentation/filesystems/affs.txt
F: fs/affs/ F: fs/affs/
...@@ -2946,8 +2946,8 @@ F: drivers/block/cciss* ...@@ -2946,8 +2946,8 @@ F: drivers/block/cciss*
F: include/linux/cciss_ioctl.h F: include/linux/cciss_ioctl.h
HFS FILESYSTEM HFS FILESYSTEM
M: Roman Zippel <zippel@linux-m68k.org> L: linux-fsdevel@vger.kernel.org
S: Maintained S: Orphan
F: Documentation/filesystems/hfs.txt F: Documentation/filesystems/hfs.txt
F: fs/hfs/ F: fs/hfs/
...@@ -4001,7 +4001,6 @@ F: arch/m32r/ ...@@ -4001,7 +4001,6 @@ F: arch/m32r/
M68K ARCHITECTURE M68K ARCHITECTURE
M: Geert Uytterhoeven <geert@linux-m68k.org> M: Geert Uytterhoeven <geert@linux-m68k.org>
M: Roman Zippel <zippel@linux-m68k.org>
L: linux-m68k@lists.linux-m68k.org L: linux-m68k@lists.linux-m68k.org
W: http://www.linux-m68k.org/ W: http://www.linux-m68k.org/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
......
...@@ -36,13 +36,10 @@ ...@@ -36,13 +36,10 @@
/* Hook for MIDI serial driver */ /* Hook for MIDI serial driver */
void (*atari_MIDI_interrupt_hook) (void); void (*atari_MIDI_interrupt_hook) (void);
/* Hook for mouse driver */
void (*atari_mouse_interrupt_hook) (char *);
/* Hook for keyboard inputdev driver */ /* Hook for keyboard inputdev driver */
void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
/* Hook for mouse inputdev driver */ /* Hook for mouse inputdev driver */
void (*atari_input_mouse_interrupt_hook) (char *); void (*atari_input_mouse_interrupt_hook) (char *);
EXPORT_SYMBOL(atari_mouse_interrupt_hook);
EXPORT_SYMBOL(atari_input_keyboard_interrupt_hook); EXPORT_SYMBOL(atari_input_keyboard_interrupt_hook);
EXPORT_SYMBOL(atari_input_mouse_interrupt_hook); EXPORT_SYMBOL(atari_input_mouse_interrupt_hook);
...@@ -263,8 +260,8 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy) ...@@ -263,8 +260,8 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy)
kb_state.buf[kb_state.len++] = scancode; kb_state.buf[kb_state.len++] = scancode;
if (kb_state.len == 3) { if (kb_state.len == 3) {
kb_state.state = KEYBOARD; kb_state.state = KEYBOARD;
if (atari_mouse_interrupt_hook) if (atari_input_mouse_interrupt_hook)
atari_mouse_interrupt_hook(kb_state.buf); atari_input_mouse_interrupt_hook(kb_state.buf);
} }
break; break;
...@@ -575,7 +572,7 @@ int atari_keyb_init(void) ...@@ -575,7 +572,7 @@ int atari_keyb_init(void)
kb_state.len = 0; kb_state.len = 0;
error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt,
IRQ_TYPE_SLOW, "keyboard/mouse/MIDI", IRQ_TYPE_SLOW, "keyboard,mouse,MIDI",
atari_keyboard_interrupt); atari_keyboard_interrupt);
if (error) if (error)
return error; return error;
......
...@@ -180,7 +180,7 @@ void __init stdma_init(void) ...@@ -180,7 +180,7 @@ void __init stdma_init(void)
{ {
stdma_isr = NULL; stdma_isr = NULL;
if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED,
"ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int)) "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int))
pr_err("Couldn't register ST-DMA interrupt\n"); pr_err("Couldn't register ST-DMA interrupt\n");
} }
......
...@@ -34,8 +34,6 @@ void ikbd_joystick_disable(void); ...@@ -34,8 +34,6 @@ void ikbd_joystick_disable(void);
/* Hook for MIDI serial driver */ /* Hook for MIDI serial driver */
extern void (*atari_MIDI_interrupt_hook) (void); extern void (*atari_MIDI_interrupt_hook) (void);
/* Hook for mouse driver */
extern void (*atari_mouse_interrupt_hook) (char *);
/* Hook for keyboard inputdev driver */ /* Hook for keyboard inputdev driver */
extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
/* Hook for mouse inputdev driver */ /* Hook for mouse inputdev driver */
......
...@@ -181,14 +181,15 @@ static inline int find_first_zero_bit(const unsigned long *vaddr, ...@@ -181,14 +181,15 @@ static inline int find_first_zero_bit(const unsigned long *vaddr,
{ {
const unsigned long *p = vaddr; const unsigned long *p = vaddr;
int res = 32; int res = 32;
unsigned int words;
unsigned long num; unsigned long num;
if (!size) if (!size)
return 0; return 0;
size = (size + 31) >> 5; words = (size + 31) >> 5;
while (!(num = ~*p++)) { while (!(num = ~*p++)) {
if (!--size) if (!--words)
goto out; goto out;
} }
...@@ -196,7 +197,8 @@ static inline int find_first_zero_bit(const unsigned long *vaddr, ...@@ -196,7 +197,8 @@ static inline int find_first_zero_bit(const unsigned long *vaddr,
: "=d" (res) : "d" (num & -num)); : "=d" (res) : "d" (num & -num));
res ^= 31; res ^= 31;
out: out:
return ((long)p - (long)vaddr - 4) * 8 + res; res += ((long)p - (long)vaddr - 4) * 8;
return res < size ? res : size;
} }
static inline int find_next_zero_bit(const unsigned long *vaddr, int size, static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
...@@ -215,27 +217,32 @@ static inline int find_next_zero_bit(const unsigned long *vaddr, int size, ...@@ -215,27 +217,32 @@ static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
/* Look for zero in first longword */ /* Look for zero in first longword */
__asm__ __volatile__ ("bfffo %1{#0,#0},%0" __asm__ __volatile__ ("bfffo %1{#0,#0},%0"
: "=d" (res) : "d" (num & -num)); : "=d" (res) : "d" (num & -num));
if (res < 32) if (res < 32) {
return offset + (res ^ 31); offset += res ^ 31;
return offset < size ? offset : size;
}
offset += 32; offset += 32;
if (offset >= size)
return size;
} }
/* No zero yet, search remaining full bytes for a zero */ /* No zero yet, search remaining full bytes for a zero */
res = find_first_zero_bit(p, size - ((long)p - (long)vaddr) * 8); return offset + find_first_zero_bit(p, size - offset);
return offset + res;
} }
static inline int find_first_bit(const unsigned long *vaddr, unsigned size) static inline int find_first_bit(const unsigned long *vaddr, unsigned size)
{ {
const unsigned long *p = vaddr; const unsigned long *p = vaddr;
int res = 32; int res = 32;
unsigned int words;
unsigned long num; unsigned long num;
if (!size) if (!size)
return 0; return 0;
size = (size + 31) >> 5; words = (size + 31) >> 5;
while (!(num = *p++)) { while (!(num = *p++)) {
if (!--size) if (!--words)
goto out; goto out;
} }
...@@ -243,7 +250,8 @@ static inline int find_first_bit(const unsigned long *vaddr, unsigned size) ...@@ -243,7 +250,8 @@ static inline int find_first_bit(const unsigned long *vaddr, unsigned size)
: "=d" (res) : "d" (num & -num)); : "=d" (res) : "d" (num & -num));
res ^= 31; res ^= 31;
out: out:
return ((long)p - (long)vaddr - 4) * 8 + res; res += ((long)p - (long)vaddr - 4) * 8;
return res < size ? res : size;
} }
static inline int find_next_bit(const unsigned long *vaddr, int size, static inline int find_next_bit(const unsigned long *vaddr, int size,
...@@ -262,13 +270,17 @@ static inline int find_next_bit(const unsigned long *vaddr, int size, ...@@ -262,13 +270,17 @@ static inline int find_next_bit(const unsigned long *vaddr, int size,
/* Look for one in first longword */ /* Look for one in first longword */
__asm__ __volatile__ ("bfffo %1{#0,#0},%0" __asm__ __volatile__ ("bfffo %1{#0,#0},%0"
: "=d" (res) : "d" (num & -num)); : "=d" (res) : "d" (num & -num));
if (res < 32) if (res < 32) {
return offset + (res ^ 31); offset += res ^ 31;
return offset < size ? offset : size;
}
offset += 32; offset += 32;
if (offset >= size)
return size;
} }
/* No one yet, search remaining full bytes for a one */ /* No one yet, search remaining full bytes for a one */
res = find_first_bit(p, size - ((long)p - (long)vaddr) * 8); return offset + find_first_bit(p, size - offset);
return offset + res;
} }
/* /*
...@@ -366,23 +378,25 @@ static inline int test_bit_le(int nr, const void *vaddr) ...@@ -366,23 +378,25 @@ static inline int test_bit_le(int nr, const void *vaddr)
static inline int find_first_zero_bit_le(const void *vaddr, unsigned size) static inline int find_first_zero_bit_le(const void *vaddr, unsigned size)
{ {
const unsigned long *p = vaddr, *addr = vaddr; const unsigned long *p = vaddr, *addr = vaddr;
int res; int res = 0;
unsigned int words;
if (!size) if (!size)
return 0; return 0;
size = (size >> 5) + ((size & 31) > 0); words = (size >> 5) + ((size & 31) > 0);
while (*p++ == ~0UL) while (*p++ == ~0UL) {
{ if (--words == 0)
if (--size == 0) goto out;
return (p - addr) << 5;
} }
--p; --p;
for (res = 0; res < 32; res++) for (res = 0; res < 32; res++)
if (!test_bit_le(res, p)) if (!test_bit_le(res, p))
break; break;
return (p - addr) * 32 + res; out:
res += (p - addr) * 32;
return res < size ? res : size;
} }
static inline unsigned long find_next_zero_bit_le(const void *addr, static inline unsigned long find_next_zero_bit_le(const void *addr,
...@@ -400,10 +414,15 @@ static inline unsigned long find_next_zero_bit_le(const void *addr, ...@@ -400,10 +414,15 @@ static inline unsigned long find_next_zero_bit_le(const void *addr,
offset -= bit; offset -= bit;
/* Look for zero in first longword */ /* Look for zero in first longword */
for (res = bit; res < 32; res++) for (res = bit; res < 32; res++)
if (!test_bit_le(res, p)) if (!test_bit_le(res, p)) {
return offset + res; offset += res;
return offset < size ? offset : size;
}
p++; p++;
offset += 32; offset += 32;
if (offset >= size)
return size;
} }
/* No zero yet, search remaining full bytes for a zero */ /* No zero yet, search remaining full bytes for a zero */
return offset + find_first_zero_bit_le(p, size - offset); return offset + find_first_zero_bit_le(p, size - offset);
...@@ -412,22 +431,25 @@ static inline unsigned long find_next_zero_bit_le(const void *addr, ...@@ -412,22 +431,25 @@ static inline unsigned long find_next_zero_bit_le(const void *addr,
static inline int find_first_bit_le(const void *vaddr, unsigned size) static inline int find_first_bit_le(const void *vaddr, unsigned size)
{ {
const unsigned long *p = vaddr, *addr = vaddr; const unsigned long *p = vaddr, *addr = vaddr;
int res; int res = 0;
unsigned int words;
if (!size) if (!size)
return 0; return 0;
size = (size >> 5) + ((size & 31) > 0); words = (size >> 5) + ((size & 31) > 0);
while (*p++ == 0UL) { while (*p++ == 0UL) {
if (--size == 0) if (--words == 0)
return (p - addr) << 5; goto out;
} }
--p; --p;
for (res = 0; res < 32; res++) for (res = 0; res < 32; res++)
if (test_bit_le(res, p)) if (test_bit_le(res, p))
break; break;
return (p - addr) * 32 + res; out:
res += (p - addr) * 32;
return res < size ? res : size;
} }
static inline unsigned long find_next_bit_le(const void *addr, static inline unsigned long find_next_bit_le(const void *addr,
...@@ -445,10 +467,15 @@ static inline unsigned long find_next_bit_le(const void *addr, ...@@ -445,10 +467,15 @@ static inline unsigned long find_next_bit_le(const void *addr,
offset -= bit; offset -= bit;
/* Look for one in first longword */ /* Look for one in first longword */
for (res = bit; res < 32; res++) for (res = bit; res < 32; res++)
if (test_bit_le(res, p)) if (test_bit_le(res, p)) {
return offset + res; offset += res;
return offset < size ? offset : size;
}
p++; p++;
offset += 32; offset += 32;
if (offset >= size)
return size;
} }
/* No set bit yet, search remaining full bytes for a set bit */ /* No set bit yet, search remaining full bytes for a set bit */
return offset + find_first_bit_le(p, size - offset); return offset + find_first_bit_le(p, size - offset);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define __NR_mknod 14 #define __NR_mknod 14
#define __NR_chmod 15 #define __NR_chmod 15
#define __NR_chown 16 #define __NR_chown 16
#define __NR_break 17 /*#define __NR_break 17*/
#define __NR_oldstat 18 #define __NR_oldstat 18
#define __NR_lseek 19 #define __NR_lseek 19
#define __NR_getpid 20 #define __NR_getpid 20
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
#define __NR_oldfstat 28 #define __NR_oldfstat 28
#define __NR_pause 29 #define __NR_pause 29
#define __NR_utime 30 #define __NR_utime 30
#define __NR_stty 31 /*#define __NR_stty 31*/
#define __NR_gtty 32 /*#define __NR_gtty 32*/
#define __NR_access 33 #define __NR_access 33
#define __NR_nice 34 #define __NR_nice 34
#define __NR_ftime 35 /*#define __NR_ftime 35*/
#define __NR_sync 36 #define __NR_sync 36
#define __NR_kill 37 #define __NR_kill 37
#define __NR_rename 38 #define __NR_rename 38
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#define __NR_dup 41 #define __NR_dup 41
#define __NR_pipe 42 #define __NR_pipe 42
#define __NR_times 43 #define __NR_times 43
#define __NR_prof 44 /*#define __NR_prof 44*/
#define __NR_brk 45 #define __NR_brk 45
#define __NR_setgid 46 #define __NR_setgid 46
#define __NR_getgid 47 #define __NR_getgid 47
...@@ -58,13 +58,13 @@ ...@@ -58,13 +58,13 @@
#define __NR_getegid 50 #define __NR_getegid 50
#define __NR_acct 51 #define __NR_acct 51
#define __NR_umount2 52 #define __NR_umount2 52
#define __NR_lock 53 /*#define __NR_lock 53*/
#define __NR_ioctl 54 #define __NR_ioctl 54
#define __NR_fcntl 55 #define __NR_fcntl 55
#define __NR_mpx 56 /*#define __NR_mpx 56*/
#define __NR_setpgid 57 #define __NR_setpgid 57
#define __NR_ulimit 58 /*#define __NR_ulimit 58*/
#define __NR_oldolduname 59 /*#define __NR_oldolduname 59*/
#define __NR_umask 60 #define __NR_umask 60
#define __NR_chroot 61 #define __NR_chroot 61
#define __NR_ustat 62 #define __NR_ustat 62
...@@ -103,10 +103,10 @@ ...@@ -103,10 +103,10 @@
#define __NR_fchown 95 #define __NR_fchown 95
#define __NR_getpriority 96 #define __NR_getpriority 96
#define __NR_setpriority 97 #define __NR_setpriority 97
#define __NR_profil 98 /*#define __NR_profil 98*/
#define __NR_statfs 99 #define __NR_statfs 99
#define __NR_fstatfs 100 #define __NR_fstatfs 100
#define __NR_ioperm 101 /*#define __NR_ioperm 101*/
#define __NR_socketcall 102 #define __NR_socketcall 102
#define __NR_syslog 103 #define __NR_syslog 103
#define __NR_setitimer 104 #define __NR_setitimer 104
...@@ -114,11 +114,11 @@ ...@@ -114,11 +114,11 @@
#define __NR_stat 106 #define __NR_stat 106
#define __NR_lstat 107 #define __NR_lstat 107
#define __NR_fstat 108 #define __NR_fstat 108
#define __NR_olduname 109 /*#define __NR_olduname 109*/
#define __NR_iopl /* 110 */ not supported /*#define __NR_iopl 110*/ /* not supported */
#define __NR_vhangup 111 #define __NR_vhangup 111
#define __NR_idle /* 112 */ Obsolete /*#define __NR_idle 112*/ /* Obsolete */
#define __NR_vm86 /* 113 */ not supported /*#define __NR_vm86 113*/ /* not supported */
#define __NR_wait4 114 #define __NR_wait4 114
#define __NR_swapoff 115 #define __NR_swapoff 115
#define __NR_sysinfo 116 #define __NR_sysinfo 116
...@@ -132,17 +132,17 @@ ...@@ -132,17 +132,17 @@
#define __NR_adjtimex 124 #define __NR_adjtimex 124
#define __NR_mprotect 125 #define __NR_mprotect 125
#define __NR_sigprocmask 126 #define __NR_sigprocmask 126
#define __NR_create_module 127 /*#define __NR_create_module 127*/
#define __NR_init_module 128 #define __NR_init_module 128
#define __NR_delete_module 129 #define __NR_delete_module 129
#define __NR_get_kernel_syms 130 /*#define __NR_get_kernel_syms 130*/
#define __NR_quotactl 131 #define __NR_quotactl 131
#define __NR_getpgid 132 #define __NR_getpgid 132
#define __NR_fchdir 133 #define __NR_fchdir 133
#define __NR_bdflush 134 #define __NR_bdflush 134
#define __NR_sysfs 135 #define __NR_sysfs 135
#define __NR_personality 136 #define __NR_personality 136
#define __NR_afs_syscall 137 /* Syscall for Andrew File System */ /*#define __NR_afs_syscall 137*/ /* Syscall for Andrew File System */
#define __NR_setfsuid 138 #define __NR_setfsuid 138
#define __NR_setfsgid 139 #define __NR_setfsgid 139
#define __NR__llseek 140 #define __NR__llseek 140
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
#define __NR_setresuid 164 #define __NR_setresuid 164
#define __NR_getresuid 165 #define __NR_getresuid 165
#define __NR_getpagesize 166 #define __NR_getpagesize 166
#define __NR_query_module 167 /*#define __NR_query_module 167*/
#define __NR_poll 168 #define __NR_poll 168
#define __NR_nfsservctl 169 #define __NR_nfsservctl 169
#define __NR_setresgid 170 #define __NR_setresgid 170
...@@ -193,8 +193,8 @@ ...@@ -193,8 +193,8 @@
#define __NR_capset 185 #define __NR_capset 185
#define __NR_sigaltstack 186 #define __NR_sigaltstack 186
#define __NR_sendfile 187 #define __NR_sendfile 187
#define __NR_getpmsg 188 /* some people actually want streams */ /*#define __NR_getpmsg 188*/ /* some people actually want streams */
#define __NR_putpmsg 189 /* some people actually want streams */ /*#define __NR_putpmsg 189*/ /* some people actually want streams */
#define __NR_vfork 190 #define __NR_vfork 190
#define __NR_ugetrlimit 191 #define __NR_ugetrlimit 191
#define __NR_mmap2 192 #define __NR_mmap2 192
...@@ -223,6 +223,8 @@ ...@@ -223,6 +223,8 @@
#define __NR_setfsuid32 215 #define __NR_setfsuid32 215
#define __NR_setfsgid32 216 #define __NR_setfsgid32 216
#define __NR_pivot_root 217 #define __NR_pivot_root 217
/* 218*/
/* 219*/
#define __NR_getdents64 220 #define __NR_getdents64 220
#define __NR_gettid 221 #define __NR_gettid 221
#define __NR_tkill 222 #define __NR_tkill 222
...@@ -281,7 +283,7 @@ ...@@ -281,7 +283,7 @@
#define __NR_mq_notify 275 #define __NR_mq_notify 275
#define __NR_mq_getsetattr 276 #define __NR_mq_getsetattr 276
#define __NR_waitid 277 #define __NR_waitid 277
#define __NR_vserver 278 /*#define __NR_vserver 278*/
#define __NR_add_key 279 #define __NR_add_key 279
#define __NR_request_key 280 #define __NR_request_key 280
#define __NR_keyctl 281 #define __NR_keyctl 281
......
...@@ -10,7 +10,7 @@ endif ...@@ -10,7 +10,7 @@ endif
extra-y += vmlinux.lds extra-y += vmlinux.lds
obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \ obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \
sys_m68k.o time.o setup.o m68k_ksyms.o devres.o sys_m68k.o time.o setup.o m68k_ksyms.o devres.o syscalltable.o
devres-y = ../../../kernel/irq/devres.o devres-y = ../../../kernel/irq/devres.o
......
...@@ -407,351 +407,3 @@ resume: ...@@ -407,351 +407,3 @@ resume:
rts rts
.data
ALIGN
sys_call_table:
.long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
.long sys_exit
.long sys_fork
.long sys_read
.long sys_write
.long sys_open /* 5 */
.long sys_close
.long sys_waitpid
.long sys_creat
.long sys_link
.long sys_unlink /* 10 */
.long sys_execve
.long sys_chdir
.long sys_time
.long sys_mknod
.long sys_chmod /* 15 */
.long sys_chown16
.long sys_ni_syscall /* old break syscall holder */
.long sys_stat
.long sys_lseek
.long sys_getpid /* 20 */
.long sys_mount
.long sys_oldumount
.long sys_setuid16
.long sys_getuid16
.long sys_stime /* 25 */
.long sys_ptrace
.long sys_alarm
.long sys_fstat
.long sys_pause
.long sys_utime /* 30 */
.long sys_ni_syscall /* old stty syscall holder */
.long sys_ni_syscall /* old gtty syscall holder */
.long sys_access
.long sys_nice
.long sys_ni_syscall /* 35 */ /* old ftime syscall holder */
.long sys_sync
.long sys_kill
.long sys_rename
.long sys_mkdir
.long sys_rmdir /* 40 */
.long sys_dup
.long sys_pipe
.long sys_times
.long sys_ni_syscall /* old prof syscall holder */
.long sys_brk /* 45 */
.long sys_setgid16
.long sys_getgid16
.long sys_signal
.long sys_geteuid16
.long sys_getegid16 /* 50 */
.long sys_acct
.long sys_umount /* recycled never used phys() */
.long sys_ni_syscall /* old lock syscall holder */
.long sys_ioctl
.long sys_fcntl /* 55 */
.long sys_ni_syscall /* old mpx syscall holder */
.long sys_setpgid
.long sys_ni_syscall /* old ulimit syscall holder */
.long sys_ni_syscall
.long sys_umask /* 60 */
.long sys_chroot
.long sys_ustat
.long sys_dup2
.long sys_getppid
.long sys_getpgrp /* 65 */
.long sys_setsid
.long sys_sigaction
.long sys_sgetmask
.long sys_ssetmask
.long sys_setreuid16 /* 70 */
.long sys_setregid16
.long sys_sigsuspend
.long sys_sigpending
.long sys_sethostname
.long sys_setrlimit /* 75 */
.long sys_old_getrlimit
.long sys_getrusage
.long sys_gettimeofday
.long sys_settimeofday
.long sys_getgroups16 /* 80 */
.long sys_setgroups16
.long sys_old_select
.long sys_symlink
.long sys_lstat
.long sys_readlink /* 85 */
.long sys_uselib
.long sys_swapon
.long sys_reboot
.long sys_old_readdir
.long sys_old_mmap /* 90 */
.long sys_munmap
.long sys_truncate
.long sys_ftruncate
.long sys_fchmod
.long sys_fchown16 /* 95 */
.long sys_getpriority
.long sys_setpriority
.long sys_ni_syscall /* old profil syscall holder */
.long sys_statfs
.long sys_fstatfs /* 100 */
.long sys_ni_syscall /* ioperm for i386 */
.long sys_socketcall
.long sys_syslog
.long sys_setitimer
.long sys_getitimer /* 105 */
.long sys_newstat
.long sys_newlstat
.long sys_newfstat
.long sys_ni_syscall
.long sys_ni_syscall /* 110 */ /* iopl for i386 */
.long sys_vhangup
.long sys_ni_syscall /* obsolete idle() syscall */
.long sys_ni_syscall /* vm86old for i386 */
.long sys_wait4
.long sys_swapoff /* 115 */
.long sys_sysinfo
.long sys_ipc
.long sys_fsync
.long sys_sigreturn
.long sys_clone /* 120 */
.long sys_setdomainname
.long sys_newuname
.long sys_cacheflush /* modify_ldt for i386 */
.long sys_adjtimex
.long sys_mprotect /* 125 */
.long sys_sigprocmask
.long sys_ni_syscall /* old "create_module" */
.long sys_init_module
.long sys_delete_module
.long sys_ni_syscall /* 130 - old "get_kernel_syms" */
.long sys_quotactl
.long sys_getpgid
.long sys_fchdir
.long sys_bdflush
.long sys_sysfs /* 135 */
.long sys_personality
.long sys_ni_syscall /* for afs_syscall */
.long sys_setfsuid16
.long sys_setfsgid16
.long sys_llseek /* 140 */
.long sys_getdents
.long sys_select
.long sys_flock
.long sys_msync
.long sys_readv /* 145 */
.long sys_writev
.long sys_getsid
.long sys_fdatasync
.long sys_sysctl
.long sys_mlock /* 150 */
.long sys_munlock
.long sys_mlockall
.long sys_munlockall
.long sys_sched_setparam
.long sys_sched_getparam /* 155 */
.long sys_sched_setscheduler
.long sys_sched_getscheduler
.long sys_sched_yield
.long sys_sched_get_priority_max
.long sys_sched_get_priority_min /* 160 */
.long sys_sched_rr_get_interval
.long sys_nanosleep
.long sys_mremap
.long sys_setresuid16
.long sys_getresuid16 /* 165 */
.long sys_getpagesize
.long sys_ni_syscall /* old sys_query_module */
.long sys_poll
.long sys_nfsservctl
.long sys_setresgid16 /* 170 */
.long sys_getresgid16
.long sys_prctl
.long sys_rt_sigreturn
.long sys_rt_sigaction
.long sys_rt_sigprocmask /* 175 */
.long sys_rt_sigpending
.long sys_rt_sigtimedwait
.long sys_rt_sigqueueinfo
.long sys_rt_sigsuspend
.long sys_pread64 /* 180 */
.long sys_pwrite64
.long sys_lchown16;
.long sys_getcwd
.long sys_capget
.long sys_capset /* 185 */
.long sys_sigaltstack
.long sys_sendfile
.long sys_ni_syscall /* streams1 */
.long sys_ni_syscall /* streams2 */
.long sys_vfork /* 190 */
.long sys_getrlimit
.long sys_mmap2
.long sys_truncate64
.long sys_ftruncate64
.long sys_stat64 /* 195 */
.long sys_lstat64
.long sys_fstat64
.long sys_chown
.long sys_getuid
.long sys_getgid /* 200 */
.long sys_geteuid
.long sys_getegid
.long sys_setreuid
.long sys_setregid
.long sys_getgroups /* 205 */
.long sys_setgroups
.long sys_fchown
.long sys_setresuid
.long sys_getresuid
.long sys_setresgid /* 210 */
.long sys_getresgid
.long sys_lchown
.long sys_setuid
.long sys_setgid
.long sys_setfsuid /* 215 */
.long sys_setfsgid
.long sys_pivot_root
.long sys_ni_syscall
.long sys_ni_syscall
.long sys_getdents64 /* 220 */
.long sys_gettid
.long sys_tkill
.long sys_setxattr
.long sys_lsetxattr
.long sys_fsetxattr /* 225 */
.long sys_getxattr
.long sys_lgetxattr
.long sys_fgetxattr
.long sys_listxattr
.long sys_llistxattr /* 230 */
.long sys_flistxattr
.long sys_removexattr
.long sys_lremovexattr
.long sys_fremovexattr
.long sys_futex /* 235 */
.long sys_sendfile64
.long sys_mincore
.long sys_madvise
.long sys_fcntl64
.long sys_readahead /* 240 */
.long sys_io_setup
.long sys_io_destroy
.long sys_io_getevents
.long sys_io_submit
.long sys_io_cancel /* 245 */
.long sys_fadvise64
.long sys_exit_group
.long sys_lookup_dcookie
.long sys_epoll_create
.long sys_epoll_ctl /* 250 */
.long sys_epoll_wait
.long sys_remap_file_pages
.long sys_set_tid_address
.long sys_timer_create
.long sys_timer_settime /* 255 */
.long sys_timer_gettime
.long sys_timer_getoverrun
.long sys_timer_delete
.long sys_clock_settime
.long sys_clock_gettime /* 260 */
.long sys_clock_getres
.long sys_clock_nanosleep
.long sys_statfs64
.long sys_fstatfs64
.long sys_tgkill /* 265 */
.long sys_utimes
.long sys_fadvise64_64
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy /* 270 */
.long sys_mq_open
.long sys_mq_unlink
.long sys_mq_timedsend
.long sys_mq_timedreceive
.long sys_mq_notify /* 275 */
.long sys_mq_getsetattr
.long sys_waitid
.long sys_ni_syscall /* for sys_vserver */
.long sys_add_key
.long sys_request_key /* 280 */
.long sys_keyctl
.long sys_ioprio_set
.long sys_ioprio_get
.long sys_inotify_init
.long sys_inotify_add_watch /* 285 */
.long sys_inotify_rm_watch
.long sys_migrate_pages
.long sys_openat
.long sys_mkdirat
.long sys_mknodat /* 290 */
.long sys_fchownat
.long sys_futimesat
.long sys_fstatat64
.long sys_unlinkat
.long sys_renameat /* 295 */
.long sys_linkat
.long sys_symlinkat
.long sys_readlinkat
.long sys_fchmodat
.long sys_faccessat /* 300 */
.long sys_ni_syscall /* Reserved for pselect6 */
.long sys_ni_syscall /* Reserved for ppoll */
.long sys_unshare
.long sys_set_robust_list
.long sys_get_robust_list /* 305 */
.long sys_splice
.long sys_sync_file_range
.long sys_tee
.long sys_vmsplice
.long sys_move_pages /* 310 */
.long sys_sched_setaffinity
.long sys_sched_getaffinity
.long sys_kexec_load
.long sys_getcpu
.long sys_epoll_pwait /* 315 */
.long sys_utimensat
.long sys_signalfd
.long sys_timerfd_create
.long sys_eventfd
.long sys_fallocate /* 320 */
.long sys_timerfd_settime
.long sys_timerfd_gettime
.long sys_signalfd4
.long sys_eventfd2
.long sys_epoll_create1 /* 325 */
.long sys_dup3
.long sys_pipe2
.long sys_inotify_init1
.long sys_preadv
.long sys_pwritev /* 330 */
.long sys_rt_tgsigqueueinfo
.long sys_perf_event_open
.long sys_get_thread_area
.long sys_set_thread_area
.long sys_atomic_cmpxchg_32 /* 335 */
.long sys_atomic_barrier
.long sys_fanotify_init
.long sys_fanotify_mark
.long sys_prlimit64
.long sys_name_to_handle_at /* 340 */
.long sys_open_by_handle_at
.long sys_clock_adjtime
.long sys_syncfs
/* /*
* linux/arch/m68knommu/kernel/syscalltable.S
*
* Copyright (C) 2002, Greg Ungerer (gerg@snapgear.com) * Copyright (C) 2002, Greg Ungerer (gerg@snapgear.com)
* *
* Based on older entry.S files, the following copyrights apply: * Based on older entry.S files, the following copyrights apply:
...@@ -9,16 +7,21 @@ ...@@ -9,16 +7,21 @@
* Kenneth Albanowski <kjahds@kjahds.com>, * Kenneth Albanowski <kjahds@kjahds.com>,
* Copyright (C) 2000 Lineo Inc. (www.lineo.com) * Copyright (C) 2000 Lineo Inc. (www.lineo.com)
* Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1991, 1992 Linus Torvalds
*
* Linux/m68k support by Hamish Macdonald
*/ */
#include <linux/sys.h> #include <linux/sys.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/unistd.h>
.text #ifndef CONFIG_MMU
#define sys_mmap2 sys_mmap_pgoff
#endif
.section .rodata
ALIGN ALIGN
ENTRY(sys_call_table) ENTRY(sys_call_table)
.long sys_restart_syscall /* 0 - old "setup()" system call */ .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
.long sys_exit .long sys_exit
.long sys_fork .long sys_fork
.long sys_read .long sys_read
...@@ -53,7 +56,7 @@ ENTRY(sys_call_table) ...@@ -53,7 +56,7 @@ ENTRY(sys_call_table)
.long sys_ni_syscall /* old gtty syscall holder */ .long sys_ni_syscall /* old gtty syscall holder */
.long sys_access .long sys_access
.long sys_nice .long sys_nice
.long sys_ni_syscall /* 35 */ /* old ftime syscall holder */ .long sys_ni_syscall /* 35 - old ftime syscall holder */
.long sys_sync .long sys_sync
.long sys_kill .long sys_kill
.long sys_rename .long sys_rename
...@@ -105,7 +108,7 @@ ENTRY(sys_call_table) ...@@ -105,7 +108,7 @@ ENTRY(sys_call_table)
.long sys_lstat .long sys_lstat
.long sys_readlink /* 85 */ .long sys_readlink /* 85 */
.long sys_uselib .long sys_uselib
.long sys_ni_syscall /* sys_swapon */ .long sys_swapon
.long sys_reboot .long sys_reboot
.long sys_old_readdir .long sys_old_readdir
.long sys_old_mmap /* 90 */ .long sys_old_mmap /* 90 */
...@@ -128,12 +131,12 @@ ENTRY(sys_call_table) ...@@ -128,12 +131,12 @@ ENTRY(sys_call_table)
.long sys_newlstat .long sys_newlstat
.long sys_newfstat .long sys_newfstat
.long sys_ni_syscall .long sys_ni_syscall
.long sys_ni_syscall /* iopl for i386 */ /* 110 */ .long sys_ni_syscall /* 110 - iopl for i386 */
.long sys_vhangup .long sys_vhangup
.long sys_ni_syscall /* obsolete idle() syscall */ .long sys_ni_syscall /* obsolete idle() syscall */
.long sys_ni_syscall /* vm86old for i386 */ .long sys_ni_syscall /* vm86old for i386 */
.long sys_wait4 .long sys_wait4
.long sys_ni_syscall /* 115 */ /* sys_swapoff */ .long sys_swapoff /* 115 */
.long sys_sysinfo .long sys_sysinfo
.long sys_ipc .long sys_ipc
.long sys_fsync .long sys_fsync
...@@ -143,12 +146,12 @@ ENTRY(sys_call_table) ...@@ -143,12 +146,12 @@ ENTRY(sys_call_table)
.long sys_newuname .long sys_newuname
.long sys_cacheflush /* modify_ldt for i386 */ .long sys_cacheflush /* modify_ldt for i386 */
.long sys_adjtimex .long sys_adjtimex
.long sys_ni_syscall /* 125 */ /* sys_mprotect */ .long sys_mprotect /* 125 */
.long sys_sigprocmask .long sys_sigprocmask
.long sys_ni_syscall /* old "creat_module" */ .long sys_ni_syscall /* old "create_module" */
.long sys_init_module .long sys_init_module
.long sys_delete_module .long sys_delete_module
.long sys_ni_syscall /* 130: old "get_kernel_syms" */ .long sys_ni_syscall /* 130 - old "get_kernel_syms" */
.long sys_quotactl .long sys_quotactl
.long sys_getpgid .long sys_getpgid
.long sys_fchdir .long sys_fchdir
...@@ -162,16 +165,16 @@ ENTRY(sys_call_table) ...@@ -162,16 +165,16 @@ ENTRY(sys_call_table)
.long sys_getdents .long sys_getdents
.long sys_select .long sys_select
.long sys_flock .long sys_flock
.long sys_ni_syscall /* sys_msync */ .long sys_msync
.long sys_readv /* 145 */ .long sys_readv /* 145 */
.long sys_writev .long sys_writev
.long sys_getsid .long sys_getsid
.long sys_fdatasync .long sys_fdatasync
.long sys_sysctl .long sys_sysctl
.long sys_ni_syscall /* 150 */ /* sys_mlock */ .long sys_mlock /* 150 */
.long sys_ni_syscall /* sys_munlock */ .long sys_munlock
.long sys_ni_syscall /* sys_mlockall */ .long sys_mlockall
.long sys_ni_syscall /* sys_munlockall */ .long sys_munlockall
.long sys_sched_setparam .long sys_sched_setparam
.long sys_sched_getparam /* 155 */ .long sys_sched_getparam /* 155 */
.long sys_sched_setscheduler .long sys_sched_setscheduler
...@@ -181,13 +184,13 @@ ENTRY(sys_call_table) ...@@ -181,13 +184,13 @@ ENTRY(sys_call_table)
.long sys_sched_get_priority_min /* 160 */ .long sys_sched_get_priority_min /* 160 */
.long sys_sched_rr_get_interval .long sys_sched_rr_get_interval
.long sys_nanosleep .long sys_nanosleep
.long sys_ni_syscall /* sys_mremap */ .long sys_mremap
.long sys_setresuid16 .long sys_setresuid16
.long sys_getresuid16 /* 165 */ .long sys_getresuid16 /* 165 */
.long sys_getpagesize /* sys_getpagesize */ .long sys_getpagesize
.long sys_ni_syscall /* old "query_module" */ .long sys_ni_syscall /* old "query_module" */
.long sys_poll .long sys_poll
.long sys_ni_syscall /* sys_nfsservctl */ .long sys_nfsservctl
.long sys_setresgid16 /* 170 */ .long sys_setresgid16 /* 170 */
.long sys_getresgid16 .long sys_getresgid16
.long sys_prctl .long sys_prctl
...@@ -210,7 +213,7 @@ ENTRY(sys_call_table) ...@@ -210,7 +213,7 @@ ENTRY(sys_call_table)
.long sys_ni_syscall /* streams2 */ .long sys_ni_syscall /* streams2 */
.long sys_vfork /* 190 */ .long sys_vfork /* 190 */
.long sys_getrlimit .long sys_getrlimit
.long sys_mmap_pgoff .long sys_mmap2
.long sys_truncate64 .long sys_truncate64
.long sys_ftruncate64 .long sys_ftruncate64
.long sys_stat64 /* 195 */ .long sys_stat64 /* 195 */
...@@ -255,8 +258,8 @@ ENTRY(sys_call_table) ...@@ -255,8 +258,8 @@ ENTRY(sys_call_table)
.long sys_fremovexattr .long sys_fremovexattr
.long sys_futex /* 235 */ .long sys_futex /* 235 */
.long sys_sendfile64 .long sys_sendfile64
.long sys_ni_syscall /* sys_mincore */ .long sys_mincore
.long sys_ni_syscall /* sys_madvise */ .long sys_madvise
.long sys_fcntl64 .long sys_fcntl64
.long sys_readahead /* 240 */ .long sys_readahead /* 240 */
.long sys_io_setup .long sys_io_setup
...@@ -270,7 +273,7 @@ ENTRY(sys_call_table) ...@@ -270,7 +273,7 @@ ENTRY(sys_call_table)
.long sys_epoll_create .long sys_epoll_create
.long sys_epoll_ctl /* 250 */ .long sys_epoll_ctl /* 250 */
.long sys_epoll_wait .long sys_epoll_wait
.long sys_ni_syscall /* sys_remap_file_pages */ .long sys_remap_file_pages
.long sys_set_tid_address .long sys_set_tid_address
.long sys_timer_create .long sys_timer_create
.long sys_timer_settime /* 255 */ .long sys_timer_settime /* 255 */
...@@ -319,8 +322,8 @@ ENTRY(sys_call_table) ...@@ -319,8 +322,8 @@ ENTRY(sys_call_table)
.long sys_readlinkat .long sys_readlinkat
.long sys_fchmodat .long sys_fchmodat
.long sys_faccessat /* 300 */ .long sys_faccessat /* 300 */
.long sys_ni_syscall /* Reserved for pselect6 */ .long sys_pselect6
.long sys_ni_syscall /* Reserved for ppoll */ .long sys_ppoll
.long sys_unshare .long sys_unshare
.long sys_set_robust_list .long sys_set_robust_list
.long sys_get_robust_list /* 305 */ .long sys_get_robust_list /* 305 */
...@@ -363,7 +366,3 @@ ENTRY(sys_call_table) ...@@ -363,7 +366,3 @@ ENTRY(sys_call_table)
.long sys_clock_adjtime .long sys_clock_adjtime
.long sys_syncfs .long sys_syncfs
.rept NR_syscalls-(.-sys_call_table)/4
.long sys_ni_syscall
.endr
...@@ -223,8 +223,9 @@ static int __init atakbd_init(void) ...@@ -223,8 +223,9 @@ static int __init atakbd_init(void)
return -ENODEV; return -ENODEV;
// need to init core driver if not already done so // need to init core driver if not already done so
if (atari_keyb_init()) error = atari_keyb_init();
return -ENODEV; if (error)
return error;
atakbd_dev = input_allocate_device(); atakbd_dev = input_allocate_device();
if (!atakbd_dev) if (!atakbd_dev)
......
...@@ -78,14 +78,14 @@ static void atamouse_interrupt(char *buf) ...@@ -78,14 +78,14 @@ static void atamouse_interrupt(char *buf)
/* only relative events get here */ /* only relative events get here */
dx = buf[1]; dx = buf[1];
dy = -buf[2]; dy = buf[2];
input_report_rel(atamouse_dev, REL_X, dx); input_report_rel(atamouse_dev, REL_X, dx);
input_report_rel(atamouse_dev, REL_Y, dy); input_report_rel(atamouse_dev, REL_Y, dy);
input_report_key(atamouse_dev, BTN_LEFT, buttons & 0x1); input_report_key(atamouse_dev, BTN_LEFT, buttons & 0x4);
input_report_key(atamouse_dev, BTN_MIDDLE, buttons & 0x2); input_report_key(atamouse_dev, BTN_MIDDLE, buttons & 0x2);
input_report_key(atamouse_dev, BTN_RIGHT, buttons & 0x4); input_report_key(atamouse_dev, BTN_RIGHT, buttons & 0x1);
input_sync(atamouse_dev); input_sync(atamouse_dev);
...@@ -108,7 +108,7 @@ static int atamouse_open(struct input_dev *dev) ...@@ -108,7 +108,7 @@ static int atamouse_open(struct input_dev *dev)
static void atamouse_close(struct input_dev *dev) static void atamouse_close(struct input_dev *dev)
{ {
ikbd_mouse_disable(); ikbd_mouse_disable();
atari_mouse_interrupt_hook = NULL; atari_input_mouse_interrupt_hook = NULL;
} }
static int __init atamouse_init(void) static int __init atamouse_init(void)
...@@ -118,8 +118,9 @@ static int __init atamouse_init(void) ...@@ -118,8 +118,9 @@ static int __init atamouse_init(void)
if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP)) if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
return -ENODEV; return -ENODEV;
if (!atari_keyb_init()) error = atari_keyb_init();
return -ENODEV; if (error)
return error;
atamouse_dev = input_allocate_device(); atamouse_dev = input_allocate_device();
if (!atamouse_dev) if (!atamouse_dev)
......
...@@ -554,7 +554,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, ...@@ -554,7 +554,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
memaddr == (unsigned short *)0xffe00000) { memaddr == (unsigned short *)0xffe00000) {
/* PAMs card and Riebl on ST use level 5 autovector */ /* PAMs card and Riebl on ST use level 5 autovector */
if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO, if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO,
"PAM/Riebl-ST Ethernet", dev)) { "PAM,Riebl-ST Ethernet", dev)) {
printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 );
return 0; return 0;
} }
......
...@@ -3117,7 +3117,7 @@ int __init atafb_init(void) ...@@ -3117,7 +3117,7 @@ int __init atafb_init(void)
atafb_ops.fb_setcolreg = &falcon_setcolreg; atafb_ops.fb_setcolreg = &falcon_setcolreg;
error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher,
IRQ_TYPE_PRIO, IRQ_TYPE_PRIO,
"framebuffer/modeswitch", "framebuffer:modeswitch",
falcon_vbl_switcher); falcon_vbl_switcher);
if (error) if (error)
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment