Skip to contentSkip to conversation

fix loop with disabled tasklets

PATCH Petr Vandrovec 2 participants 2 messages Nov 12, 2001

lore
Share & tools
lore
#0 lore raw

On 12 Nov 01 at 15:20, Andrea Arcangeli wrote:

Hi Andrea,
does it compile? It looks to me like that you are using ret_from_fork,
ret_from_smp and ret_from_smpfork interchangably in the patch. You renamed ret_from_smpfork to ret_from_fork, changed extern ret_from_smpfork to ret_from_smp, and you still call ret_from_smpfork ;-)

Or do I miss something?
Thanks,
Petr Vandrovec [email protected]

Quoted 49 lines
arch/sparc/kernel/entry.S Mon Nov 12 15:17:32 2001 renamed from arch/sparc/kernel/entry.S.~1~ Sat Feb 10 02:34:05 2001 +1 -3
@@ -1466,8 +1466,7 @@
    b   C_LABEL(ret_sys_call)
     ld [%sp + REGWIN_SZ + PT_I0], %o0
 
-#ifdef CONFIG_SMP
-   .globl  C_LABEL(ret_from_smpfork)
+   .globl  C_LABEL(ret_from_fork)
 C_LABEL(ret_from_smpfork):
    wr  %l0, PSR_ET, %psr
    WRITE_PAUSE
@@ -1475,7 +1474,6 @@
     mov    %g3, %o0
    b   C_LABEL(ret_sys_call)
     ld [%sp + REGWIN_SZ + PT_I0], %o0
-#endif
 
    /* Linux native and SunOS system calls enter here... */
    .align  4
arch/sparc/kernel/process.c Mon Nov 12 15:18:21 2001 renamed from arch/sparc/kernel/process.c.~1~ Thu Oct 11 10:41:52 2001 +1 -10
@@ -455,11 +455,7 @@
  *       allocate the task_struct and kernel stack in
  *       do_fork().
  */
-#ifdef CONFIG_SMP
-extern void ret_from_smpfork(void);
-#else
-extern void ret_from_syscall(void);
-#endif
+extern void ret_from_smp(void);
 
 int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
        unsigned long unused,
@@ -493,13 +489,8 @@
    copy_regwin(new_stack, (((struct reg_window *) regs) - 1));
 
    p->thread.ksp = (unsigned long) new_stack;
-#ifdef CONFIG_SMP
    p->thread.kpc = (((unsigned long) ret_from_smpfork) - 0x8);
    p->thread.kpsr = current->thread.fork_kpsr | PSR_PIL;
-#else
-   p->thread.kpc = (((unsigned long) ret_from_syscall) - 0x8);
-   p->thread.kpsr = current->thread.fork_kpsr;
-#endif
    p->thread.kwim = current->thread.fork_kwim;
 
    /* This is used for sun4c only */
#1 lore raw
Quoted 5 lines · Petr Vandrovec

On 12 Nov 01 at 15:20, Andrea Arcangeli wrote:

Hi Andrea,
does it compile? It looks to me like that you are using ret_from_fork,
ret_from_smp and ret_from_smpfork interchangably in the patch. You renamed

ret_from_smpfork must disappear, to fix any compilation trouble you only need to replace it with ret_from_fork in any possible place that I forgotten.

as said I don't know what PSR_PIL means so that is more important part to check for runtime correctness (compilations details are trivial to solve instead).

thanks for the review,
Andrea