diff options
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/binfmt_elfn32.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/binfmt_elfo32.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/cpu-bugs64.c | 4 | ||||
-rw-r--r-- | arch/mips/kernel/gdb-stub.c | 12 | ||||
-rw-r--r-- | arch/mips/kernel/genex.S | 4 | ||||
-rw-r--r-- | arch/mips/kernel/ioctl32.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/linux32.c | 22 | ||||
-rw-r--r-- | arch/mips/kernel/r2300_switch.S | 4 | ||||
-rw-r--r-- | arch/mips/kernel/r4k_switch.S | 4 | ||||
-rw-r--r-- | arch/mips/kernel/signal32.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 2 |
12 files changed, 31 insertions, 31 deletions
diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c index ed47041f3030..6b645fbb1ddc 100644 --- a/arch/mips/kernel/binfmt_elfn32.c +++ b/arch/mips/kernel/binfmt_elfn32.c | |||
@@ -103,7 +103,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) | |||
103 | * Convert jiffies to nanoseconds and seperate with | 103 | * Convert jiffies to nanoseconds and seperate with |
104 | * one divide. | 104 | * one divide. |
105 | */ | 105 | */ |
106 | u64 nsec = (u64)jiffies * TICK_NSEC; | 106 | u64 nsec = (u64)jiffies * TICK_NSEC; |
107 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); | 107 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); |
108 | value->tv_usec /= NSEC_PER_USEC; | 108 | value->tv_usec /= NSEC_PER_USEC; |
109 | } | 109 | } |
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c index ee21b18c37a8..b4075e99c452 100644 --- a/arch/mips/kernel/binfmt_elfo32.c +++ b/arch/mips/kernel/binfmt_elfo32.c | |||
@@ -105,7 +105,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) | |||
105 | * Convert jiffies to nanoseconds and seperate with | 105 | * Convert jiffies to nanoseconds and seperate with |
106 | * one divide. | 106 | * one divide. |
107 | */ | 107 | */ |
108 | u64 nsec = (u64)jiffies * TICK_NSEC; | 108 | u64 nsec = (u64)jiffies * TICK_NSEC; |
109 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); | 109 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); |
110 | value->tv_usec /= NSEC_PER_USEC; | 110 | value->tv_usec /= NSEC_PER_USEC; |
111 | } | 111 | } |
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c index 11ebe5d4c446..47a087b6c11b 100644 --- a/arch/mips/kernel/cpu-bugs64.c +++ b/arch/mips/kernel/cpu-bugs64.c | |||
@@ -137,7 +137,7 @@ static inline void check_mult_sh(void) | |||
137 | for (i = 0; i < 8; i++) | 137 | for (i = 0; i < 8; i++) |
138 | if (v1[i] != w[i]) | 138 | if (v1[i] != w[i]) |
139 | bug = 1; | 139 | bug = 1; |
140 | 140 | ||
141 | if (bug == 0) { | 141 | if (bug == 0) { |
142 | printk("no.\n"); | 142 | printk("no.\n"); |
143 | return; | 143 | return; |
@@ -149,7 +149,7 @@ static inline void check_mult_sh(void) | |||
149 | for (i = 0; i < 8; i++) | 149 | for (i = 0; i < 8; i++) |
150 | if (v2[i] != w[i]) | 150 | if (v2[i] != w[i]) |
151 | fix = 0; | 151 | fix = 0; |
152 | 152 | ||
153 | if (fix == 1) { | 153 | if (fix == 1) { |
154 | printk("yes.\n"); | 154 | printk("yes.\n"); |
155 | return; | 155 | return; |
diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c index 269889302a27..d3fd1ab14274 100644 --- a/arch/mips/kernel/gdb-stub.c +++ b/arch/mips/kernel/gdb-stub.c | |||
@@ -687,8 +687,8 @@ void handle_exception (struct gdb_regs *regs) | |||
687 | * acquire the big kgdb spinlock | 687 | * acquire the big kgdb spinlock |
688 | */ | 688 | */ |
689 | if (!spin_trylock(&kgdb_lock)) { | 689 | if (!spin_trylock(&kgdb_lock)) { |
690 | /* | 690 | /* |
691 | * some other CPU has the lock, we should go back to | 691 | * some other CPU has the lock, we should go back to |
692 | * receive the gdb_wait IPC | 692 | * receive the gdb_wait IPC |
693 | */ | 693 | */ |
694 | return; | 694 | return; |
@@ -703,7 +703,7 @@ void handle_exception (struct gdb_regs *regs) | |||
703 | async_bp.addr = 0; | 703 | async_bp.addr = 0; |
704 | } | 704 | } |
705 | 705 | ||
706 | /* | 706 | /* |
707 | * acquire the CPU spinlocks | 707 | * acquire the CPU spinlocks |
708 | */ | 708 | */ |
709 | for (i = num_online_cpus()-1; i >= 0; i--) | 709 | for (i = num_online_cpus()-1; i >= 0; i--) |
@@ -894,7 +894,7 @@ void handle_exception (struct gdb_regs *regs) | |||
894 | ptr = &input_buffer[1]; | 894 | ptr = &input_buffer[1]; |
895 | if (hexToLong(&ptr, &addr)) | 895 | if (hexToLong(&ptr, &addr)) |
896 | regs->cp0_epc = addr; | 896 | regs->cp0_epc = addr; |
897 | 897 | ||
898 | goto exit_kgdb_exception; | 898 | goto exit_kgdb_exception; |
899 | break; | 899 | break; |
900 | 900 | ||
@@ -1001,7 +1001,7 @@ void breakpoint(void) | |||
1001 | return; | 1001 | return; |
1002 | 1002 | ||
1003 | __asm__ __volatile__( | 1003 | __asm__ __volatile__( |
1004 | ".globl breakinst\n\t" | 1004 | ".globl breakinst\n\t" |
1005 | ".set\tnoreorder\n\t" | 1005 | ".set\tnoreorder\n\t" |
1006 | "nop\n" | 1006 | "nop\n" |
1007 | "breakinst:\tbreak\n\t" | 1007 | "breakinst:\tbreak\n\t" |
@@ -1014,7 +1014,7 @@ void breakpoint(void) | |||
1014 | void async_breakpoint(void) | 1014 | void async_breakpoint(void) |
1015 | { | 1015 | { |
1016 | __asm__ __volatile__( | 1016 | __asm__ __volatile__( |
1017 | ".globl async_breakinst\n\t" | 1017 | ".globl async_breakinst\n\t" |
1018 | ".set\tnoreorder\n\t" | 1018 | ".set\tnoreorder\n\t" |
1019 | "nop\n" | 1019 | "nop\n" |
1020 | "async_breakinst:\tbreak\n\t" | 1020 | "async_breakinst:\tbreak\n\t" |
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 3a1a3e7586f6..9bb2caaf7fc6 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
@@ -246,10 +246,10 @@ NESTED(nmi_handler, PT_SIZE, sp) | |||
246 | LONG_L a1, PT_EPC(sp) | 246 | LONG_L a1, PT_EPC(sp) |
247 | #if CONFIG_32BIT | 247 | #if CONFIG_32BIT |
248 | PRINT("Got \nexception at %08lx\012") | 248 | PRINT("Got \nexception at %08lx\012") |
249 | #endif | 249 | #endif |
250 | #if CONFIG_64BIT | 250 | #if CONFIG_64BIT |
251 | PRINT("Got \nexception at %016lx\012") | 251 | PRINT("Got \nexception at %016lx\012") |
252 | #endif | 252 | #endif |
253 | .endm | 253 | .endm |
254 | 254 | ||
255 | .macro __BUILD_count exception | 255 | .macro __BUILD_count exception |
diff --git a/arch/mips/kernel/ioctl32.c b/arch/mips/kernel/ioctl32.c index 519cd5d0aebb..c069719ff0d8 100644 --- a/arch/mips/kernel/ioctl32.c +++ b/arch/mips/kernel/ioctl32.c | |||
@@ -27,7 +27,7 @@ long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg); | |||
27 | #include "compat_ioctl.c" | 27 | #include "compat_ioctl.c" |
28 | 28 | ||
29 | typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *); | 29 | typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *); |
30 | 30 | ||
31 | #define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl) | 31 | #define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl) |
32 | #define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl32_handler_t)(handler), NULL }, | 32 | #define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl32_handler_t)(handler), NULL }, |
33 | #define IOCTL_TABLE_START \ | 33 | #define IOCTL_TABLE_START \ |
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 441157a1f994..7d93992e462c 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c | |||
@@ -77,7 +77,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
77 | if (i < NR_IRQS) { | 77 | if (i < NR_IRQS) { |
78 | spin_lock_irqsave(&irq_desc[i].lock, flags); | 78 | spin_lock_irqsave(&irq_desc[i].lock, flags); |
79 | action = irq_desc[i].action; | 79 | action = irq_desc[i].action; |
80 | if (!action) | 80 | if (!action) |
81 | goto skip; | 81 | goto skip; |
82 | seq_printf(p, "%3d: ",i); | 82 | seq_printf(p, "%3d: ",i); |
83 | #ifndef CONFIG_SMP | 83 | #ifndef CONFIG_SMP |
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 993abc868e54..4613219dd73e 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
@@ -313,7 +313,7 @@ asmlinkage int sys32_sysinfo(struct sysinfo32 *info) | |||
313 | struct sysinfo s; | 313 | struct sysinfo s; |
314 | int ret, err; | 314 | int ret, err; |
315 | mm_segment_t old_fs = get_fs (); | 315 | mm_segment_t old_fs = get_fs (); |
316 | 316 | ||
317 | set_fs (KERNEL_DS); | 317 | set_fs (KERNEL_DS); |
318 | ret = sys_sysinfo(&s); | 318 | ret = sys_sysinfo(&s); |
319 | set_fs (old_fs); | 319 | set_fs (old_fs); |
@@ -560,7 +560,7 @@ struct ipc64_perm32 { | |||
560 | compat_gid_t gid; | 560 | compat_gid_t gid; |
561 | compat_uid_t cuid; | 561 | compat_uid_t cuid; |
562 | compat_gid_t cgid; | 562 | compat_gid_t cgid; |
563 | compat_mode_t mode; | 563 | compat_mode_t mode; |
564 | unsigned short seq; | 564 | unsigned short seq; |
565 | unsigned short __pad1; | 565 | unsigned short __pad1; |
566 | unsigned int __unused1; | 566 | unsigned int __unused1; |
@@ -1334,17 +1334,17 @@ asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, | |||
1334 | mm_segment_t old_fs = get_fs(); | 1334 | mm_segment_t old_fs = get_fs(); |
1335 | int ret; | 1335 | int ret; |
1336 | off_t of; | 1336 | off_t of; |
1337 | 1337 | ||
1338 | if (offset && get_user(of, offset)) | 1338 | if (offset && get_user(of, offset)) |
1339 | return -EFAULT; | 1339 | return -EFAULT; |
1340 | 1340 | ||
1341 | set_fs(KERNEL_DS); | 1341 | set_fs(KERNEL_DS); |
1342 | ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); | 1342 | ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); |
1343 | set_fs(old_fs); | 1343 | set_fs(old_fs); |
1344 | 1344 | ||
1345 | if (offset && put_user(of, offset)) | 1345 | if (offset && put_user(of, offset)) |
1346 | return -EFAULT; | 1346 | return -EFAULT; |
1347 | 1347 | ||
1348 | return ret; | 1348 | return ret; |
1349 | } | 1349 | } |
1350 | 1350 | ||
@@ -1362,11 +1362,11 @@ static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), | |||
1362 | #undef AL | 1362 | #undef AL |
1363 | 1363 | ||
1364 | /* | 1364 | /* |
1365 | * System call vectors. | 1365 | * System call vectors. |
1366 | * | 1366 | * |
1367 | * Argument checking cleaned up. Saved 20% in size. | 1367 | * Argument checking cleaned up. Saved 20% in size. |
1368 | * This function doesn't need to set the kernel lock because | 1368 | * This function doesn't need to set the kernel lock because |
1369 | * it is set by the callees. | 1369 | * it is set by the callees. |
1370 | */ | 1370 | */ |
1371 | 1371 | ||
1372 | asmlinkage long sys32_socketcall(int call, unsigned int *args32) | 1372 | asmlinkage long sys32_socketcall(int call, unsigned int *args32) |
@@ -1402,11 +1402,11 @@ asmlinkage long sys32_socketcall(int call, unsigned int *args32) | |||
1402 | /* copy_from_user should be SMP safe. */ | 1402 | /* copy_from_user should be SMP safe. */ |
1403 | if (copy_from_user(a, args32, socketcall_nargs[call])) | 1403 | if (copy_from_user(a, args32, socketcall_nargs[call])) |
1404 | return -EFAULT; | 1404 | return -EFAULT; |
1405 | 1405 | ||
1406 | a0=a[0]; | 1406 | a0=a[0]; |
1407 | a1=a[1]; | 1407 | a1=a[1]; |
1408 | 1408 | ||
1409 | switch(call) | 1409 | switch(call) |
1410 | { | 1410 | { |
1411 | case SYS_SOCKET: | 1411 | case SYS_SOCKET: |
1412 | err = sys_socket(a0,a1,a[2]); | 1412 | err = sys_socket(a0,a1,a[2]); |
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S index 243e7b629af6..f10019640ee9 100644 --- a/arch/mips/kernel/r2300_switch.S +++ b/arch/mips/kernel/r2300_switch.S | |||
@@ -35,7 +35,7 @@ | |||
35 | /* | 35 | /* |
36 | * FPU context is saved iff the process has used it's FPU in the current | 36 | * FPU context is saved iff the process has used it's FPU in the current |
37 | * time slice as indicated by TIF_USEDFPU. In any case, the CU1 bit for user | 37 | * time slice as indicated by TIF_USEDFPU. In any case, the CU1 bit for user |
38 | * space STATUS register should be 0, so that a process *always* starts its | 38 | * space STATUS register should be 0, so that a process *always* starts its |
39 | * userland with FPU disabled after each context switch. | 39 | * userland with FPU disabled after each context switch. |
40 | * | 40 | * |
41 | * FPU will be enabled as soon as the process accesses FPU again, through | 41 | * FPU will be enabled as soon as the process accesses FPU again, through |
@@ -55,7 +55,7 @@ LEAF(resume) | |||
55 | cpu_save_nonscratch a0 | 55 | cpu_save_nonscratch a0 |
56 | sw ra, THREAD_REG31(a0) | 56 | sw ra, THREAD_REG31(a0) |
57 | 57 | ||
58 | /* | 58 | /* |
59 | * check if we need to save FPU registers | 59 | * check if we need to save FPU registers |
60 | */ | 60 | */ |
61 | lw t3, TASK_THREAD_INFO(a0) | 61 | lw t3, TASK_THREAD_INFO(a0) |
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 175dd1fcbb33..e02b7722ccb8 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
@@ -33,7 +33,7 @@ | |||
33 | /* | 33 | /* |
34 | * FPU context is saved iff the process has used it's FPU in the current | 34 | * FPU context is saved iff the process has used it's FPU in the current |
35 | * time slice as indicated by _TIF_USEDFPU. In any case, the CU1 bit for user | 35 | * time slice as indicated by _TIF_USEDFPU. In any case, the CU1 bit for user |
36 | * space STATUS register should be 0, so that a process *always* starts its | 36 | * space STATUS register should be 0, so that a process *always* starts its |
37 | * userland with FPU disabled after each context switch. | 37 | * userland with FPU disabled after each context switch. |
38 | * | 38 | * |
39 | * FPU will be enabled as soon as the process accesses FPU again, through | 39 | * FPU will be enabled as soon as the process accesses FPU again, through |
@@ -164,7 +164,7 @@ LEAF(_init_fpu) | |||
164 | dmtc1 t1, $f31 | 164 | dmtc1 t1, $f31 |
165 | 1: | 165 | 1: |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | #ifdef CONFIG_CPU_MIPS32 | 168 | #ifdef CONFIG_CPU_MIPS32 |
169 | mtc1 t1, $f0 | 169 | mtc1 t1, $f0 |
170 | mtc1 t1, $f1 | 170 | mtc1 t1, $f1 |
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index f6875f023a29..8ddfbd8d425a 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c | |||
@@ -558,7 +558,7 @@ static inline int setup_sigcontext32(struct pt_regs *regs, | |||
558 | if (!used_math()) | 558 | if (!used_math()) |
559 | goto out; | 559 | goto out; |
560 | 560 | ||
561 | /* | 561 | /* |
562 | * Save FPU state to signal context. Signal handler will "inherit" | 562 | * Save FPU state to signal context. Signal handler will "inherit" |
563 | * current FPU state. | 563 | * current FPU state. |
564 | */ | 564 | */ |
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index e830d788c106..482ac310c937 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S | |||
@@ -15,7 +15,7 @@ SECTIONS | |||
15 | /* This is the value for an Origin kernel, taken from an IRIX kernel. */ | 15 | /* This is the value for an Origin kernel, taken from an IRIX kernel. */ |
16 | /* . = 0xc00000000001c000; */ | 16 | /* . = 0xc00000000001c000; */ |
17 | 17 | ||
18 | /* Set the vaddr for the text segment to a value | 18 | /* Set the vaddr for the text segment to a value |
19 | >= 0xa800 0000 0001 9000 if no symmon is going to configured | 19 | >= 0xa800 0000 0001 9000 if no symmon is going to configured |
20 | >= 0xa800 0000 0030 0000 otherwise */ | 20 | >= 0xa800 0000 0030 0000 otherwise */ |
21 | 21 | ||