diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 13:52:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 13:52:53 -0700 |
| commit | ae937debe178b4327fd67d604ee83a20f22aa0de (patch) | |
| tree | d337179b207aa5be5e47330199319dd6f421b3b7 | |
| parent | 9cf46a35d25debfc314dd6f090b8075bd0b7f74c (diff) | |
| parent | 0419bb466f5059e40e141b1e3ab258a862ae11f0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6:
headers_check fix: mn10300, setup.h
headers_check fix: mn10300, ptrace.h
| -rw-r--r-- | arch/mn10300/include/asm/ptrace.h | 5 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/setup.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mn10300/include/asm/ptrace.h b/arch/mn10300/include/asm/ptrace.h index 921942ed1b0..1b0ba5e182b 100644 --- a/arch/mn10300/include/asm/ptrace.h +++ b/arch/mn10300/include/asm/ptrace.h @@ -77,8 +77,6 @@ struct pt_regs { }; #endif -extern struct pt_regs *__frame; /* current frame pointer */ - /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ #define PTRACE_GETREGS 12 #define PTRACE_SETREGS 13 @@ -90,6 +88,8 @@ extern struct pt_regs *__frame; /* current frame pointer */ #if defined(__KERNEL__) +extern struct pt_regs *__frame; /* current frame pointer */ + #if !defined(__ASSEMBLY__) struct task_struct; @@ -107,5 +107,4 @@ extern void user_disable_single_step(struct task_struct *); #define profile_pc(regs) ((regs)->pc) #endif /* __KERNEL__ */ - #endif /* _ASM_PTRACE_H */ diff --git a/arch/mn10300/include/asm/setup.h b/arch/mn10300/include/asm/setup.h index 08356c83228..c229d1e3f99 100644 --- a/arch/mn10300/include/asm/setup.h +++ b/arch/mn10300/include/asm/setup.h @@ -11,7 +11,8 @@ #ifndef _ASM_SETUP_H #define _ASM_SETUP_H +#ifdef __KERNEL__ extern void __init unit_setup(void); extern void __init unit_init_IRQ(void); - +#endif #endif /* _ASM_SETUP_H */ |