diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/genex.S | 10 | ||||
-rw-r--r-- | arch/mips/lib/csum_partial_copy.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index e7f6c1b9080..e5021c758ef 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
@@ -82,7 +82,7 @@ NESTED(except_vec3_r4000, 0, sp) | |||
82 | li k0, 14<<2 | 82 | li k0, 14<<2 |
83 | beq k1, k0, handle_vcei | 83 | beq k1, k0, handle_vcei |
84 | #ifdef CONFIG_64BIT | 84 | #ifdef CONFIG_64BIT |
85 | dsll k1, k1, 1 | 85 | dsll k1, k1, 1 |
86 | #endif | 86 | #endif |
87 | .set pop | 87 | .set pop |
88 | PTR_L k0, exception_handlers(k1) | 88 | PTR_L k0, exception_handlers(k1) |
@@ -90,17 +90,17 @@ NESTED(except_vec3_r4000, 0, sp) | |||
90 | 90 | ||
91 | /* | 91 | /* |
92 | * Big shit, we now may have two dirty primary cache lines for the same | 92 | * Big shit, we now may have two dirty primary cache lines for the same |
93 | * physical address. We can savely invalidate the line pointed to by | 93 | * physical address. We can safely invalidate the line pointed to by |
94 | * c0_badvaddr because after return from this exception handler the | 94 | * c0_badvaddr because after return from this exception handler the |
95 | * load / store will be re-executed. | 95 | * load / store will be re-executed. |
96 | */ | 96 | */ |
97 | handle_vced: | 97 | handle_vced: |
98 | DMFC0 k0, CP0_BADVADDR | 98 | MFC0 k0, CP0_BADVADDR |
99 | li k1, -4 # Is this ... | 99 | li k1, -4 # Is this ... |
100 | and k0, k1 # ... really needed? | 100 | and k0, k1 # ... really needed? |
101 | mtc0 zero, CP0_TAGLO | 101 | mtc0 zero, CP0_TAGLO |
102 | cache Index_Store_Tag_D,(k0) | 102 | cache Index_Store_Tag_D, (k0) |
103 | cache Hit_Writeback_Inv_SD,(k0) | 103 | cache Hit_Writeback_Inv_SD, (k0) |
104 | #ifdef CONFIG_PROC_FS | 104 | #ifdef CONFIG_PROC_FS |
105 | PTR_LA k0, vced_count | 105 | PTR_LA k0, vced_count |
106 | lw k1, (k0) | 106 | lw k1, (k0) |
diff --git a/arch/mips/lib/csum_partial_copy.c b/arch/mips/lib/csum_partial_copy.c index ffed0a6a1c1..2f26ff99c71 100644 --- a/arch/mips/lib/csum_partial_copy.c +++ b/arch/mips/lib/csum_partial_copy.c | |||
@@ -16,8 +16,8 @@ | |||
16 | /* | 16 | /* |
17 | * copy while checksumming, otherwise like csum_partial | 17 | * copy while checksumming, otherwise like csum_partial |
18 | */ | 18 | */ |
19 | unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst, | 19 | unsigned int csum_partial_copy_nocheck(const unsigned char *src, |
20 | int len, unsigned int sum) | 20 | unsigned char *dst, int len, unsigned int sum) |
21 | { | 21 | { |
22 | /* | 22 | /* |
23 | * It's 2:30 am and I don't feel like doing it real ... | 23 | * It's 2:30 am and I don't feel like doing it real ... |
@@ -33,8 +33,8 @@ unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char * | |||
33 | * Copy from userspace and compute checksum. If we catch an exception | 33 | * Copy from userspace and compute checksum. If we catch an exception |
34 | * then zero the rest of the buffer. | 34 | * then zero the rest of the buffer. |
35 | */ | 35 | */ |
36 | unsigned int csum_partial_copy_from_user (const unsigned char *src, unsigned char *dst, | 36 | unsigned int csum_partial_copy_from_user (const unsigned char *src, |
37 | int len, unsigned int sum, int *err_ptr) | 37 | unsigned char *dst, int len, unsigned int sum, int *err_ptr) |
38 | { | 38 | { |
39 | int missing; | 39 | int missing; |
40 | 40 | ||