From 359006298455ea31c9087b43283b8639b97c499b Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 20 Nov 2007 18:26:28 +0900 Subject: [PATCH] --- yaml --- r: 77752 b: refs/heads/master c: ac490a4893d37279f704876d430c3683071398b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/ptrace_64.c | 1 - trunk/include/asm-sh/io.h | 5 +++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3ccc7e9d5d90..088048da9c55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a4f7c66be981c6b5f44a4d66a14ea6ac9b7b6b0 +refs/heads/master: ac490a4893d37279f704876d430c3683071398b2 diff --git a/trunk/arch/sh/kernel/ptrace_64.c b/trunk/arch/sh/kernel/ptrace_64.c index 14e7d5e5679a..51bb546365cb 100644 --- a/trunk/arch/sh/kernel/ptrace_64.c +++ b/trunk/arch/sh/kernel/ptrace_64.c @@ -253,7 +253,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) asmlinkage int sh64_ptrace(long request, long pid, long addr, long data) { - extern void poke_real_address_q(unsigned long long addr, unsigned long long data); #define WPC_DBRMODE 0x0d104008 static int first_call = 1; diff --git a/trunk/include/asm-sh/io.h b/trunk/include/asm-sh/io.h index 556aabe844c5..74305edceeeb 100644 --- a/trunk/include/asm-sh/io.h +++ b/trunk/include/asm-sh/io.h @@ -248,6 +248,11 @@ static inline void ctrl_delay(void) #endif } +/* Quad-word real-mode I/O, don't ask.. */ +unsigned long long peek_real_address_q(unsigned long long addr); +unsigned long long poke_real_address_q(unsigned long long addr, + unsigned long long val); + #define IO_SPACE_LIMIT 0xffffffff #if !defined(CONFIG_MMU)