Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1bcf548293aef19b0797348332cf1dfbf2116cef

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent e6716b87d5
Exists in master and in 40 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, emb_lf-6.6.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Consolidate PTRACE_DETACH 

Identical handlers of PTRACE_DETACH go into ptrace_request().
Not touching compat code.
Not touching archs that don't call ptrace_request.

Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 19 changed files with 3 additions and 83 deletions Side-by-side Diff

arch/alpha/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -368,10 +368,6 @@
368 368 ret = 0;
369 369 goto out;
370 370  
371   - case PTRACE_DETACH: /* detach a process that was attached. */
372   - ret = ptrace_detach(child, data);
373   - goto out;
374   -
375 371 default:
376 372 ret = ptrace_request(child, request, addr, data);
377 373 goto out;
arch/arm/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -731,10 +731,6 @@
731 731 ret = 0;
732 732 break;
733 733  
734   - case PTRACE_DETACH:
735   - ret = ptrace_detach(child, data);
736   - break;
737   -
738 734 case PTRACE_GETREGS:
739 735 ret = ptrace_getregs(child, (void __user *)data);
740 736 break;
arch/avr32/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -227,11 +227,6 @@
227 227 ret = 0;
228 228 break;
229 229  
230   - /* Detach a process that was attached */
231   - case PTRACE_DETACH:
232   - ret = ptrace_detach(child, data);
233   - break;
234   -
235 230 case PTRACE_GETREGS:
236 231 ret = ptrace_getregs(child, (void __user *)data);
237 232 break;
arch/blackfin/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -385,12 +385,6 @@
385 385 break;
386 386 }
387 387  
388   - case PTRACE_DETACH:
389   - { /* detach a process that was attached. */
390   - ret = ptrace_detach(child, data);
391   - break;
392   - }
393   -
394 388 case PTRACE_GETREGS:
395 389 {
396 390  
arch/cris/arch-v10/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -177,10 +177,6 @@
177 177 ret = 0;
178 178 break;
179 179  
180   - case PTRACE_DETACH:
181   - ret = ptrace_detach(child, data);
182   - break;
183   -
184 180 /* Get all GP registers from the child. */
185 181 case PTRACE_GETREGS: {
186 182 int i;
arch/cris/arch-v32/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -245,10 +245,6 @@
245 245 break;
246 246  
247 247 }
248   - case PTRACE_DETACH:
249   - ret = ptrace_detach(child, data);
250   - break;
251   -
252 248 /* Get all GP registers from the child. */
253 249 case PTRACE_GETREGS: {
254 250 int i;
arch/m32r/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -704,14 +704,6 @@
704 704 break;
705 705 }
706 706  
707   - /*
708   - * detach a process that was attached.
709   - */
710   - case PTRACE_DETACH:
711   - ret = 0;
712   - ret = ptrace_detach(child, data);
713   - break;
714   -
715 707 case PTRACE_GETREGS:
716 708 ret = ptrace_getregs(child, (void __user *)data);
717 709 break;
arch/m68k/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -226,10 +226,6 @@
226 226 wake_up_process(child);
227 227 break;
228 228  
229   - case PTRACE_DETACH: /* detach a process that was attached. */
230   - ret = ptrace_detach(child, data);
231   - break;
232   -
233 229 case PTRACE_GETREGS: /* Get all gp regs from the child. */
234 230 for (i = 0; i < 19; i++) {
235 231 tmp = get_reg(child, i);
arch/mips/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -435,10 +435,6 @@
435 435 wake_up_process(child);
436 436 break;
437 437  
438   - case PTRACE_DETACH: /* detach a process that was attached. */
439   - ret = ptrace_detach(child, data);
440   - break;
441   -
442 438 case PTRACE_GET_THREAD_AREA:
443 439 ret = put_user(task_thread_info(child)->tp_value,
444 440 (unsigned long __user *) data);
arch/parisc/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -329,10 +329,6 @@
329 329 /* give it a chance to run. */
330 330 goto out_wake;
331 331  
332   - case PTRACE_DETACH:
333   - ret = ptrace_detach(child, data);
334   - goto out_tsk;
335   -
336 332 case PTRACE_GETEVENTMSG:
337 333 ret = put_user(child->ptrace_message, (unsigned int __user *) data);
338 334 goto out_tsk;
arch/powerpc/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -505,10 +505,6 @@
505 505 ret = ptrace_set_debugreg(child, addr, data);
506 506 break;
507 507  
508   - case PTRACE_DETACH:
509   - ret = ptrace_detach(child, data);
510   - break;
511   -
512 508 #ifdef CONFIG_PPC64
513 509 case PTRACE_GETREGS64:
514 510 #endif
arch/s390/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -683,11 +683,6 @@
683 683 wake_up_process(child);
684 684 return 0;
685 685  
686   - case PTRACE_DETACH:
687   - /* detach a process that was attached. */
688   - return ptrace_detach(child, data);
689   -
690   -
691 686 /* Do requests that differ for 31/64 bit */
692 687 default:
693 688 #ifdef CONFIG_COMPAT
arch/sh/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -211,10 +211,6 @@
211 211 break;
212 212 }
213 213  
214   - case PTRACE_DETACH: /* detach a process that was attached. */
215   - ret = ptrace_detach(child, data);
216   - break;
217   -
218 214 #ifdef CONFIG_SH_DSP
219 215 case PTRACE_GETDSPREGS: {
220 216 unsigned long dp;
arch/sh64/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -244,10 +244,6 @@
244 244 break;
245 245 }
246 246  
247   - case PTRACE_DETACH: /* detach a process that was attached. */
248   - ret = ptrace_detach(child, data);
249   - break;
250   -
251 247 default:
252 248 ret = ptrace_request(child, request, addr, data);
253 249 break;
arch/um/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -119,11 +119,6 @@
119 119 break;
120 120 }
121 121  
122   - case PTRACE_DETACH:
123   - /* detach a process that was attached. */
124   - ret = ptrace_detach(child, data);
125   - break;
126   -
127 122 #ifdef PTRACE_GETREGS
128 123 case PTRACE_GETREGS: { /* Get all gp regs from the child. */
129 124 if (!access_ok(VERIFY_WRITE, p, MAX_REG_OFFSET)) {
arch/x86/kernel/ptrace_32.c
Diff comments   View file @ 1bcf548
... ... @@ -524,11 +524,6 @@
524 524 ret = 0;
525 525 break;
526 526  
527   - case PTRACE_DETACH:
528   - /* detach a process that was attached. */
529   - ret = ptrace_detach(child, data);
530   - break;
531   -
532 527 case PTRACE_GETREGS: { /* Get all gp regs from the child. */
533 528 if (!access_ok(VERIFY_WRITE, datap, FRAME_SIZE*sizeof(long))) {
534 529 ret = -EIO;
arch/x86/kernel/ptrace_64.c
Diff comments   View file @ 1bcf548
... ... @@ -500,11 +500,6 @@
500 500 ret = 0;
501 501 break;
502 502  
503   - case PTRACE_DETACH:
504   - /* detach a process that was attached. */
505   - ret = ptrace_detach(child, data);
506   - break;
507   -
508 503 case PTRACE_GETREGS: { /* Get all gp regs from the child. */
509 504 if (!access_ok(VERIFY_WRITE, (unsigned __user *)data,
510 505 sizeof(struct user_regs_struct))) {
arch/xtensa/kernel/ptrace.c
Diff comments   View file @ 1bcf548
... ... @@ -304,10 +304,6 @@
304 304 ret = put_user(sizeof(elf_fpregset_t), (unsigned long *) data);
305 305 break;
306 306  
307   - case PTRACE_DETACH: /* detach a process that was attached. */
308   - ret = ptrace_detach(child, data);
309   - break;
310   -
311 307 default:
312 308 ret = ptrace_request(child, request, addr, data);
313 309 goto out;
... ... @@ -386,6 +386,9 @@
386 386 case PTRACE_SETSIGINFO:
387 387 ret = ptrace_setsiginfo(child, (siginfo_t __user *) data);
388 388 break;
  389 + case PTRACE_DETACH: /* detach a process that was attached. */
  390 + ret = ptrace_detach(child, data);
  391 + break;
389 392 default:
390 393 break;
391 394 }