summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/mips64/arc/Makefile2
-rw-r--r--arch/mips64/kernel/r4k_fpu.S23
-rw-r--r--arch/mips64/kernel/scall_64.S86
-rw-r--r--arch/mips64/kernel/setup.c2
-rw-r--r--arch/mips64/mm/andes.c4
-rw-r--r--arch/mips64/mm/init.c4
-rw-r--r--arch/mips64/sgi-ip22/ip22-mc.c2
-rw-r--r--arch/mips64/sgi-ip22/ip22-sc.c22
8 files changed, 71 insertions, 74 deletions
diff --git a/arch/mips64/arc/Makefile b/arch/mips64/arc/Makefile
index 6217a1bdb..e1f687c34 100644
--- a/arch/mips64/arc/Makefile
+++ b/arch/mips64/arc/Makefile
@@ -7,6 +7,6 @@ obj-y := console.o init.o identify.o tree.o env.o cmdline.o misc.o time.o \
file.o
obj-$(CONFIG_ARC_MEMORY) += memory.o
-obj-$(CONFIG_ARC_CONSOLE) += arc_con.o
+obj-$(CONFIG_ARC_CONSOLE) += arc_con.o
include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/kernel/r4k_fpu.S b/arch/mips64/kernel/r4k_fpu.S
index f974bb84e..374178383 100644
--- a/arch/mips64/kernel/r4k_fpu.S
+++ b/arch/mips64/kernel/r4k_fpu.S
@@ -32,11 +32,11 @@
.set noreorder
/* Save floating point context */
LEAF(save_fp_context)
- mfc0 t1,CP0_STATUS
- sll t2,t1,5
+ mfc0 t1, CP0_STATUS
+ sll t2, t1,5
- bgez t2,1f
- cfc1 t1,fcr31
+ bgez t2, 1f
+ cfc1 t1, fcr31
/* Store the 16 odd double precision registers */
EX sdc1 $f1, SC_FPREGS+8(a0)
EX sdc1 $f3, SC_FPREGS+24(a0)
@@ -74,8 +74,8 @@ LEAF(save_fp_context)
EX sdc1 $f28, SC_FPREGS+224(a0)
EX sdc1 $f30, SC_FPREGS+240(a0)
EX sw t1, SC_FPC_CSR(a0)
- cfc1 t0,$0 # implementation/version
- EX sw t0,SC_FPC_EIR(a0)
+ cfc1 t0, $0 # implementation/version
+ EX sw t0, SC_FPC_EIR(a0)
jr ra
li v0, 0 # success
@@ -92,8 +92,8 @@ LEAF(save_fp_context)
*/
LEAF(restore_fp_context)
mfc0 t1, CP0_STATUS
- sll t0,t1,5
- bgez t0,1f
+ sll t0, t1,5
+ bgez t0, 1f
EX lw t0, SC_FPC_CSR(a0)
/* Restore the 16 odd double precision registers only
@@ -136,14 +136,13 @@ LEAF(restore_fp_context)
EX ldc1 $f26, SC_FPREGS+208(a0)
EX ldc1 $f28, SC_FPREGS+224(a0)
EX ldc1 $f30, SC_FPREGS+240(a0)
- ctc1 t0,fcr31
+ ctc1 t0, fcr31
jr ra
li v0, 0 # success
END(restore_fp_context)
- .set reorder
.type fault@function
.ent fault
-fault: li v0, -EFAULT
- jr ra
+fault: jr ra
+ li v0, -EFAULT # failure
.end fault
diff --git a/arch/mips64/kernel/scall_64.S b/arch/mips64/kernel/scall_64.S
index 378b06d9c..4e10263b6 100644
--- a/arch/mips64/kernel/scall_64.S
+++ b/arch/mips64/kernel/scall_64.S
@@ -131,217 +131,217 @@ illegal_syscall:
END(handle_sys64)
sys_call_table:
- PTR sys_syscall /* 4000 */
+ PTR sys_syscall /* 5000 */
PTR sys_exit
PTR sys_fork
PTR sys_read
PTR sys_write
- PTR sys_open /* 4005 */
+ PTR sys_open /* 5005 */
PTR sys_close
PTR sys_waitpid
PTR sys_creat
PTR sys_link
- PTR sys_unlink /* 4010 */
+ PTR sys_unlink /* 5010 */
PTR sys_execve
PTR sys_chdir
PTR sys_time
PTR sys_mknod
- PTR sys_chmod /* 4015 */
+ PTR sys_chmod /* 5015 */
PTR sys_lchown
PTR sys_ni_syscall
PTR sys_stat
PTR sys_lseek
- PTR sys_getpid /* 4020 */
+ PTR sys_getpid /* 5020 */
PTR sys_mount
PTR sys_oldumount
PTR sys_setuid
PTR sys_getuid
- PTR sys_stime /* 4025 */
+ PTR sys_stime /* 5025 */
PTR sys_ni_syscall /* ptrace */
PTR sys_alarm
PTR sys_fstat
PTR sys_pause
- PTR sys_utime /* 4030 */
+ PTR sys_utime /* 5030 */
PTR sys_ni_syscall
PTR sys_ni_syscall
PTR sys_access
PTR sys_nice
- PTR sys_ni_syscall /* 4035 */
+ PTR sys_ni_syscall /* 5035 */
PTR sys_sync
PTR sys_kill
PTR sys_rename
PTR sys_mkdir
- PTR sys_rmdir /* 4040 */
+ PTR sys_rmdir /* 5040 */
PTR sys_dup
PTR sys_pipe
PTR sys_times
PTR sys_ni_syscall
- PTR sys_brk /* 4045 */
+ PTR sys_brk /* 5045 */
PTR sys_setgid
PTR sys_getgid
PTR sys_ni_syscall /* was signal 2 */
PTR sys_geteuid
- PTR sys_getegid /* 4050 */
+ PTR sys_getegid /* 5050 */
PTR sys_acct
PTR sys_umount
PTR sys_ni_syscall
PTR sys_ioctl
- PTR sys_fcntl /* 4055 */
+ PTR sys_fcntl /* 5055 */
PTR sys_ni_syscall
PTR sys_setpgid
PTR sys_ni_syscall
PTR sys_ni_syscall
- PTR sys_umask /* 4060 */
+ PTR sys_umask /* 5060 */
PTR sys_chroot
PTR sys_ustat
PTR sys_dup2
PTR sys_getppid
- PTR sys_getpgrp /* 4065 */
+ PTR sys_getpgrp /* 5065 */
PTR sys_setsid
PTR sys_sigaction
PTR sys_sgetmask
PTR sys_ssetmask
- PTR sys_setreuid /* 4070 */
+ PTR sys_setreuid /* 5070 */
PTR sys_setregid
PTR sys_sigsuspend
PTR sys_sigpending
PTR sys_sethostname
- PTR sys_setrlimit /* 4075 */
+ PTR sys_setrlimit /* 5075 */
PTR sys_getrlimit
PTR sys_getrusage
PTR sys_gettimeofday
PTR sys_settimeofday
- PTR sys_getgroups /* 4080 */
+ PTR sys_getgroups /* 5080 */
PTR sys_setgroups
PTR sys_ni_syscall /* old_select */
PTR sys_symlink
PTR sys_lstat
- PTR sys_readlink /* 4085 */
+ PTR sys_readlink /* 5085 */
PTR sys_uselib
PTR sys_swapon
PTR sys_reboot
PTR sys_ni_syscall /* old_readdir */
- PTR sys_mmap /* 4090 */
+ PTR sys_mmap /* 5090 */
PTR sys_munmap
PTR sys_truncate
PTR sys_ftruncate
PTR sys_fchmod
- PTR sys_fchown /* 4095 */
+ PTR sys_fchown /* 5095 */
PTR sys_getpriority
PTR sys_setpriority
PTR sys_ni_syscall
PTR sys_statfs
- PTR sys_fstatfs /* 4100 */
+ PTR sys_fstatfs /* 5100 */
PTR sys_ni_syscall /* sys_ioperm */
PTR sys_socketcall
PTR sys_syslog
PTR sys_setitimer
- PTR sys_getitimer /* 4105 */
+ PTR sys_getitimer /* 5105 */
PTR sys_newstat
PTR sys_newlstat
PTR sys_newfstat
PTR sys_ni_syscall
- PTR sys_ni_syscall /* sys_ioperm *//* 4110 */
+ PTR sys_ni_syscall /* sys_ioperm *//* 5110 */
PTR sys_vhangup
PTR sys_ni_syscall /* was sys_idle */
PTR sys_ni_syscall /* sys_vm86 */
PTR sys_wait4
- PTR sys_swapoff /* 4115 */
+ PTR sys_swapoff /* 5115 */
PTR sys_sysinfo
PTR sys_ipc
PTR sys_fsync
PTR sys_sigreturn
- PTR sys_clone /* 4120 */
+ PTR sys_clone /* 5120 */
PTR sys_setdomainname
PTR sys_newuname
PTR sys_ni_syscall /* sys_modify_ldt */
PTR sys_adjtimex
- PTR sys_mprotect /* 4125 */
+ PTR sys_mprotect /* 5125 */
PTR sys_sigprocmask
PTR sys_create_module
PTR sys_init_module
PTR sys_delete_module
- PTR sys_get_kernel_syms /* 4130 */
+ PTR sys_get_kernel_syms /* 5130 */
PTR sys_quotactl
PTR sys_getpgid
PTR sys_fchdir
PTR sys_bdflush
- PTR sys_sysfs /* 4135 */
+ PTR sys_sysfs /* 5135 */
PTR sys_personality
PTR sys_ni_syscall /* for afs_syscall */
PTR sys_setfsuid
PTR sys_setfsgid
- PTR sys_llseek /* 4140 */
+ PTR sys_llseek /* 5140 */
PTR sys_getdents
PTR sys_select
PTR sys_flock
PTR sys_msync
- PTR sys_readv /* 4145 */
+ PTR sys_readv /* 5145 */
PTR sys_writev
PTR sys_cacheflush
PTR sys_cachectl
PTR sys_sysmips
- PTR sys_ni_syscall /* 4150 */
+ PTR sys_ni_syscall /* 5150 */
PTR sys_getsid
PTR sys_fdatasync
PTR sys_sysctl
PTR sys_mlock
- PTR sys_munlock /* 4155 */
+ PTR sys_munlock /* 5155 */
PTR sys_mlockall
PTR sys_munlockall
PTR sys_sched_setparam
PTR sys_sched_getparam
- PTR sys_sched_setscheduler /* 4160 */
+ PTR sys_sched_setscheduler /* 5160 */
PTR sys_sched_getscheduler
PTR sys_sched_yield
PTR sys_sched_get_priority_max
PTR sys_sched_get_priority_min
- PTR sys_sched_rr_get_interval /* 4165 */
+ PTR sys_sched_rr_get_interval /* 5165 */
PTR sys_nanosleep
PTR sys_mremap
PTR sys_accept
PTR sys_bind
- PTR sys_connect /* 4170 */
+ PTR sys_connect /* 5170 */
PTR sys_getpeername
PTR sys_getsockname
PTR sys_getsockopt
PTR sys_listen
- PTR sys_recv /* 4175 */
+ PTR sys_recv /* 5175 */
PTR sys_recvfrom
PTR sys_recvmsg
PTR sys_send
PTR sys_sendmsg
- PTR sys_sendto /* 4180 */
+ PTR sys_sendto /* 5180 */
PTR sys_setsockopt
PTR sys_shutdown
PTR sys_socket
PTR sys_socketpair
- PTR sys_setresuid /* 4185 */
+ PTR sys_setresuid /* 5185 */
PTR sys_getresuid
PTR sys_query_module
PTR sys_poll
PTR sys_nfsservctl
- PTR sys_setresgid /* 4190 */
+ PTR sys_setresgid /* 5190 */
PTR sys_getresgid
PTR sys_prctl
PTR sys_rt_sigreturn
PTR sys_rt_sigaction
- PTR sys_rt_sigprocmask /* 4195 */
+ PTR sys_rt_sigprocmask /* 5195 */
PTR sys_rt_sigpending
PTR sys_rt_sigtimedwait
PTR sys_rt_sigqueueinfo
PTR sys_rt_sigsuspend
- PTR sys_pread /* 4200 */
+ PTR sys_pread /* 5200 */
PTR sys_pwrite
PTR sys_chown
PTR sys_getcwd
PTR sys_capget
- PTR sys_capset /* 4205 */
+ PTR sys_capset /* 5205 */
PTR sys_sigaltstack
PTR sys_sendfile
PTR sys_ni_syscall
PTR sys_ni_syscall
- PTR sys_pivot_root /* 4210 */
+ PTR sys_pivot_root /* 5210 */
PTR sys_mincore
PTR sys_madvise
PTR sys_getdents64
diff --git a/arch/mips64/kernel/setup.c b/arch/mips64/kernel/setup.c
index b9d49d955..364a0ab55 100644
--- a/arch/mips64/kernel/setup.c
+++ b/arch/mips64/kernel/setup.c
@@ -150,7 +150,7 @@ void __init setup_arch(char **cmdline_p)
bootmem_init ();
#endif
- strncpy (command_line, arcs_cmdline, CL_SIZE);
+ strncpy(command_line, arcs_cmdline, CL_SIZE);
memcpy(saved_command_line, command_line, CL_SIZE);
saved_command_line[CL_SIZE-1] = '\0';
diff --git a/arch/mips64/mm/andes.c b/arch/mips64/mm/andes.c
index 2921b8601..32816794e 100644
--- a/arch/mips64/mm/andes.c
+++ b/arch/mips64/mm/andes.c
@@ -284,8 +284,8 @@ static void andes_update_mmu_cache(struct vm_area_struct * vma,
if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) ||
(CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) {
- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d
- tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(),
+ printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d "
+ "tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(),
vma->vm_mm) & 0xff), pid);
}
diff --git a/arch/mips64/mm/init.c b/arch/mips64/mm/init.c
index d0da581b3..5742ecde3 100644
--- a/arch/mips64/mm/init.c
+++ b/arch/mips64/mm/init.c
@@ -119,7 +119,7 @@ asmlinkage int sys_cacheflush(void *addr, int bytes, int cache)
}
/*
- * We have upto 8 empty zeroed pages so we can map one of the right colour
+ * We have up to 8 empty zeroed pages so we can map one of the right colour
* when needed. This is necessary only on R4000 / R4400 SC and MC versions
* where we have to avoid VCED / VECI exceptions for good performance at
* any price. Since page is never written to after the initialization we
@@ -201,7 +201,7 @@ static void __init print_memory_map(void)
}
}
-void bootmem_init (void) {
+void bootmem_init(void) {
#ifdef CONFIG_BLK_DEV_INITRD
unsigned long tmp;
unsigned long *initrd_header;
diff --git a/arch/mips64/sgi-ip22/ip22-mc.c b/arch/mips64/sgi-ip22/ip22-mc.c
index 24187d117..e8b430fb2 100644
--- a/arch/mips64/sgi-ip22/ip22-mc.c
+++ b/arch/mips64/sgi-ip22/ip22-mc.c
@@ -3,8 +3,6 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * indy_mc.c: Routines for manipulating the INDY memory controller.
- *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
* Copyright (C) 2001 Ralf Baechle (ralf@gnu.org)
*/
diff --git a/arch/mips64/sgi-ip22/ip22-sc.c b/arch/mips64/sgi-ip22/ip22-sc.c
index 5e1c351a1..62d9db8d1 100644
--- a/arch/mips64/sgi-ip22/ip22-sc.c
+++ b/arch/mips64/sgi-ip22/ip22-sc.c
@@ -29,17 +29,17 @@ static unsigned long scache_size;
static inline void indy_sc_wipe(unsigned long first, unsigned long last)
{
- __asm__ __volatile__("
- .set noreorder
- or %0, %4 # first line to flush
- or %1, %4 # last line to flush
-1: sw $0, 0(%0)
- bne %0, %1, 1b
- daddu %0, 32
- .set reorder"
- : "=r" (first), "=r" (last)
- : "0" (first), "1" (last), "r" (0x9000000080000000)
- : "$1");
+ __asm__ __volatile__(
+ ".set\tnoreorder\n\t"
+ "or\t%0, %4\t\t\t# first line to flush\n\t"
+ "or\t%1, %4\t\t\t# last line to flush\n"
+ "1:\tsw $0, 0(%0)\n\t"
+ "bne\t%0, %1, 1b\n\t"
+ "daddu\t%0, 32\n\t"
+ ".set reorder"
+ : "=r" (first), "=r" (last)
+ : "0" (first), "1" (last), "r" (0x9000000080000000)
+ : "$1");
}
static void indy_sc_wback_invalidate(unsigned long addr, unsigned long size)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 21:08:30 +0000