Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=54ab4d7208a9e67920a499cfc3cce8554b7a2c11
Commit: 54ab4d7208a9e67920a499cfc3cce8554b7a2c11
Parent: 1ddba0257e0c8fb6cdfa913efd3a433d0e4a762a
Author: Jesper Nilsson <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 30 14:14:54 2007 +0100
Committer: Jesper Nilsson <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 11:06:24 2008 +0100
CRIS v32: Whitespace and formatting changes for kernel/ptrace.c
---
arch/cris/arch-v32/kernel/ptrace.c | 10 ++++++----
arch/cris/arch-v32/mm/Makefile | 3 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/arch/cris/arch-v32/kernel/ptrace.c
b/arch/cris/arch-v32/kernel/ptrace.c
index 2df6052..e27f467 100644
--- a/arch/cris/arch-v32/kernel/ptrace.c
+++ b/arch/cris/arch-v32/kernel/ptrace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003, Axis Communications AB.
+ * Copyright (C) 2000-2007, Axis Communications AB.
*/
#include <linux/kernel.h>
@@ -149,7 +149,7 @@ long arch_ptrace(struct task_struct *child, long request,
long addr, long data)
ret = generic_ptrace_pokedata(child, addr, data);
break;
- /* Write the word at location address in the USER area. */
+ /* Write the word at location address in the USER area. */
case PTRACE_POKEUSR:
ret = -EIO;
if ((addr & 3) || addr < 0 || addr > PT_MAX << 2)
@@ -201,7 +201,7 @@ long arch_ptrace(struct task_struct *child, long request,
long addr, long data)
break;
- /* Make the child exit by sending it a sigkill. */
+ /* Make the child exit by sending it a sigkill. */
case PTRACE_KILL:
ret = 0;
@@ -245,9 +245,10 @@ long arch_ptrace(struct task_struct *child, long request,
long addr, long data)
break;
}
+
/* Get all GP registers from the child. */
case PTRACE_GETREGS: {
- int i;
+ int i;
unsigned long tmp;
for (i = 0; i <= PT_MAX; i++) {
@@ -294,6 +295,7 @@ long arch_ptrace(struct task_struct *child, long request,
long addr, long data)
break;
}
+out_tsk:
return ret;
}
diff --git a/arch/cris/arch-v32/mm/Makefile b/arch/cris/arch-v32/mm/Makefile
index 9146f88..0b801f2 100644
--- a/arch/cris/arch-v32/mm/Makefile
+++ b/arch/cris/arch-v32/mm/Makefile
@@ -1,3 +1,4 @@
# Makefile for the Linux/cris parts of the memory manager.
-obj-y := mmu.o init.o tlb.o intmem.o
+obj-y += mmu.o init.o tlb.o intmem.o
+obj-$(CONFIG_ETRAX_L2CACHE) += l2cache.o
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
