diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-06-30 00:21:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-06-30 00:21:34 +0000 |
| commit | 3917ac5846dd0f9ad1238166f90caab9912052e6 (patch) | |
| tree | 1c298935def4f29edb39192365a65d73de999155 /arch/ppc | |
| parent | af2f803c8b2d469fe38e4a7ce952658dfcb6681a (diff) | |
o Merge with Linux 2.1.100.
o Cleanup the machine dependencies of floppy and rtc. The driver for
the Dallas thingy in the Indy is still missing.
o Handle allocation of zero'd pages correct for R4000SC / R4400SC.
o Page colouring shit to match the virtual and physical colour of all
mapped pages. This tends to produce extreme fragmentation problems,
so it's deactivated for now. Users of R4000SC / R4400SC may re-enable
the code in arch/mips/mm/init.c by removing the definition of
CONF_GIVE_A_SHIT_ABOUT_COLOURS. Should get them somewhat further -
but don't shake to hard ...
o Fixed ptrace(2)-ing of syscalls, strace is now working again.
o Fix the interrupt forwarding from the keyboard driver to the psaux
driver, PS/2 mice are now working on the Indy. The fix is somewhat
broken as it prevents generic kernels for Indy and machines which handle
things different.
o Things I can't remember.
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | arch/ppc/mm/init.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/ppc/kernel/ptrace.c b/arch/ppc/kernel/ptrace.c index ce2f35058..66dfb630f 100644 --- a/arch/ppc/kernel/ptrace.c +++ b/arch/ppc/kernel/ptrace.c @@ -331,7 +331,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) (current->uid != child->euid) || (current->uid != child->uid) || (current->gid != child->egid) || - (current->gid != child->gid)) && !suser()) + (current->gid != child->gid)) && !capable(CAP_SYS_PTRACE)) goto out; /* the same process cannot be attached many times */ if (child->flags & PF_PTRACED) diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index 5967e29e6..d13d87821 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c @@ -1296,11 +1296,8 @@ local_flush_tlb_mm(struct mm_struct *mm) { #ifndef CONFIG_8xx mm->context = NO_CONTEXT; - if (mm == current->mm) { - get_mmu_context(current); - /* done by get_mmu_context() now -- Cort */ - /*set_context(current->mm->context);*/ - } + if (mm == current->mm) + activate_context(current); #else asm volatile ("tlbia" : : ); #endif |