NPTL support for uClinux
Subsystems (3)
PATCH 1/1 NPTL support for uClinux
The following patch makes NPTL syscalls work for m68knommu.
I didn't test this beyond building the kernel, there's no much point to it till uClibc support for NPTL on m68k is implemented.
The patch is basically a copy of original NPTL patch for usual m68k. The only real change is in atomic_cmpxchg syscall implementation: code that checked correctness of the memory reference was removed.
Signature · 4 lines
Maxim Kuvyrkov CodeSourcery [email protected] (650) 331-3385 x724
Quoted 1 line
From
a41f47134963de257e253ba1b8742c1670cc2621Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <[email protected]>
Date: Sun, 6 Dec 2009 10:08:14 -0800
Subject: [PATCH] NPTL support for uClinux
Port syscalls for NPTL support to m68knommu.
--- arch/m68k/include/asm/thread_info_no.h | 1 + arch/m68knommu/kernel/process.c | 4 +++ arch/m68knommu/kernel/ptrace.c | 5 ++++ arch/m68knommu/kernel/sys_m68k.c | 39 ++++++++++++++++++++++++++++++++ arch/m68knommu/kernel/syscalltable.S | 4 +++ 5 files changed, 53 insertions(+), 0 deletions(-)
arch/m68k/include/asm/thread_info_no.h +1 -0
@@ -37,6 +37,7 @@ struct thread_info {unsigned long flags;/* low level flags */ int cpu;/* cpu we're on */ int preempt_count;/* 0 => preemptable, <0 => BUG */ +unsigned long tp_value;struct restart_block restart_block; };
arch/m68knommu/kernel/process.c +4 -0
@@ -221,6 +221,10 @@ int copy_thread(unsigned long clone_flags, p->thread.usp = usp; p->thread.ksp = (unsigned long )childstack; + +if (clone_flags &CLONE_SETTLS ) +task_thread_info (p)->tp_value = regs->d5; +/* * Must save the current SFC/DFC value, NOT the value when * the parent was last descheduled - RGH 10-08-96
arch/m68knommu/kernel/ptrace.c +5 -0
@@ -319,6 +319,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) }#endif +case PTRACE_GET_THREAD_AREA : + ret =put_user (task_thread_info (child)->tp_value, + (unsigned long __user *) data); +break ; +default : ret = -EIO ;break ;
arch/m68knommu/kernel/sys_m68k.c +39 -0
@@ -224,3 +224,42 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[]) : "d" (__a), "d" (__b), "d" (__c));return __res; } + +asmlinkage unsigned long +sys_read_tp (void ) +{ +return current_thread_info ()->tp_value; +} + +asmlinkage int +sys_write_tp (unsigned long tp) +{ +current_thread_info ()->tp_value = tp; +return 0 ; +} + +/* This syscall gets its arguments in A0 (mem), D2 (oldval) and +D1 (newval). */ +asmlinkage int +sys_atomic_cmpxchg_32 (unsigned long newval,int oldval,int d3,int d4,int d5, +unsigned long __user *mem) +{ +struct mm_struct *mm = current->mm; +unsigned long mem_value; + +down_read (&mm->mmap_sem); + + mem_value = *mem; +if (mem_value == oldval) + *mem = newval; + +up_read (&mm->mmap_sem); +return mem_value; +} + +asmlinkage int +sys_atomic_barrier (void ) +{ +/* no code needed for uniprocs */ +return 0 ; +}
arch/m68knommu/kernel/syscalltable.S +4 -0
@@ -351,6 +351,10 @@ ENTRY(sys_call_table) .long sys_pwritev /* 330 */ .long sys_rt_tgsigqueueinfo .long sys_perf_event_open + .long sys_read_tp + .long sys_write_tp + .long sys_atomic_cmpxchg_32 /* 335 */ + .long sys_atomic_barrier .rept NR_syscalls-(.-sys_call_table)/4 .long sys_ni_syscall
Signature · 1 line
1.6.2.4
Quoted 6 lines · Maxim Kuvyrkov
arch/m68knommu/kernel/ptrace.c +0
-0@@ -319,6 +319,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) }
arch/m68knommu/kernel/ptrace.c long arch_ptrace(struct task_struct *child, long request, long addr, long data) · line 329
Quoted 10 lines
arch/m68knommu/kernel/ptrace.c +5
-0#endif +case PTRACE_GET_THREAD_AREA : + ret =put_user (task_thread_info (child)->tp_value, + (unsigned long __user *) data); +break ; +default : ret = -EIO ;break ;
Indentation is off here.
Andreas.
Signature · 3 lines
Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."