Menu
▾
▴
[linuxsh-dev] 2.5.11
|
From: NIIBE Y. <gn...@m1...> - 2002-05-01 01:08:14
|
Changes from mainline.
NOTE: Video driver authors, there're changes in mainline.
Please change the one in CVS if needed.
2002-04-30 NIIBE Yutaka <gn...@m1...>
Follow up to 2.5.11.
* arch/sh/mm/clear_page.S: Remove SYMBOL_NAME.
* arch/sh/kernel/head.S, arch/sh/kernel/entry.S,
arch/sh/lib/memmove.S: Likewise.
* AGAINST-2.5.11: New file.
* AGAINST-2.5.10: Removed.
* Makefile: Version 2.5.11.
* Documentation/cachetlb.txt: Incorporate changes in 2.5.11.
* arch/sh/defconfig, drivers/block/rd.c, drivers/char/Config.help,
drivers/char/Makefile, drivers/video/epson1355fb.c,
drivers/video/hitfb.c, drivers/video/pvr2fb.c,
include/asm-sh/ide.h, mm/memory.c: Likewise.
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.18
diff -u -3 -p -r1.18 Makefile
--- Makefile 1 May 2002 00:36:45 -0000 1.18
+++ Makefile 1 May 2002 01:00:28 -0000
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 10
+SUBLEVEL = 11
EXTRAVERSION =-sh
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: Documentation/cachetlb.txt
===================================================================
RCS file: /cvsroot/linuxsh/linux/Documentation/cachetlb.txt,v
retrieving revision 1.4
diff -u -3 -p -r1.4 cachetlb.txt
--- Documentation/cachetlb.txt 22 Mar 2002 00:59:15 -0000 1.4
+++ Documentation/cachetlb.txt 1 May 2002 01:00:28 -0000
@@ -49,6 +49,9 @@ changes occur:
page table operations such as what happens during
fork, and exec.
+ Platform developers note that generic code will always
+ invoke this interface without mm->page_table_lock held.
+
3) void flush_tlb_range(struct vm_area_struct *vma,
unsigned long start, unsigned long end)
@@ -69,6 +72,9 @@ changes occur:
call flush_tlb_page (see below) for each entry which may be
modified.
+ Platform developers note that generic code will always
+ invoke this interface with mm->page_table_lock held.
+
4) void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
This time we need to remove the PAGE_SIZE sized translation
@@ -86,6 +92,9 @@ changes occur:
'vma->vm_mm' for virtual address 'page'.
This is used primarily during fault processing.
+
+ Platform developers note that generic code will always
+ invoke this interface with mm->page_table_lock held.
5) void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
Index: arch/sh/defconfig
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/defconfig,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 defconfig
--- arch/sh/defconfig 15 Oct 2001 20:44:46 -0000 1.1.1.1
+++ arch/sh/defconfig 1 May 2002 01:00:28 -0000
@@ -165,7 +165,7 @@ CONFIG_SERIAL_CONSOLE=y
# CONFIG_JOLIET is not set
# CONFIG_MINIX_FS is not set
# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_DEBUG is not set
# CONFIG_HPFS_FS is not set
CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
Index: arch/sh/kernel/entry.S
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/entry.S,v
retrieving revision 1.13
diff -u -3 -p -r1.13 entry.S
--- arch/sh/kernel/entry.S 12 Apr 2002 04:26:28 -0000 1.13
+++ arch/sh/kernel/entry.S 1 May 2002 01:00:28 -0000
@@ -182,8 +182,8 @@ call_dpf:
.align 2
1: .long MMU_TEA
-2: .long SYMBOL_NAME(__do_page_fault)
-3: .long SYMBOL_NAME(do_page_fault)
+2: .long __do_page_fault
+3: .long do_page_fault
.align 2
address_error_load:
@@ -205,7 +205,7 @@ call_dae:
.align 2
1: .long MMU_TEA
-2: .long SYMBOL_NAME(do_address_error)
+2: .long do_address_error
#if defined(CONFIG_SH_STANDARD_BIOS)
.align 2
@@ -245,7 +245,7 @@ debug_kernel:
ldc k1, ssr
.align 2
1: .long 0x300000f0
-2: .long SYMBOL_NAME(gdb_vbr_vector)
+2: .long gdb_vbr_vector
#endif
.align 2
@@ -272,8 +272,8 @@ error:
!
.align 2
-1: .long SYMBOL_NAME(break_point_trap_software)
-2: .long SYMBOL_NAME(do_exception_error)
+1: .long break_point_trap_software
+2: .long do_exception_error
.align 2
ret_from_irq:
@@ -328,8 +328,8 @@ work_resched:
tst #_TIF_NEED_RESCHED, r0
.align 2
-1: .long SYMBOL_NAME(schedule)
-2: .long SYMBOL_NAME(do_signal)
+1: .long schedule
+2: .long do_signal
.align 2
syscall_exit_work:
@@ -507,8 +507,8 @@ restore_all:
.align 2
1: .long TRA
2: .long NR_syscalls
-3: .long SYMBOL_NAME(sys_call_table)
-4: .long SYMBOL_NAME(do_syscall_trace)
+3: .long sys_call_table
+4: .long do_syscall_trace
7: .long 0x30000000
8: .long 0x00008000 ! FD
9: .long 0xffff7f0f ! ~(IMASK+FD)
@@ -622,7 +622,7 @@ handle_exception:
.align 2
2: .long 0x000000f0 ! FD=0, IMASK=15
3: .long 0xcfffffff ! RB=0, BL=0
-4: .long SYMBOL_NAME(exception_handling_table)
+4: .long exception_handling_table
.align 2
none:
@@ -641,7 +641,7 @@ ENTRY(exception_handling_table)
.long address_error_load
.long address_error_store
#if defined(__SH4__)
- .long SYMBOL_NAME(do_fpu_error)
+ .long do_fpu_error
#else
.long error ! fpu_exception
#endif
@@ -655,93 +655,93 @@ ENTRY(user_break_point_trap)
.long break_point_trap
ENTRY(interrupt_table)
! external hardware
- .long SYMBOL_NAME(do_IRQ) ! 0000
- .long SYMBOL_NAME(do_IRQ) ! 0001
- .long SYMBOL_NAME(do_IRQ) ! 0010
- .long SYMBOL_NAME(do_IRQ) ! 0011
- .long SYMBOL_NAME(do_IRQ) ! 0100
- .long SYMBOL_NAME(do_IRQ) ! 0101
- .long SYMBOL_NAME(do_IRQ) ! 0110
- .long SYMBOL_NAME(do_IRQ) ! 0111
- .long SYMBOL_NAME(do_IRQ) ! 1000
- .long SYMBOL_NAME(do_IRQ) ! 1001
- .long SYMBOL_NAME(do_IRQ) ! 1010
- .long SYMBOL_NAME(do_IRQ) ! 1011
- .long SYMBOL_NAME(do_IRQ) ! 1100
- .long SYMBOL_NAME(do_IRQ) ! 1101
- .long SYMBOL_NAME(do_IRQ) ! 1110
+ .long do_IRQ ! 0000
+ .long do_IRQ ! 0001
+ .long do_IRQ ! 0010
+ .long do_IRQ ! 0011
+ .long do_IRQ ! 0100
+ .long do_IRQ ! 0101
+ .long do_IRQ ! 0110
+ .long do_IRQ ! 0111
+ .long do_IRQ ! 1000
+ .long do_IRQ ! 1001
+ .long do_IRQ ! 1010
+ .long do_IRQ ! 1011
+ .long do_IRQ ! 1100
+ .long do_IRQ ! 1101
+ .long do_IRQ ! 1110
.long error
! Internal hardware
- .long SYMBOL_NAME(do_IRQ) ! TMU0 tuni0
- .long SYMBOL_NAME(do_IRQ) ! TMU1 tuni1
- .long SYMBOL_NAME(do_IRQ) ! TMU2 tuni2
- .long SYMBOL_NAME(do_IRQ) ! ticpi2
- .long SYMBOL_NAME(do_IRQ) ! RTC ati
- .long SYMBOL_NAME(do_IRQ) ! pri
- .long SYMBOL_NAME(do_IRQ) ! cui
- .long SYMBOL_NAME(do_IRQ) ! SCI eri
- .long SYMBOL_NAME(do_IRQ) ! rxi
- .long SYMBOL_NAME(do_IRQ) ! txi
- .long SYMBOL_NAME(do_IRQ) ! tei
- .long SYMBOL_NAME(do_IRQ) ! WDT iti
- .long SYMBOL_NAME(do_IRQ) ! REF rcmi
- .long SYMBOL_NAME(do_IRQ) ! rovi
- .long SYMBOL_NAME(do_IRQ)
- .long SYMBOL_NAME(do_IRQ)
+ .long do_IRQ ! TMU0 tuni0
+ .long do_IRQ ! TMU1 tuni1
+ .long do_IRQ ! TMU2 tuni2
+ .long do_IRQ ! ticpi2
+ .long do_IRQ ! RTC ati
+ .long do_IRQ ! pri
+ .long do_IRQ ! cui
+ .long do_IRQ ! SCI eri
+ .long do_IRQ ! rxi
+ .long do_IRQ ! txi
+ .long do_IRQ ! tei
+ .long do_IRQ ! WDT iti
+ .long do_IRQ ! REF rcmi
+ .long do_IRQ ! rovi
+ .long do_IRQ
+ .long do_IRQ
#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
- .long SYMBOL_NAME(do_IRQ) ! 32 IRQ irq0
- .long SYMBOL_NAME(do_IRQ) ! 33 irq1
- .long SYMBOL_NAME(do_IRQ) ! 34 irq2
- .long SYMBOL_NAME(do_IRQ) ! 35 irq3
- .long SYMBOL_NAME(do_IRQ) ! 36 irq4
- .long SYMBOL_NAME(do_IRQ) ! 37 irq5
- .long SYMBOL_NAME(do_IRQ) ! 38
- .long SYMBOL_NAME(do_IRQ) ! 39
- .long SYMBOL_NAME(do_IRQ) ! 40 PINT pint0-7
- .long SYMBOL_NAME(do_IRQ) ! 41 pint8-15
- .long SYMBOL_NAME(do_IRQ) ! 42
- .long SYMBOL_NAME(do_IRQ) ! 43
- .long SYMBOL_NAME(do_IRQ) ! 44
- .long SYMBOL_NAME(do_IRQ) ! 45
- .long SYMBOL_NAME(do_IRQ) ! 46
- .long SYMBOL_NAME(do_IRQ) ! 47
- .long SYMBOL_NAME(do_IRQ) ! 48 DMAC dei0
- .long SYMBOL_NAME(do_IRQ) ! 49 dei1
- .long SYMBOL_NAME(do_IRQ) ! 50 dei2
- .long SYMBOL_NAME(do_IRQ) ! 51 dei3
- .long SYMBOL_NAME(do_IRQ) ! 52 IrDA eri1
- .long SYMBOL_NAME(do_IRQ) ! 53 rxi1
- .long SYMBOL_NAME(do_IRQ) ! 54 bri1
- .long SYMBOL_NAME(do_IRQ) ! 55 txi1
- .long SYMBOL_NAME(do_IRQ) ! 56 SCIF eri2
- .long SYMBOL_NAME(do_IRQ) ! 57 rxi2
- .long SYMBOL_NAME(do_IRQ) ! 58 bri2
- .long SYMBOL_NAME(do_IRQ) ! 59 txi2
- .long SYMBOL_NAME(do_IRQ) ! 60 ADC adi
+ .long do_IRQ ! 32 IRQ irq0
+ .long do_IRQ ! 33 irq1
+ .long do_IRQ ! 34 irq2
+ .long do_IRQ ! 35 irq3
+ .long do_IRQ ! 36 irq4
+ .long do_IRQ ! 37 irq5
+ .long do_IRQ ! 38
+ .long do_IRQ ! 39
+ .long do_IRQ ! 40 PINT pint0-7
+ .long do_IRQ ! 41 pint8-15
+ .long do_IRQ ! 42
+ .long do_IRQ ! 43
+ .long do_IRQ ! 44
+ .long do_IRQ ! 45
+ .long do_IRQ ! 46
+ .long do_IRQ ! 47
+ .long do_IRQ ! 48 DMAC dei0
+ .long do_IRQ ! 49 dei1
+ .long do_IRQ ! 50 dei2
+ .long do_IRQ ! 51 dei3
+ .long do_IRQ ! 52 IrDA eri1
+ .long do_IRQ ! 53 rxi1
+ .long do_IRQ ! 54 bri1
+ .long do_IRQ ! 55 txi1
+ .long do_IRQ ! 56 SCIF eri2
+ .long do_IRQ ! 57 rxi2
+ .long do_IRQ ! 58 bri2
+ .long do_IRQ ! 59 txi2
+ .long do_IRQ ! 60 ADC adi
#if defined(CONFIG_CPU_SUBTYPE_SH7707)
- .long SYMBOL_NAME(do_IRQ) ! 61 LCDC lcdi
- .long SYMBOL_NAME(do_IRQ) ! 62 PCC pcc0i
- .long SYMBOL_NAME(do_IRQ) ! 63 pcc1i
+ .long do_IRQ ! 61 LCDC lcdi
+ .long do_IRQ ! 62 PCC pcc0i
+ .long do_IRQ ! 63 pcc1i
#endif
#elif defined(__SH4__)
- .long SYMBOL_NAME(do_IRQ) ! 32 Hitachi UDI
- .long SYMBOL_NAME(do_IRQ) ! 33 GPIO
- .long SYMBOL_NAME(do_IRQ) ! 34 DMAC dmte0
- .long SYMBOL_NAME(do_IRQ) ! 35 dmte1
- .long SYMBOL_NAME(do_IRQ) ! 36 dmte2
- .long SYMBOL_NAME(do_IRQ) ! 37 dmte3
- .long SYMBOL_NAME(do_IRQ) ! 38 dmae
+ .long do_IRQ ! 32 Hitachi UDI
+ .long do_IRQ ! 33 GPIO
+ .long do_IRQ ! 34 DMAC dmte0
+ .long do_IRQ ! 35 dmte1
+ .long do_IRQ ! 36 dmte2
+ .long do_IRQ ! 37 dmte3
+ .long do_IRQ ! 38 dmae
.long error ! 39
- .long SYMBOL_NAME(do_IRQ) ! 40 SCIF eri
- .long SYMBOL_NAME(do_IRQ) ! 41 rxi
- .long SYMBOL_NAME(do_IRQ) ! 42 bri
- .long SYMBOL_NAME(do_IRQ) ! 43 txi
+ .long do_IRQ ! 40 SCIF eri
+ .long do_IRQ ! 41 rxi
+ .long do_IRQ ! 42 bri
+ .long do_IRQ ! 43 txi
.long error ! 44
.long error ! 45
.long error ! 46
.long error ! 47
- .long SYMBOL_NAME(do_fpu_state_restore) ! 48
- .long SYMBOL_NAME(do_fpu_state_restore) ! 49
+ .long do_fpu_state_restore ! 48
+ .long do_fpu_state_restore ! 49
#endif
#if defined(CONFIG_CPU_SUBTYPE_SH7751)
.long error
@@ -758,14 +758,14 @@ ENTRY(interrupt_table)
.long error
.long error
.long error
- .long SYMBOL_NAME(do_IRQ) ! PCI serr
- .long SYMBOL_NAME(do_IRQ) ! dma3
- .long SYMBOL_NAME(do_IRQ) ! dma2
- .long SYMBOL_NAME(do_IRQ) ! dma1
- .long SYMBOL_NAME(do_IRQ) ! dma0
- .long SYMBOL_NAME(do_IRQ) ! pwon
- .long SYMBOL_NAME(do_IRQ) ! pwdwn
- .long SYMBOL_NAME(do_IRQ) ! err
+ .long do_IRQ ! PCI serr
+ .long do_IRQ ! dma3
+ .long do_IRQ ! dma2
+ .long do_IRQ ! dma1
+ .long do_IRQ ! dma0
+ .long do_IRQ ! pwon
+ .long do_IRQ ! pwdwn
+ .long do_IRQ ! err
#elif defined(CONFIG_CPU_SUBTYPE_ST40STB1)
.long error ! 50 0x840
.long error ! 51 0x860
@@ -781,25 +781,25 @@ ENTRY(interrupt_table)
.long error ! 61 0x9a0
.long error ! 62 0x9c0
.long error ! 63 0x9e0
- .long SYMBOL_NAME(do_IRQ) ! 64 0xa00 PCI serr
- .long SYMBOL_NAME(do_IRQ) ! 65 0xa20 err
- .long SYMBOL_NAME(do_IRQ) ! 66 0xa40 ad
- .long SYMBOL_NAME(do_IRQ) ! 67 0xa60 pwr_dwn
+ .long do_IRQ ! 64 0xa00 PCI serr
+ .long do_IRQ ! 65 0xa20 err
+ .long do_IRQ ! 66 0xa40 ad
+ .long do_IRQ ! 67 0xa60 pwr_dwn
.long error ! 68 0xa80
.long error ! 69 0xaa0
.long error ! 70 0xac0
.long error ! 71 0xae0
- .long SYMBOL_NAME(do_IRQ) ! 72 0xb00 DMA INT0
- .long SYMBOL_NAME(do_IRQ) ! 73 0xb20 INT1
- .long SYMBOL_NAME(do_IRQ) ! 74 0xb40 INT2
- .long SYMBOL_NAME(do_IRQ) ! 75 0xb60 INT3
- .long SYMBOL_NAME(do_IRQ) ! 76 0xb80 INT4
+ .long do_IRQ ! 72 0xb00 DMA INT0
+ .long do_IRQ ! 73 0xb20 INT1
+ .long do_IRQ ! 74 0xb40 INT2
+ .long do_IRQ ! 75 0xb60 INT3
+ .long do_IRQ ! 76 0xb80 INT4
.long error ! 77 0xba0
- .long SYMBOL_NAME(do_IRQ) ! 78 0xbc0 DMA ERR
+ .long do_IRQ ! 78 0xbc0 DMA ERR
.long error ! 79 0xbe0
- .long SYMBOL_NAME(do_IRQ) ! 80 0xc00 PIO0
- .long SYMBOL_NAME(do_IRQ) ! 81 0xc20 PIO1
- .long SYMBOL_NAME(do_IRQ) ! 82 0xc40 PIO2
+ .long do_IRQ ! 80 0xc00 PIO0
+ .long do_IRQ ! 81 0xc20 PIO1
+ .long do_IRQ ! 82 0xc40 PIO2
.long error ! 83 0xc60
.long error ! 84 0xc80
.long error ! 85 0xca0
@@ -829,7 +829,7 @@ ENTRY(interrupt_table)
.long error ! 109 0xfa0
.long error ! 110 0xfc0
.long error ! 111 0xfe0
- .long SYMBOL_NAME(do_IRQ) ! 112 0x1000 Mailbox
+ .long do_IRQ ! 112 0x1000 Mailbox
.long error ! 113 0x1020
.long error ! 114 0x1040
.long error ! 115 0x1060
@@ -857,259 +857,259 @@ ENTRY(interrupt_table)
.long error ! 137 0x1320
.long error ! 138 0x1340
.long error ! 139 0x1360
- .long SYMBOL_NAME(do_IRQ) ! 140 0x1380 EMPI INV_ADDR
+ .long do_IRQ ! 140 0x1380 EMPI INV_ADDR
.long error ! 141 0x13a0
.long error ! 142 0x13c0
.long error ! 143 0x13e0
#endif
ENTRY(sys_call_table)
- .long SYMBOL_NAME(sys_ni_syscall) /* 0 - old "setup()" system call*/
- .long SYMBOL_NAME(sys_exit)
- .long SYMBOL_NAME(sys_fork)
- .long SYMBOL_NAME(sys_read)
- .long SYMBOL_NAME(sys_write)
- .long SYMBOL_NAME(sys_open) /* 5 */
- .long SYMBOL_NAME(sys_close)
- .long SYMBOL_NAME(sys_waitpid)
- .long SYMBOL_NAME(sys_creat)
- .long SYMBOL_NAME(sys_link)
- .long SYMBOL_NAME(sys_unlink) /* 10 */
- .long SYMBOL_NAME(sys_execve)
- .long SYMBOL_NAME(sys_chdir)
- .long SYMBOL_NAME(sys_time)
- .long SYMBOL_NAME(sys_mknod)
- .long SYMBOL_NAME(sys_chmod) /* 15 */
- .long SYMBOL_NAME(sys_lchown16)
- .long SYMBOL_NAME(sys_ni_syscall) /* old break syscall holder */
- .long SYMBOL_NAME(sys_stat)
- .long SYMBOL_NAME(sys_lseek)
- .long SYMBOL_NAME(sys_getpid) /* 20 */
- .long SYMBOL_NAME(sys_mount)
- .long SYMBOL_NAME(sys_oldumount)
- .long SYMBOL_NAME(sys_setuid16)
- .long SYMBOL_NAME(sys_getuid16)
- .long SYMBOL_NAME(sys_stime) /* 25 */
- .long SYMBOL_NAME(sys_ptrace)
- .long SYMBOL_NAME(sys_alarm)
- .long SYMBOL_NAME(sys_fstat)
- .long SYMBOL_NAME(sys_pause)
- .long SYMBOL_NAME(sys_utime) /* 30 */
- .long SYMBOL_NAME(sys_ni_syscall) /* old stty syscall holder */
- .long SYMBOL_NAME(sys_ni_syscall) /* old gtty syscall holder */
- .long SYMBOL_NAME(sys_access)
- .long SYMBOL_NAME(sys_nice)
- .long SYMBOL_NAME(sys_ni_syscall) /* 35 */ /* old ftime syscall holder */
- .long SYMBOL_NAME(sys_sync)
- .long SYMBOL_NAME(sys_kill)
- .long SYMBOL_NAME(sys_rename)
- .long SYMBOL_NAME(sys_mkdir)
- .long SYMBOL_NAME(sys_rmdir) /* 40 */
- .long SYMBOL_NAME(sys_dup)
- .long SYMBOL_NAME(sys_pipe)
- .long SYMBOL_NAME(sys_times)
- .long SYMBOL_NAME(sys_ni_syscall) /* old prof syscall holder */
- .long SYMBOL_NAME(sys_brk) /* 45 */
- .long SYMBOL_NAME(sys_setgid16)
- .long SYMBOL_NAME(sys_getgid16)
- .long SYMBOL_NAME(sys_signal)
- .long SYMBOL_NAME(sys_geteuid16)
- .long SYMBOL_NAME(sys_getegid16) /* 50 */
- .long SYMBOL_NAME(sys_acct)
- .long SYMBOL_NAME(sys_umount) /* recycled never used phys() */
- .long SYMBOL_NAME(sys_ni_syscall) /* old lock syscall holder */
- .long SYMBOL_NAME(sys_ioctl)
- .long SYMBOL_NAME(sys_fcntl) /* 55 */
- .long SYMBOL_NAME(sys_ni_syscall) /* old mpx syscall holder */
- .long SYMBOL_NAME(sys_setpgid)
- .long SYMBOL_NAME(sys_ni_syscall) /* old ulimit syscall holder */
- .long SYMBOL_NAME(sys_ni_syscall) /* sys_olduname */
- .long SYMBOL_NAME(sys_umask) /* 60 */
- .long SYMBOL_NAME(sys_chroot)
- .long SYMBOL_NAME(sys_ustat)
- .long SYMBOL_NAME(sys_dup2)
- .long SYMBOL_NAME(sys_getppid)
- .long SYMBOL_NAME(sys_getpgrp) /* 65 */
- .long SYMBOL_NAME(sys_setsid)
- .long SYMBOL_NAME(sys_sigaction)
- .long SYMBOL_NAME(sys_sgetmask)
- .long SYMBOL_NAME(sys_ssetmask)
- .long SYMBOL_NAME(sys_setreuid16) /* 70 */
- .long SYMBOL_NAME(sys_setregid16)
- .long SYMBOL_NAME(sys_sigsuspend)
- .long SYMBOL_NAME(sys_sigpending)
- .long SYMBOL_NAME(sys_sethostname)
- .long SYMBOL_NAME(sys_setrlimit) /* 75 */
- .long SYMBOL_NAME(sys_old_getrlimit)
- .long SYMBOL_NAME(sys_getrusage)
- .long SYMBOL_NAME(sys_gettimeofday)
- .long SYMBOL_NAME(sys_settimeofday)
- .long SYMBOL_NAME(sys_getgroups16) /* 80 */
- .long SYMBOL_NAME(sys_setgroups16)
- .long SYMBOL_NAME(sys_ni_syscall) /* sys_oldselect */
- .long SYMBOL_NAME(sys_symlink)
- .long SYMBOL_NAME(sys_lstat)
- .long SYMBOL_NAME(sys_readlink) /* 85 */
- .long SYMBOL_NAME(sys_uselib)
- .long SYMBOL_NAME(sys_swapon)
- .long SYMBOL_NAME(sys_reboot)
- .long SYMBOL_NAME(old_readdir)
- .long SYMBOL_NAME(old_mmap) /* 90 */
- .long SYMBOL_NAME(sys_munmap)
- .long SYMBOL_NAME(sys_truncate)
- .long SYMBOL_NAME(sys_ftruncate)
- .long SYMBOL_NAME(sys_fchmod)
- .long SYMBOL_NAME(sys_fchown16) /* 95 */
- .long SYMBOL_NAME(sys_getpriority)
- .long SYMBOL_NAME(sys_setpriority)
- .long SYMBOL_NAME(sys_ni_syscall) /* old profil syscall holder */
- .long SYMBOL_NAME(sys_statfs)
- .long SYMBOL_NAME(sys_fstatfs) /* 100 */
- .long SYMBOL_NAME(sys_ni_syscall) /* ioperm */
- .long SYMBOL_NAME(sys_socketcall)
- .long SYMBOL_NAME(sys_syslog)
- .long SYMBOL_NAME(sys_setitimer)
- .long SYMBOL_NAME(sys_getitimer) /* 105 */
- .long SYMBOL_NAME(sys_newstat)
- .long SYMBOL_NAME(sys_newlstat)
- .long SYMBOL_NAME(sys_newfstat)
- .long SYMBOL_NAME(sys_uname)
- .long SYMBOL_NAME(sys_ni_syscall) /* 110 */ /* iopl */
- .long SYMBOL_NAME(sys_vhangup)
- .long SYMBOL_NAME(sys_ni_syscall) /* idle */
- .long SYMBOL_NAME(sys_ni_syscall) /* vm86old */
- .long SYMBOL_NAME(sys_wait4)
- .long SYMBOL_NAME(sys_swapoff) /* 115 */
- .long SYMBOL_NAME(sys_sysinfo)
- .long SYMBOL_NAME(sys_ipc)
- .long SYMBOL_NAME(sys_fsync)
- .long SYMBOL_NAME(sys_sigreturn)
- .long SYMBOL_NAME(sys_clone) /* 120 */
- .long SYMBOL_NAME(sys_setdomainname)
- .long SYMBOL_NAME(sys_newuname)
- .long SYMBOL_NAME(sys_ni_syscall) /* sys_modify_ldt */
- .long SYMBOL_NAME(sys_adjtimex)
- .long SYMBOL_NAME(sys_mprotect) /* 125 */
- .long SYMBOL_NAME(sys_sigprocmask)
- .long SYMBOL_NAME(sys_create_module)
- .long SYMBOL_NAME(sys_init_module)
- .long SYMBOL_NAME(sys_delete_module)
- .long SYMBOL_NAME(sys_get_kernel_syms) /* 130 */
- .long SYMBOL_NAME(sys_quotactl)
- .long SYMBOL_NAME(sys_getpgid)
- .long SYMBOL_NAME(sys_fchdir)
- .long SYMBOL_NAME(sys_bdflush)
- .long SYMBOL_NAME(sys_sysfs) /* 135 */
- .long SYMBOL_NAME(sys_personality)
- .long SYMBOL_NAME(sys_ni_syscall) /* for afs_syscall */
- .long SYMBOL_NAME(sys_setfsuid16)
- .long SYMBOL_NAME(sys_setfsgid16)
- .long SYMBOL_NAME(sys_llseek) /* 140 */
- .long SYMBOL_NAME(sys_getdents)
- .long SYMBOL_NAME(sys_select)
- .long SYMBOL_NAME(sys_flock)
- .long SYMBOL_NAME(sys_msync)
- .long SYMBOL_NAME(sys_readv) /* 145 */
- .long SYMBOL_NAME(sys_writev)
- .long SYMBOL_NAME(sys_getsid)
- .long SYMBOL_NAME(sys_fdatasync)
- .long SYMBOL_NAME(sys_sysctl)
- .long SYMBOL_NAME(sys_mlock) /* 150 */
- .long SYMBOL_NAME(sys_munlock)
- .long SYMBOL_NAME(sys_mlockall)
- .long SYMBOL_NAME(sys_munlockall)
- .long SYMBOL_NAME(sys_sched_setparam)
- .long SYMBOL_NAME(sys_sched_getparam) /* 155 */
- .long SYMBOL_NAME(sys_sched_setscheduler)
- .long SYMBOL_NAME(sys_sched_getscheduler)
- .long SYMBOL_NAME(sys_sched_yield)
- .long SYMBOL_NAME(sys_sched_get_priority_max)
- .long SYMBOL_NAME(sys_sched_get_priority_min) /* 160 */
- .long SYMBOL_NAME(sys_sched_rr_get_interval)
- .long SYMBOL_NAME(sys_nanosleep)
- .long SYMBOL_NAME(sys_mremap)
- .long SYMBOL_NAME(sys_setresuid16)
- .long SYMBOL_NAME(sys_getresuid16) /* 165 */
- .long SYMBOL_NAME(sys_ni_syscall) /* vm86 */
- .long SYMBOL_NAME(sys_query_module)
- .long SYMBOL_NAME(sys_poll)
- .long SYMBOL_NAME(sys_nfsservctl)
- .long SYMBOL_NAME(sys_setresgid16) /* 170 */
- .long SYMBOL_NAME(sys_getresgid16)
- .long SYMBOL_NAME(sys_prctl)
- .long SYMBOL_NAME(sys_rt_sigreturn)
- .long SYMBOL_NAME(sys_rt_sigaction)
- .long SYMBOL_NAME(sys_rt_sigprocmask) /* 175 */
- .long SYMBOL_NAME(sys_rt_sigpending)
- .long SYMBOL_NAME(sys_rt_sigtimedwait)
- .long SYMBOL_NAME(sys_rt_sigqueueinfo)
- .long SYMBOL_NAME(sys_rt_sigsuspend)
- .long SYMBOL_NAME(sys_pread) /* 180 */
- .long SYMBOL_NAME(sys_pwrite)
- .long SYMBOL_NAME(sys_chown16)
- .long SYMBOL_NAME(sys_getcwd)
- .long SYMBOL_NAME(sys_capget)
- .long SYMBOL_NAME(sys_capset) /* 185 */
- .long SYMBOL_NAME(sys_sigaltstack)
- .long SYMBOL_NAME(sys_sendfile)
- .long SYMBOL_NAME(sys_ni_syscall) /* streams1 */
- .long SYMBOL_NAME(sys_ni_syscall) /* streams2 */
- .long SYMBOL_NAME(sys_vfork) /* 190 */
- .long SYMBOL_NAME(sys_getrlimit)
- .long SYMBOL_NAME(sys_mmap2)
- .long SYMBOL_NAME(sys_truncate64)
- .long SYMBOL_NAME(sys_ftruncate64)
- .long SYMBOL_NAME(sys_stat64) /* 195 */
- .long SYMBOL_NAME(sys_lstat64)
- .long SYMBOL_NAME(sys_fstat64)
- .long SYMBOL_NAME(sys_lchown)
- .long SYMBOL_NAME(sys_getuid)
- .long SYMBOL_NAME(sys_getgid) /* 200 */
- .long SYMBOL_NAME(sys_geteuid)
- .long SYMBOL_NAME(sys_getegid)
- .long SYMBOL_NAME(sys_setreuid)
- .long SYMBOL_NAME(sys_setregid)
- .long SYMBOL_NAME(sys_getgroups) /* 205 */
- .long SYMBOL_NAME(sys_setgroups)
- .long SYMBOL_NAME(sys_fchown)
- .long SYMBOL_NAME(sys_setresuid)
- .long SYMBOL_NAME(sys_getresuid)
- .long SYMBOL_NAME(sys_setresgid) /* 210 */
- .long SYMBOL_NAME(sys_getresgid)
- .long SYMBOL_NAME(sys_chown)
- .long SYMBOL_NAME(sys_setuid)
- .long SYMBOL_NAME(sys_setgid)
- .long SYMBOL_NAME(sys_setfsuid) /* 215 */
- .long SYMBOL_NAME(sys_setfsgid)
- .long SYMBOL_NAME(sys_pivot_root)
- .long SYMBOL_NAME(sys_mincore)
- .long SYMBOL_NAME(sys_madvise)
- .long SYMBOL_NAME(sys_getdents64) /* 220 */
- .long SYMBOL_NAME(sys_fcntl64)
- .long SYMBOL_NAME(sys_ni_syscall) /* reserved for TUX */
- .long SYMBOL_NAME(sys_ni_syscall) /* Reserved for Security */
- .long SYMBOL_NAME(sys_gettid)
- .long SYMBOL_NAME(sys_readahead) /* 225 */
- .long SYMBOL_NAME(sys_setxattr)
- .long SYMBOL_NAME(sys_lsetxattr)
- .long SYMBOL_NAME(sys_fsetxattr)
- .long SYMBOL_NAME(sys_getxattr)
- .long SYMBOL_NAME(sys_lgetxattr) /* 230 */
- .long SYMBOL_NAME(sys_fgetxattr)
- .long SYMBOL_NAME(sys_listxattr)
- .long SYMBOL_NAME(sys_llistxattr)
- .long SYMBOL_NAME(sys_flistxattr)
- .long SYMBOL_NAME(sys_removexattr) /* 235 */
- .long SYMBOL_NAME(sys_lremovexattr)
- .long SYMBOL_NAME(sys_fremovexattr)
- .long SYMBOL_NAME(sys_tkill)
- .long SYMBOL_NAME(sys_sendfile64)
- .long SYMBOL_NAME(sys_futex) /* 240 */
- .long SYMBOL_NAME(sys_sched_setaffinity)
- .long SYMBOL_NAME(sys_sched_getaffinity)
+ .long sys_ni_syscall /* 0 - old "setup()" system call*/
+ .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_lchown16
+ .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 /* sys_olduname */
+ .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_ni_syscall /* sys_oldselect */
+ .long sys_symlink
+ .long sys_lstat
+ .long sys_readlink /* 85 */
+ .long sys_uselib
+ .long sys_swapon
+ .long sys_reboot
+ .long old_readdir
+ .long 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 */
+ .long sys_socketcall
+ .long sys_syslog
+ .long sys_setitimer
+ .long sys_getitimer /* 105 */
+ .long sys_newstat
+ .long sys_newlstat
+ .long sys_newfstat
+ .long sys_uname
+ .long sys_ni_syscall /* 110 */ /* iopl */
+ .long sys_vhangup
+ .long sys_ni_syscall /* idle */
+ .long sys_ni_syscall /* vm86old */
+ .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_ni_syscall /* sys_modify_ldt */
+ .long sys_adjtimex
+ .long sys_mprotect /* 125 */
+ .long sys_sigprocmask
+ .long sys_create_module
+ .long sys_init_module
+ .long sys_delete_module
+ .long sys_get_kernel_syms /* 130 */
+ .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_ni_syscall /* vm86 */
+ .long 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_pread /* 180 */
+ .long sys_pwrite
+ .long sys_chown16
+ .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_lchown
+ .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_chown
+ .long sys_setuid
+ .long sys_setgid
+ .long sys_setfsuid /* 215 */
+ .long sys_setfsgid
+ .long sys_pivot_root
+ .long sys_mincore
+ .long sys_madvise
+ .long sys_getdents64 /* 220 */
+ .long sys_fcntl64
+ .long sys_ni_syscall /* reserved for TUX */
+ .long sys_ni_syscall /* Reserved for Security */
+ .long sys_gettid
+ .long sys_readahead /* 225 */
+ .long sys_setxattr
+ .long sys_lsetxattr
+ .long sys_fsetxattr
+ .long sys_getxattr
+ .long sys_lgetxattr /* 230 */
+ .long sys_fgetxattr
+ .long sys_listxattr
+ .long sys_llistxattr
+ .long sys_flistxattr
+ .long sys_removexattr /* 235 */
+ .long sys_lremovexattr
+ .long sys_fremovexattr
+ .long sys_tkill
+ .long sys_sendfile64
+ .long sys_futex /* 240 */
+ .long sys_sched_setaffinity
+ .long sys_sched_getaffinity
.rept NR_syscalls-(.-sys_call_table)/4
- .long SYMBOL_NAME(sys_ni_syscall)
+ .long sys_ni_syscall
.endr
/* End of entry.S */
Index: arch/sh/kernel/head.S
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/head.S,v
retrieving revision 1.3
diff -u -3 -p -r1.3 head.S
--- arch/sh/kernel/head.S 22 Mar 2002 12:57:10 -0000 1.3
+++ arch/sh/kernel/head.S 1 May 2002 01:00:28 -0000
@@ -69,8 +69,8 @@ ENTRY(_stext)
.balign 4
1: .long 0x400080F0 ! MD=1, RB=0, BL=0, FD=1, IMASK=0xF
-2: .long SYMBOL_NAME(stack)
-3: .long SYMBOL_NAME(__bss_start)
-4: .long SYMBOL_NAME(_end)
-5: .long SYMBOL_NAME(start_kernel)
-6: .long SYMBOL_NAME(cache_init)
+2: .long stack
+3: .long __bss_start
+4: .long _end
+5: .long start_kernel
+6: .long cache_init
Index: arch/sh/lib/memmove.S
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/lib/memmove.S,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 memmove.S
--- arch/sh/lib/memmove.S 15 Oct 2001 20:44:53 -0000 1.1.1.1
+++ arch/sh/lib/memmove.S 1 May 2002 01:00:28 -0000
@@ -20,7 +20,7 @@ ENTRY(memmove)
jmp @r0
nop
.balign 4
-2: .long SYMBOL_NAME(memcpy)
+2: .long memcpy
1:
sub r5,r4 ! From here, r4 has the distance to r0
tst r6,r6
Index: arch/sh/mm/clear_page.S
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/clear_page.S,v
retrieving revision 1.7
diff -u -3 -p -r1.7 clear_page.S
--- arch/sh/mm/clear_page.S 25 Apr 2002 07:21:04 -0000 1.7
+++ arch/sh/mm/clear_page.S 1 May 2002 01:00:28 -0000
@@ -254,7 +254,7 @@ ENTRY(__flush_dcache_all)
nop
.align 2
2: .long 0xffffc000
-3: .long SYMBOL_NAME(empty_zero_page)
+3: .long empty_zero_page
4: .long 0x10000000 ! BL bit
/* flush_cache_4096_all(unsigned long addr) */
@@ -289,6 +289,6 @@ ENTRY(flush_cache_4096_all)
nop
.align 2
2: .long 0xffffc000
-3: .long SYMBOL_NAME(empty_zero_page)
+3: .long empty_zero_page
4: .long 0x10000000 ! BL bit
#endif
Index: drivers/block/rd.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/block/rd.c,v
retrieving revision 1.8
diff -u -3 -p -r1.8 rd.c
--- drivers/block/rd.c 16 Apr 2002 00:21:19 -0000 1.8
+++ drivers/block/rd.c 1 May 2002 01:00:28 -0000
@@ -244,7 +244,7 @@ static int rd_make_request(request_queue
unsigned long offset, len;
int rw = sbh->bi_rw;
- minor = minor(sbh->bi_dev);
+ minor = minor(to_kdev_t(sbh->bi_bdev->bd_dev));
if (minor >= NUM_RAMDISKS)
goto fail;
Index: drivers/char/Config.help
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Config.help,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Config.help
--- drivers/char/Config.help 22 Mar 2002 04:44:45 -0000 1.3
+++ drivers/char/Config.help 1 May 2002 01:00:28 -0000
@@ -453,6 +453,17 @@ CONFIG_SYNCLINK
The module will be called synclink.o. If you want to do that, say M
here.
+CONFIG_SYNCLINKMP
+ Enable support for the SyncLink Multiport (2 or 4 ports)
+ serial adapter, running asynchronous and HDLC communications up
+ to 2.048Mbps. Each ports is independently selectable for
+ RS-232, V.35, RS-449, RS-530, and X.21
+
+ This driver may be built as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called synclinkmp.o. If you want to do that, say M
+ here.
+
CONFIG_N_HDLC
Allows synchronous HDLC communications with tty device drivers that
support synchronous HDLC such as the Microgate SyncLink adapter.
Index: drivers/char/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Makefile,v
retrieving revision 1.5
diff -u -3 -p -r1.5 Makefile
--- drivers/char/Makefile 23 Apr 2002 04:35:59 -0000 1.5
+++ drivers/char/Makefile 1 May 2002 01:00:28 -0000
@@ -143,6 +143,7 @@ obj-$(CONFIG_RISCOM8) += riscom8.o
obj-$(CONFIG_ISI) += isicom.o
obj-$(CONFIG_ESPSERIAL) += esp.o
obj-$(CONFIG_SYNCLINK) += synclink.o
+obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
obj-$(CONFIG_N_HDLC) += n_hdlc.o
obj-$(CONFIG_SPECIALIX) += specialix.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
Index: drivers/video/epson1355fb.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/video/epson1355fb.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 epson1355fb.c
--- drivers/video/epson1355fb.c 5 Apr 2002 04:45:01 -0000 1.2
+++ drivers/video/epson1355fb.c 1 May 2002 01:00:28 -0000
@@ -361,9 +361,9 @@ static int e1355_getcolreg(unsigned regn
return 0;
}
-static int e1355_setcolreg(unsigned regno, unsigned red, unsigned green,
- unsigned blue, unsigned transp,
- struct fb_info *info)
+static int e1355fb_setcolreg(unsigned regno, unsigned red, unsigned green,
+ unsigned blue, unsigned transp,
+ struct fb_info *info)
{
u8 r = (red >> 8) & 0xf0;
u8 g = (green>>8) & 0xf0;
@@ -432,7 +432,6 @@ static void e1355_set_disp(const void *u
{
struct display_switch *d;
- disp->screen_base = (void *)E1355_FB_BASE;
disp->dispsw = &e1355_dispsw;
switch(disp->var.bits_per_pixel) {
@@ -467,7 +466,6 @@ struct fbgen_hwswitch e1355_switch = {
get_par: e1355_get_par,
set_par: e1355_set_par,
getcolreg: e1355_getcolreg,
- setcolreg: e1355_setcolreg,
pan_display: e1355_pan_display,
blank: e1355_blank,
set_disp: e1355_set_disp,
@@ -483,8 +481,10 @@ static struct fb_ops e1355fb_ops = {
fb_get_var: fbgen_get_var,
fb_set_var: fbgen_set_var,
fb_get_cmap: fbgen_get_cmap,
- fb_set_cmap: fbgen_set_cmap,
+ fb_set_cmap: gen_set_cmap,
+ fb_setcolreg: e1355fb_setcolreg,
fb_pan_display: fbgen_pan_display,
+ fb_blank: fbgen_blank,
};
static struct e1355fb_info fb_info;
@@ -502,18 +502,19 @@ int __init e1355fb_init(void)
fb_info.gen.info.changevar = NULL;
fb_info.gen.info.node = NODEV;
fb_info.gen.info.fbops = &e1355fb_ops;
+ fb_info.gen.info.screen_base = (void *)E1355_FB_BASE;
+ fb_info.gen.currcon = -1;
fb_info.gen.info.disp = &disp;
fb_info.gen.parsize = sizeof(struct e1355_par);
fb_info.gen.info.switch_con = &fbgen_switch;
fb_info.gen.info.updatevar = &fbgen_update_var;
- fb_info.gen.info.blank = &fbgen_blank;
fb_info.gen.info.flags = FBINFO_FLAG_DEFAULT;
/* This should give a reasonable default video mode */
fbgen_get_var(&disp.var, -1, &fb_info.gen.info);
fbgen_do_set_var(&disp.var, 1, &fb_info.gen);
fbgen_set_disp(-1, &fb_info.gen);
if (disp.var.bits_per_pixel > 1)
- fbgen_install_cmap(0, &fb_info.gen);
+ do_install_cmap(0, &fb_info.gen);
if (register_framebuffer(&fb_info.gen.info) < 0)
return -EINVAL;
printk(KERN_INFO "fb%d: %s frame buffer device\n", GET_FB_IDX(fb_info.gen.info.node),
Index: drivers/video/hitfb.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/video/hitfb.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 hitfb.c
--- drivers/video/hitfb.c 24 Jan 2002 11:04:15 -0000 1.2
+++ drivers/video/hitfb.c 1 May 2002 01:00:28 -0000
@@ -294,7 +294,6 @@ static void hitfb_set_disp(const void *f
{
const struct hitfb_par *par = fb_par;
- disp->screen_base = (void *)fb_info.hit_videobase;
disp->scrollmode = SCROLL_YREDRAW;
switch(((struct hitfb_par *)par)->bpp) {
@@ -323,7 +322,6 @@ struct fbgen_hwswitch hitfb_switch = {
hitfb_get_par,
hitfb_set_par,
hitfb_getcolreg,
- hitfb_setcolreg,
hitfb_pan_display,
hitfb_blank,
hitfb_set_disp
@@ -337,7 +335,9 @@ static struct fb_ops hitfb_ops = {
fb_set_var: fbgen_set_var,
fb_get_cmap: fbgen_get_cmap,
fb_set_cmap: fbgen_set_cmap,
+ fb_setcolreg: hitfb_setcolreg,
fb_pan_display: fbgen_pan_display,
+ fb_blank: fbgen_blank,
};
@@ -348,19 +348,20 @@ int __init hitfb_init(void)
fb_info.gen.info.flags = FBINFO_FLAG_DEFAULT;
fb_info.gen.info.fbops = &hitfb_ops;
fb_info.gen.info.disp = &fb_info.disp;
+ fb_info.gen.info.currcon = 1;
fb_info.gen.info.changevar = NULL;
fb_info.gen.info.switch_con = &fbgen_switch;
fb_info.gen.info.updatevar = &fbgen_update_var;
- fb_info.gen.info.blank = &fbgen_blank;
fb_info.gen.parsize = sizeof(struct hitfb_par);
fb_info.gen.fbhw = &hitfb_switch;
fb_info.gen.fbhw->detect();
+ fb_info.screen_base = (void *)fb_info.hit_videobase;
fbgen_get_var(&fb_info.disp.var, -1, &fb_info.gen.info);
fb_info.disp.var.activate = FB_ACTIVATE_NOW;
fbgen_do_set_var(&fb_info.disp.var, 1, &fb_info.gen);
fbgen_set_disp(-1, &fb_info.gen);
- fbgen_install_cmap(0, &fb_info.gen);
+ do_install_cmap(0, &fb_info.gen);
if(register_framebuffer(&fb_info.gen.info)<0) return -EINVAL;
Index: drivers/video/pvr2fb.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/video/pvr2fb.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 pvr2fb.c
--- drivers/video/pvr2fb.c 24 Jan 2002 11:04:15 -0000 1.2
+++ drivers/video/pvr2fb.c 1 May 2002 01:00:28 -0000
@@ -157,7 +157,6 @@ static struct pvr2fb_par {
} currentpar;
-static int currcon = 0;
static int currbpp;
static struct display disp;
static struct fb_info fb_info;
@@ -214,6 +213,9 @@ static int pvr2fb_get_cmap(struct fb_cma
struct fb_info *info);
static int pvr2fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info);
+static int pvr2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+ u_int transp, struct fb_info *info);
+static int pvr2fb_blank(int blank, struct fb_info *info);
/*
* Interface to the low level console driver
@@ -221,19 +223,15 @@ static int pvr2fb_set_cmap(struct fb_cma
static int pvr2fbcon_switch(int con, struct fb_info *info);
static int pvr2fbcon_updatevar(int con, struct fb_info *info);
-static void pvr2fbcon_blank(int blank, struct fb_info *info);
/*
* Internal/hardware-specific routines
*/
-static void do_install_cmap(int con, struct fb_info *info);
static u_long get_line_length(int xres_virtual, int bpp);
static void set_color_bitfields(struct fb_var_screeninfo *var);
static int pvr2_getcolreg(u_int regno, u_int *red, u_int *green, u_int *blue,
u_int *transp, struct fb_info *info);
-static int pvr2_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
- u_int transp, struct fb_info *info);
static int pvr2_encode_fix(struct fb_fix_screeninfo *fix,
struct pvr2fb_par *par);
@@ -260,7 +258,9 @@ static struct fb_ops pvr2fb_ops = {
fb_set_var: pvr2fb_set_var,
fb_get_cmap: pvr2fb_get_cmap,
fb_set_cmap: pvr2fb_set_cmap,
+ fb_setcolreg: pvr2fb_setcolreg,
fb_pan_display: pvr2fb_pan_display,
+ fb_blank: pvr2fb_blank,
};
static struct fb_videomode pvr2_modedb[] __initdata = {
@@ -381,7 +381,6 @@ static int pvr2fb_set_var(struct fb_var_
struct fb_fix_screeninfo fix;
pvr2_encode_fix(&fix, &par);
- display->screen_base = (char *)fix.smem_start;
display->scrollmode = SCROLL_YREDRAW;
display->visual = fix.visual;
display->type = fix.type;
@@ -422,7 +421,7 @@ static int pvr2fb_set_var(struct fb_var_
return err;
do_install_cmap(con, info);
}
- if (con == currcon)
+ if (con == info->currcon)
pvr2_set_var(&display->var);
}
@@ -448,7 +447,7 @@ static int pvr2fb_pan_display(struct fb_
fb_display[con].var.yres_virtual)
return -EINVAL;
}
- if (con == currcon)
+ if (con == info->currcon)
pvr2_pan_var(var);
fb_display[con].var.xoffset = var->xoffset;
fb_display[con].var.yoffset = var->yoffset;
@@ -465,7 +464,7 @@ static int pvr2fb_pan_display(struct fb_
static int pvr2fb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
struct fb_info *info)
{
- if (con == currcon) /* current console? */
+ if (con == info->currcon) /* current console? */
return fb_get_cmap(cmap, kspc, pvr2_getcolreg, info);
else if (fb_display[con].cmap.len) /* non default colormap? */
fb_copy_cmap(&fb_display[con].cmap, cmap, kspc ? 0 : 2);
@@ -488,8 +487,8 @@ static int pvr2fb_set_cmap(struct fb_cma
0)))
return err;
}
- if (con == currcon) /* current console? */
- return fb_set_cmap(cmap, kspc, pvr2_setcolreg, info);
+ if (con == info->currcon) /* current console? */
+ return fb_set_cmap(cmap, kspc, info);
else
fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
@@ -499,10 +498,10 @@ static int pvr2fb_set_cmap(struct fb_cma
static int pvr2fbcon_switch(int con, struct fb_info *info)
{
/* Do we have to save the colormap? */
- if (fb_display[currcon].cmap.len)
- fb_get_cmap(&fb_display[currcon].cmap, 1, pvr2_getcolreg, info);
+ if (fb_display[info->currcon].cmap.len)
+ fb_get_cmap(&fb_display[info->currcon].cmap, 1, pvr2_getcolreg, info);
- currcon = con;
+ info->currcon = con;
pvr2_set_var(&fb_display[con].var);
/* Install new colormap */
do_install_cmap(con, info);
@@ -515,24 +514,11 @@ static int pvr2fbcon_updatevar(int con,
return 0;
}
-static void pvr2fbcon_blank(int blank, struct fb_info *info)
+static int pvr2fb_blank(int blank, struct fb_info *info)
{
do_blank = blank ? blank : -1;
}
-/* Setup the colormap */
-
-static void do_install_cmap(int con, struct fb_info *info)
-{
- if (con != currcon)
- return;
- if (fb_display[con].cmap.len)
- fb_set_cmap(&fb_display[con].cmap, 1, pvr2_setcolreg, info);
- else
- fb_set_cmap(fb_default_cmap(1<<fb_display[con].var.bits_per_pixel),
- 1, pvr2_setcolreg, info);
-}
-
static inline u_long get_line_length(int xres_virtual, int bpp)
{
return (u_long)((((xres_virtual*bpp)+31)&~31) >> 3);
@@ -575,7 +561,7 @@ static int pvr2_getcolreg(u_int regno, u
return 0;
}
-static int pvr2_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+static int pvr2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
u_int transp, struct fb_info *info)
{
if (regno > 255)
@@ -1036,10 +1022,11 @@ int __init pvr2fb_init(void)
fb_info.changevar = NULL;
fb_info.node = NODEV;
fb_info.fbops = &pvr2fb_ops;
+ fb_info.screen_base = (char *) videomemory;
fb_info.disp = &disp;
+ fb_info.currcon = -1;
fb_info.switch_con = &pvr2fbcon_switch;
fb_info.updatevar = &pvr2fbcon_updatevar;
- fb_info.blank = &pvr2fbcon_blank;
fb_info.flags = FBINFO_FLAG_DEFAULT;
memset(&var, 0, sizeof(var));
Index: include/asm-sh/ide.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/ide.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 ide.h
--- include/asm-sh/ide.h 24 Jan 2002 11:04:15 -0000 1.2
+++ include/asm-sh/ide.h 1 May 2002 01:00:28 -0000
@@ -130,12 +130,6 @@ typedef union {
} b;
} control_t;
-#define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id))
-#define ide_free_irq(irq,dev_id) free_irq((irq), (dev_id))
-#define ide_check_region(from,extent) check_region((from), (extent))
-#define ide_request_region(from,extent,name) request_region((from), (extent), (name))
-#define ide_release_region(from,extent) release_region((from), (extent))
-
/*
* The following are not needed for the non-m68k ports
*/
Index: mm/memory.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/mm/memory.c,v
retrieving revision 1.10
diff -u -3 -p -r1.10 memory.c
--- mm/memory.c 10 Apr 2002 11:09:40 -0000 1.10
+++ mm/memory.c 1 May 2002 01:00:28 -0000
@@ -839,8 +839,8 @@ int zeromap_page_range(struct vm_area_st
address = (address + PGDIR_SIZE) & PGDIR_MASK;
dir++;
} while (address && (address < end));
- spin_unlock(&mm->page_table_lock);
flush_tlb_range(vma, beg, end);
+ spin_unlock(&mm->page_table_lock);
return error;
}
@@ -922,8 +922,8 @@ int remap_page_range(struct vm_area_stru
from = (from + PGDIR_SIZE) & PGDIR_MASK;
dir++;
} while (from && (from < end));
- spin_unlock(&mm->page_table_lock);
flush_tlb_range(vma, beg, end);
+ spin_unlock(&mm->page_table_lock);
return error;
}
|
