From bde440ae77346824769abe745b762ac247ab343f Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Sat, 19 Nov 2005 20:47:22 +1100
Subject: [PATCH] --- yaml --- r: 14500 b: refs/heads/master c:
 21a6290220679d94912a068c75db2c5cd9c6552a h: refs/heads/master v: v3

---
 [refs]                                                         | 2 +-
 .../{include/asm-ppc64 => arch/powerpc/kernel}/ptrace-common.h | 0
 trunk/arch/powerpc/kernel/ptrace.c                             | 3 ++-
 trunk/arch/powerpc/kernel/ptrace32.c                           | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename trunk/{include/asm-ppc64 => arch/powerpc/kernel}/ptrace-common.h (100%)

diff --git a/[refs] b/[refs]
index 5b669707f614..2bc6add1bc96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8ef2705969e0409efedeb889445da67806ba9ea
+refs/heads/master: 21a6290220679d94912a068c75db2c5cd9c6552a
diff --git a/trunk/include/asm-ppc64/ptrace-common.h b/trunk/arch/powerpc/kernel/ptrace-common.h
similarity index 100%
rename from trunk/include/asm-ppc64/ptrace-common.h
rename to trunk/arch/powerpc/kernel/ptrace-common.h
diff --git a/trunk/arch/powerpc/kernel/ptrace.c b/trunk/arch/powerpc/kernel/ptrace.c
index 3d2abd95c7ae..400793c71304 100644
--- a/trunk/arch/powerpc/kernel/ptrace.c
+++ b/trunk/arch/powerpc/kernel/ptrace.c
@@ -36,8 +36,9 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
+
 #ifdef CONFIG_PPC64
-#include <asm/ptrace-common.h>
+#include "ptrace-common.h"
 #endif
 
 #ifdef CONFIG_PPC32
diff --git a/trunk/arch/powerpc/kernel/ptrace32.c b/trunk/arch/powerpc/kernel/ptrace32.c
index 91eb952e0293..61762640b877 100644
--- a/trunk/arch/powerpc/kernel/ptrace32.c
+++ b/trunk/arch/powerpc/kernel/ptrace32.c
@@ -33,7 +33,8 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/ptrace-common.h>
+
+#include "ptrace-common.h"
 
 /*
  * does not yet catch signals sent when the child dies.