headers_check fixes
Linus,
Please pull headers_check fixes :
The following changes since commit 44b7532b8b464f606053562400719c9c21276037:
Linus Torvalds (1):
Merge git://git.kernel.org/.../jejb/scsi-rc-fixes-2.6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6.git master
Jaswinder Singh Rajput (2):
headers_check fix: mn10300, ptrace.h
headers_check fix: mn10300, setup.h
arch/mn10300/include/asm/ptrace.h | 5 ++--- arch/mn10300/include/asm/setup.h | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-)
Complete diff :
arch/mn10300/include/asm/ptrace.h +2 -3
@@ -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 */
arch/mn10300/include/asm/setup.h +2 -1
@@ -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 */