Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'parisc-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc architecture updates and fixes from Helge Deller:
"Fixes for the IPv4 and IPv6 checksum functions, a fix for the 64-bit
unaligned memory exception handler and various code cleanups.

Most of the patches are tagged for stable series.

- Fix inline assembly in ipv4 and ipv6 checksum functions (Guenter
Roeck)

- Rewrite 64-bit inline assembly of emulate_ldd() (Guenter Roeck)

- Do not clobber carry/borrow bits in tophys and tovirt macros (John
David Anglin)

- Warn when kernel accesses unaligned memory"

* tag 'parisc-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: led: Convert to platform remove callback returning void
parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
parisc: Fix csum_ipv6_magic on 64-bit systems
parisc: Fix csum_ipv6_magic on 32-bit systems
parisc: Fix ip_fast_csum
parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros
parisc/unaligned: Rewrite 64-bit inline assembly of emulate_ldd()
parisc: make parisc_bus_type const
parisc: avoid c23 'nullptr' idenitifier
parisc: Show kernel unaligned memory accesses
parisc: Use irq_enter_rcu() to fix warning at kernel/context_tracking.c:367

+101 -95
+10 -8
arch/parisc/include/asm/assembly.h
··· 97 97 * version takes two arguments: a src and destination register. 98 98 * However, the source and destination registers can not be 99 99 * the same register. 100 + * 101 + * We use add,l to avoid clobbering the C/B bits in the PSW. 100 102 */ 101 103 102 104 .macro tophys grvirt, grphys 103 - ldil L%(__PAGE_OFFSET), \grphys 104 - sub \grvirt, \grphys, \grphys 105 + ldil L%(-__PAGE_OFFSET), \grphys 106 + addl \grvirt, \grphys, \grphys 105 107 .endm 106 - 108 + 107 109 .macro tovirt grphys, grvirt 108 110 ldil L%(__PAGE_OFFSET), \grvirt 109 - add \grphys, \grvirt, \grvirt 111 + addl \grphys, \grvirt, \grvirt 110 112 .endm 111 113 112 114 .macro tophys_r1 gr 113 - ldil L%(__PAGE_OFFSET), %r1 114 - sub \gr, %r1, \gr 115 + ldil L%(-__PAGE_OFFSET), %r1 116 + addl \gr, %r1, \gr 115 117 .endm 116 - 118 + 117 119 .macro tovirt_r1 gr 118 120 ldil L%(__PAGE_OFFSET), %r1 119 - add \gr, %r1, \gr 121 + addl \gr, %r1, \gr 120 122 .endm 121 123 122 124 .macro delay value
+6 -4
arch/parisc/include/asm/checksum.h
··· 40 40 " addc %0, %5, %0\n" 41 41 " addc %0, %3, %0\n" 42 42 "1: ldws,ma 4(%1), %3\n" 43 - " addib,< 0, %2, 1b\n" 43 + " addib,> -1, %2, 1b\n" 44 44 " addc %0, %3, %0\n" 45 45 "\n" 46 46 " extru %0, 31, 16, %4\n" ··· 126 126 ** Try to keep 4 registers with "live" values ahead of the ALU. 127 127 */ 128 128 129 + " depdi 0, 31, 32, %0\n"/* clear upper half of incoming checksum */ 129 130 " ldd,ma 8(%1), %4\n" /* get 1st saddr word */ 130 131 " ldd,ma 8(%2), %5\n" /* get 1st daddr word */ 131 132 " add %4, %0, %0\n" ··· 138 137 " add,dc %3, %0, %0\n" /* fold in proto+len | carry bit */ 139 138 " extrd,u %0, 31, 32, %4\n"/* copy upper half down */ 140 139 " depdi 0, 31, 32, %0\n"/* clear upper half */ 141 - " add %4, %0, %0\n" /* fold into 32-bits */ 142 - " addc 0, %0, %0\n" /* add carry */ 140 + " add,dc %4, %0, %0\n" /* fold into 32-bits, plus carry */ 141 + " addc 0, %0, %0\n" /* add final carry */ 143 142 144 143 #else 145 144 ··· 164 163 " ldw,ma 4(%2), %7\n" /* 4th daddr */ 165 164 " addc %6, %0, %0\n" 166 165 " addc %7, %0, %0\n" 167 - " addc %3, %0, %0\n" /* fold in proto+len, catch carry */ 166 + " addc %3, %0, %0\n" /* fold in proto+len */ 167 + " addc 0, %0, %0\n" /* add carry */ 168 168 169 169 #endif 170 170 : "=r" (sum), "=r" (saddr), "=r" (daddr), "=r" (len),
+1 -1
arch/parisc/include/asm/parisc-device.h
··· 61 61 return dev_get_drvdata(&d->dev); 62 62 } 63 63 64 - extern struct bus_type parisc_bus_type; 64 + extern const struct bus_type parisc_bus_type; 65 65 66 66 int iosapic_serial_irq(struct parisc_device *dev); 67 67
+1 -1
arch/parisc/kernel/drivers.c
··· 618 618 }; 619 619 ATTRIBUTE_GROUPS(parisc_device); 620 620 621 - struct bus_type parisc_bus_type = { 621 + const struct bus_type parisc_bus_type = { 622 622 .name = "parisc", 623 623 .match = parisc_generic_match, 624 624 .uevent = parisc_uevent,
+2 -2
arch/parisc/kernel/irq.c
··· 498 498 499 499 old_regs = set_irq_regs(regs); 500 500 local_irq_disable(); 501 - irq_enter(); 501 + irq_enter_rcu(); 502 502 503 503 eirr_val = mfctl(23) & cpu_eiem & per_cpu(local_ack_eiem, cpu); 504 504 if (!eirr_val) ··· 533 533 #endif /* CONFIG_IRQSTACKS */ 534 534 535 535 out: 536 - irq_exit(); 536 + irq_exit_rcu(); 537 537 set_irq_regs(old_regs); 538 538 return; 539 539
+19 -15
arch/parisc/kernel/unaligned.c
··· 169 169 static int emulate_ldd(struct pt_regs *regs, int toreg, int flop) 170 170 { 171 171 unsigned long saddr = regs->ior; 172 + unsigned long shift, temp1; 172 173 __u64 val = 0; 173 174 ASM_EXCEPTIONTABLE_VAR(ret); 174 175 ··· 181 180 182 181 #ifdef CONFIG_64BIT 183 182 __asm__ __volatile__ ( 184 - " depd,z %3,60,3,%%r19\n" /* r19=(ofs&7)*8 */ 185 - " mtsp %4, %%sr1\n" 186 - " depd %%r0,63,3,%3\n" 187 - "1: ldd 0(%%sr1,%3),%0\n" 188 - "2: ldd 8(%%sr1,%3),%%r20\n" 189 - " subi 64,%%r19,%%r19\n" 190 - " mtsar %%r19\n" 191 - " shrpd %0,%%r20,%%sar,%0\n" 183 + " depd,z %2,60,3,%3\n" /* shift=(ofs&7)*8 */ 184 + " mtsp %5, %%sr1\n" 185 + " depd %%r0,63,3,%2\n" 186 + "1: ldd 0(%%sr1,%2),%0\n" 187 + "2: ldd 8(%%sr1,%2),%4\n" 188 + " subi 64,%3,%3\n" 189 + " mtsar %3\n" 190 + " shrpd %0,%4,%%sar,%0\n" 192 191 "3: \n" 193 192 ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b, "%1") 194 193 ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b, "%1") 195 - : "=r" (val), "+r" (ret) 196 - : "0" (val), "r" (saddr), "r" (regs->isr) 197 - : "r19", "r20" ); 194 + : "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1) 195 + : "r" (regs->isr) ); 198 196 #else 199 - { 200 - unsigned long shift, temp1; 201 197 __asm__ __volatile__ ( 202 - " zdep %2,29,2,%3\n" /* r19=(ofs&3)*8 */ 198 + " zdep %2,29,2,%3\n" /* shift=(ofs&3)*8 */ 203 199 " mtsp %5, %%sr1\n" 204 200 " dep %%r0,31,2,%2\n" 205 201 "1: ldw 0(%%sr1,%2),%0\n" ··· 212 214 ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 4b, "%1") 213 215 : "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1) 214 216 : "r" (regs->isr) ); 215 - } 216 217 #endif 217 218 218 219 DPRINTF("val = 0x%llx\n", val); ··· 396 399 397 400 if (!unaligned_enabled) 398 401 goto force_sigbus; 402 + } else { 403 + static DEFINE_RATELIMIT_STATE(kernel_ratelimit, 5 * HZ, 5); 404 + if (!(current->thread.flags & PARISC_UAC_NOPRINT) && 405 + __ratelimit(&kernel_ratelimit)) 406 + pr_warn("Kernel: unaligned access to " RFMT " in %pS " 407 + "(iir " RFMT ")\n", 408 + regs->ior, (void *)regs->iaoq[0], regs->iir); 399 409 } 400 410 401 411 /* handle modification - OK, it's ugly, see the instruction manual */
+2 -2
arch/parisc/math-emu/dfsqrt.c
··· 15 15 * Double Floating-point Square Root 16 16 * 17 17 * External Interfaces: 18 - * dbl_fsqrt(srcptr,nullptr,dstptr,status) 18 + * dbl_fsqrt(srcptr,_nullptr,dstptr,status) 19 19 * 20 20 * Internal Interfaces: 21 21 * ··· 37 37 unsigned int 38 38 dbl_fsqrt( 39 39 dbl_floating_point *srcptr, 40 - unsigned int *nullptr, 40 + unsigned int *_nullptr, 41 41 dbl_floating_point *dstptr, 42 42 unsigned int *status) 43 43 {
+4 -4
arch/parisc/math-emu/fcnvff.c
··· 16 16 * Double Floating-point to Single Floating-point 17 17 * 18 18 * External Interfaces: 19 - * dbl_to_sgl_fcnvff(srcptr,nullptr,dstptr,status) 20 - * sgl_to_dbl_fcnvff(srcptr,nullptr,dstptr,status) 19 + * dbl_to_sgl_fcnvff(srcptr,_nullptr,dstptr,status) 20 + * sgl_to_dbl_fcnvff(srcptr,_nullptr,dstptr,status) 21 21 * 22 22 * Internal Interfaces: 23 23 * ··· 40 40 int 41 41 sgl_to_dbl_fcnvff( 42 42 sgl_floating_point *srcptr, 43 - unsigned int *nullptr, 43 + unsigned int *_nullptr, 44 44 dbl_floating_point *dstptr, 45 45 unsigned int *status) 46 46 { ··· 127 127 int 128 128 dbl_to_sgl_fcnvff( 129 129 dbl_floating_point *srcptr, 130 - unsigned int *nullptr, 130 + unsigned int *_nullptr, 131 131 sgl_floating_point *dstptr, 132 132 unsigned int *status) 133 133 {
+8 -8
arch/parisc/math-emu/fcnvfu.c
··· 15 15 * Floating-point to Unsigned Fixed-point Converts 16 16 * 17 17 * External Interfaces: 18 - * dbl_to_dbl_fcnvfu(srcptr,nullptr,dstptr,status) 19 - * dbl_to_sgl_fcnvfu(srcptr,nullptr,dstptr,status) 20 - * sgl_to_dbl_fcnvfu(srcptr,nullptr,dstptr,status) 21 - * sgl_to_sgl_fcnvfu(srcptr,nullptr,dstptr,status) 18 + * dbl_to_dbl_fcnvfu(srcptr,_nullptr,dstptr,status) 19 + * dbl_to_sgl_fcnvfu(srcptr,_nullptr,dstptr,status) 20 + * sgl_to_dbl_fcnvfu(srcptr,_nullptr,dstptr,status) 21 + * sgl_to_sgl_fcnvfu(srcptr,_nullptr,dstptr,status) 22 22 * 23 23 * Internal Interfaces: 24 24 * ··· 45 45 int 46 46 sgl_to_sgl_fcnvfu( 47 47 sgl_floating_point *srcptr, 48 - unsigned int *nullptr, 48 + unsigned int *_nullptr, 49 49 unsigned int *dstptr, 50 50 unsigned int *status) 51 51 { ··· 166 166 int 167 167 sgl_to_dbl_fcnvfu( 168 168 sgl_floating_point *srcptr, 169 - unsigned int *nullptr, 169 + unsigned int *_nullptr, 170 170 dbl_unsigned *dstptr, 171 171 unsigned int *status) 172 172 { ··· 285 285 */ 286 286 /*ARGSUSED*/ 287 287 int 288 - dbl_to_sgl_fcnvfu (dbl_floating_point * srcptr, unsigned int *nullptr, 288 + dbl_to_sgl_fcnvfu (dbl_floating_point * srcptr, unsigned int *_nullptr, 289 289 unsigned int *dstptr, unsigned int *status) 290 290 { 291 291 register unsigned int srcp1, srcp2, result; ··· 408 408 */ 409 409 /*ARGSUSED*/ 410 410 int 411 - dbl_to_dbl_fcnvfu (dbl_floating_point * srcptr, unsigned int *nullptr, 411 + dbl_to_dbl_fcnvfu (dbl_floating_point * srcptr, unsigned int *_nullptr, 412 412 dbl_unsigned * dstptr, unsigned int *status) 413 413 { 414 414 register int src_exponent;
+8 -8
arch/parisc/math-emu/fcnvfut.c
··· 15 15 * Floating-point to Unsigned Fixed-point Converts with Truncation 16 16 * 17 17 * External Interfaces: 18 - * dbl_to_dbl_fcnvfut(srcptr,nullptr,dstptr,status) 19 - * dbl_to_sgl_fcnvfut(srcptr,nullptr,dstptr,status) 20 - * sgl_to_dbl_fcnvfut(srcptr,nullptr,dstptr,status) 21 - * sgl_to_sgl_fcnvfut(srcptr,nullptr,dstptr,status) 18 + * dbl_to_dbl_fcnvfut(srcptr,_nullptr,dstptr,status) 19 + * dbl_to_sgl_fcnvfut(srcptr,_nullptr,dstptr,status) 20 + * sgl_to_dbl_fcnvfut(srcptr,_nullptr,dstptr,status) 21 + * sgl_to_sgl_fcnvfut(srcptr,_nullptr,dstptr,status) 22 22 * 23 23 * Internal Interfaces: 24 24 * ··· 44 44 */ 45 45 /*ARGSUSED*/ 46 46 int 47 - sgl_to_sgl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr, 47 + sgl_to_sgl_fcnvfut (sgl_floating_point * srcptr, unsigned int *_nullptr, 48 48 unsigned int *dstptr, unsigned int *status) 49 49 { 50 50 register unsigned int src, result; ··· 113 113 */ 114 114 /*ARGSUSED*/ 115 115 int 116 - sgl_to_dbl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr, 116 + sgl_to_dbl_fcnvfut (sgl_floating_point * srcptr, unsigned int *_nullptr, 117 117 dbl_unsigned * dstptr, unsigned int *status) 118 118 { 119 119 register int src_exponent; ··· 183 183 */ 184 184 /*ARGSUSED*/ 185 185 int 186 - dbl_to_sgl_fcnvfut (dbl_floating_point * srcptr, unsigned int *nullptr, 186 + dbl_to_sgl_fcnvfut (dbl_floating_point * srcptr, unsigned int *_nullptr, 187 187 unsigned int *dstptr, unsigned int *status) 188 188 { 189 189 register unsigned int srcp1, srcp2, result; ··· 252 252 */ 253 253 /*ARGSUSED*/ 254 254 int 255 - dbl_to_dbl_fcnvfut (dbl_floating_point * srcptr, unsigned int *nullptr, 255 + dbl_to_dbl_fcnvfut (dbl_floating_point * srcptr, unsigned int *_nullptr, 256 256 dbl_unsigned * dstptr, unsigned int *status) 257 257 { 258 258 register int src_exponent;
+8 -8
arch/parisc/math-emu/fcnvfx.c
··· 18 18 * Double Floating-point to Double Fixed-point 19 19 * 20 20 * External Interfaces: 21 - * dbl_to_dbl_fcnvfx(srcptr,nullptr,dstptr,status) 22 - * dbl_to_sgl_fcnvfx(srcptr,nullptr,dstptr,status) 23 - * sgl_to_dbl_fcnvfx(srcptr,nullptr,dstptr,status) 24 - * sgl_to_sgl_fcnvfx(srcptr,nullptr,dstptr,status) 21 + * dbl_to_dbl_fcnvfx(srcptr,_nullptr,dstptr,status) 22 + * dbl_to_sgl_fcnvfx(srcptr,_nullptr,dstptr,status) 23 + * sgl_to_dbl_fcnvfx(srcptr,_nullptr,dstptr,status) 24 + * sgl_to_sgl_fcnvfx(srcptr,_nullptr,dstptr,status) 25 25 * 26 26 * Internal Interfaces: 27 27 * ··· 44 44 int 45 45 sgl_to_sgl_fcnvfx( 46 46 sgl_floating_point *srcptr, 47 - sgl_floating_point *nullptr, 47 + sgl_floating_point *_nullptr, 48 48 int *dstptr, 49 49 sgl_floating_point *status) 50 50 { ··· 141 141 int 142 142 sgl_to_dbl_fcnvfx( 143 143 sgl_floating_point *srcptr, 144 - unsigned int *nullptr, 144 + unsigned int *_nullptr, 145 145 dbl_integer *dstptr, 146 146 unsigned int *status) 147 147 { ··· 262 262 int 263 263 dbl_to_sgl_fcnvfx( 264 264 dbl_floating_point *srcptr, 265 - unsigned int *nullptr, 265 + unsigned int *_nullptr, 266 266 int *dstptr, 267 267 unsigned int *status) 268 268 { ··· 373 373 int 374 374 dbl_to_dbl_fcnvfx( 375 375 dbl_floating_point *srcptr, 376 - unsigned int *nullptr, 376 + unsigned int *_nullptr, 377 377 dbl_integer *dstptr, 378 378 unsigned int *status) 379 379 {
+8 -8
arch/parisc/math-emu/fcnvfxt.c
··· 18 18 * Double Floating-point to Double Fixed-point /w truncated result 19 19 * 20 20 * External Interfaces: 21 - * dbl_to_dbl_fcnvfxt(srcptr,nullptr,dstptr,status) 22 - * dbl_to_sgl_fcnvfxt(srcptr,nullptr,dstptr,status) 23 - * sgl_to_dbl_fcnvfxt(srcptr,nullptr,dstptr,status) 24 - * sgl_to_sgl_fcnvfxt(srcptr,nullptr,dstptr,status) 21 + * dbl_to_dbl_fcnvfxt(srcptr,_nullptr,dstptr,status) 22 + * dbl_to_sgl_fcnvfxt(srcptr,_nullptr,dstptr,status) 23 + * sgl_to_dbl_fcnvfxt(srcptr,_nullptr,dstptr,status) 24 + * sgl_to_sgl_fcnvfxt(srcptr,_nullptr,dstptr,status) 25 25 * 26 26 * Internal Interfaces: 27 27 * ··· 45 45 int 46 46 sgl_to_sgl_fcnvfxt( 47 47 sgl_floating_point *srcptr, 48 - unsigned int *nullptr, 48 + unsigned int *_nullptr, 49 49 int *dstptr, 50 50 unsigned int *status) 51 51 { ··· 109 109 int 110 110 sgl_to_dbl_fcnvfxt( 111 111 sgl_floating_point *srcptr, 112 - unsigned int *nullptr, 112 + unsigned int *_nullptr, 113 113 dbl_integer *dstptr, 114 114 unsigned int *status) 115 115 { ··· 183 183 int 184 184 dbl_to_sgl_fcnvfxt( 185 185 dbl_floating_point *srcptr, 186 - unsigned int *nullptr, 186 + unsigned int *_nullptr, 187 187 int *dstptr, 188 188 unsigned int *status) 189 189 { ··· 248 248 int 249 249 dbl_to_dbl_fcnvfxt( 250 250 dbl_floating_point *srcptr, 251 - unsigned int *nullptr, 251 + unsigned int *_nullptr, 252 252 dbl_integer *dstptr, 253 253 unsigned int *status) 254 254 {
+8 -8
arch/parisc/math-emu/fcnvuf.c
··· 15 15 * Fixed point to Floating-point Converts 16 16 * 17 17 * External Interfaces: 18 - * dbl_to_dbl_fcnvuf(srcptr,nullptr,dstptr,status) 19 - * dbl_to_sgl_fcnvuf(srcptr,nullptr,dstptr,status) 20 - * sgl_to_dbl_fcnvuf(srcptr,nullptr,dstptr,status) 21 - * sgl_to_sgl_fcnvuf(srcptr,nullptr,dstptr,status) 18 + * dbl_to_dbl_fcnvuf(srcptr,_nullptr,dstptr,status) 19 + * dbl_to_sgl_fcnvuf(srcptr,_nullptr,dstptr,status) 20 + * sgl_to_dbl_fcnvuf(srcptr,_nullptr,dstptr,status) 21 + * sgl_to_sgl_fcnvuf(srcptr,_nullptr,dstptr,status) 22 22 * 23 23 * Internal Interfaces: 24 24 * ··· 45 45 int 46 46 sgl_to_sgl_fcnvuf( 47 47 unsigned int *srcptr, 48 - unsigned int *nullptr, 48 + unsigned int *_nullptr, 49 49 sgl_floating_point *dstptr, 50 50 unsigned int *status) 51 51 { ··· 104 104 int 105 105 sgl_to_dbl_fcnvuf( 106 106 unsigned int *srcptr, 107 - unsigned int *nullptr, 107 + unsigned int *_nullptr, 108 108 dbl_floating_point *dstptr, 109 109 unsigned int *status) 110 110 { ··· 145 145 int 146 146 dbl_to_sgl_fcnvuf( 147 147 dbl_unsigned *srcptr, 148 - unsigned int *nullptr, 148 + unsigned int *_nullptr, 149 149 sgl_floating_point *dstptr, 150 150 unsigned int *status) 151 151 { ··· 227 227 int 228 228 dbl_to_dbl_fcnvuf( 229 229 dbl_unsigned *srcptr, 230 - unsigned int *nullptr, 230 + unsigned int *_nullptr, 231 231 dbl_floating_point *dstptr, 232 232 unsigned int *status) 233 233 {
+8 -8
arch/parisc/math-emu/fcnvxf.c
··· 18 18 * Double Fixed-point to Double Floating-point 19 19 * 20 20 * External Interfaces: 21 - * dbl_to_dbl_fcnvxf(srcptr,nullptr,dstptr,status) 22 - * dbl_to_sgl_fcnvxf(srcptr,nullptr,dstptr,status) 23 - * sgl_to_dbl_fcnvxf(srcptr,nullptr,dstptr,status) 24 - * sgl_to_sgl_fcnvxf(srcptr,nullptr,dstptr,status) 21 + * dbl_to_dbl_fcnvxf(srcptr,_nullptr,dstptr,status) 22 + * dbl_to_sgl_fcnvxf(srcptr,_nullptr,dstptr,status) 23 + * sgl_to_dbl_fcnvxf(srcptr,_nullptr,dstptr,status) 24 + * sgl_to_sgl_fcnvxf(srcptr,_nullptr,dstptr,status) 25 25 * 26 26 * Internal Interfaces: 27 27 * ··· 44 44 int 45 45 sgl_to_sgl_fcnvxf( 46 46 int *srcptr, 47 - unsigned int *nullptr, 47 + unsigned int *_nullptr, 48 48 sgl_floating_point *dstptr, 49 49 unsigned int *status) 50 50 { ··· 115 115 int 116 116 sgl_to_dbl_fcnvxf( 117 117 int *srcptr, 118 - unsigned int *nullptr, 118 + unsigned int *_nullptr, 119 119 dbl_floating_point *dstptr, 120 120 unsigned int *status) 121 121 { ··· 166 166 int 167 167 dbl_to_sgl_fcnvxf( 168 168 dbl_integer *srcptr, 169 - unsigned int *nullptr, 169 + unsigned int *_nullptr, 170 170 sgl_floating_point *dstptr, 171 171 unsigned int *status) 172 172 { ··· 271 271 int 272 272 dbl_to_dbl_fcnvxf( 273 273 dbl_integer *srcptr, 274 - unsigned int *nullptr, 274 + unsigned int *_nullptr, 275 275 dbl_floating_point *dstptr, 276 276 unsigned int *status) 277 277 {
+4 -4
arch/parisc/math-emu/frnd.c
··· 14 14 * Quad Floating-point Round to Integer (returns unimplemented) 15 15 * 16 16 * External Interfaces: 17 - * dbl_frnd(srcptr,nullptr,dstptr,status) 18 - * sgl_frnd(srcptr,nullptr,dstptr,status) 17 + * dbl_frnd(srcptr,_nullptr,dstptr,status) 18 + * sgl_frnd(srcptr,_nullptr,dstptr,status) 19 19 * 20 20 * END_DESC 21 21 */ ··· 33 33 /*ARGSUSED*/ 34 34 int 35 35 sgl_frnd(sgl_floating_point *srcptr, 36 - unsigned int *nullptr, 36 + unsigned int *_nullptr, 37 37 sgl_floating_point *dstptr, 38 38 unsigned int *status) 39 39 { ··· 138 138 int 139 139 dbl_frnd( 140 140 dbl_floating_point *srcptr, 141 - unsigned int *nullptr, 141 + unsigned int *_nullptr, 142 142 dbl_floating_point *dstptr, 143 143 unsigned int *status) 144 144 {
+2 -2
arch/parisc/math-emu/sfsqrt.c
··· 15 15 * Single Floating-point Square Root 16 16 * 17 17 * External Interfaces: 18 - * sgl_fsqrt(srcptr,nullptr,dstptr,status) 18 + * sgl_fsqrt(srcptr,_nullptr,dstptr,status) 19 19 * 20 20 * Internal Interfaces: 21 21 * ··· 37 37 unsigned int 38 38 sgl_fsqrt( 39 39 sgl_floating_point *srcptr, 40 - unsigned int *nullptr, 40 + unsigned int *_nullptr, 41 41 sgl_floating_point *dstptr, 42 42 unsigned int *status) 43 43 {
+2 -4
drivers/parisc/led.c
··· 308 308 return 0; 309 309 } 310 310 311 - static int platform_led_remove(struct platform_device *pdev) 311 + static void platform_led_remove(struct platform_device *pdev) 312 312 { 313 313 struct hppa_drvdata *p = platform_get_drvdata(pdev); 314 314 int i; 315 315 316 316 for (i = 0; i < NUM_LEDS_PER_BOARD; i++) 317 317 led_classdev_unregister(&p->leds[i].led_cdev); 318 - 319 - return 0; 320 318 } 321 319 322 320 static struct led_type mainboard_led_types[NUM_LEDS_PER_BOARD] = { ··· 369 371 370 372 static struct platform_driver hppa_mainboard_led_driver = { 371 373 .probe = platform_led_probe, 372 - .remove = platform_led_remove, 374 + .remove_new = platform_led_remove, 373 375 .driver = { 374 376 .name = "platform-leds", 375 377 },