OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2009-06-14 13:52:53 -07:00
parent 9cf46a35d2 0419bb466f
commit ae937debe1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/mn10300/include/asm/ptrace.h
View File

@ -77,8 +77,6 @@ struct pt_regs {
}; };
#endif #endif
extern struct pt_regs *__frame; /* current frame pointer */
/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
#define PTRACE_GETREGS 12 #define PTRACE_GETREGS 12
#define PTRACE_SETREGS 13 #define PTRACE_SETREGS 13
@ -90,6 +88,8 @@ extern struct pt_regs *__frame; /* current frame pointer */
#if defined(__KERNEL__) #if defined(__KERNEL__)
extern struct pt_regs *__frame; /* current frame pointer */
#if !defined(__ASSEMBLY__) #if !defined(__ASSEMBLY__)
struct task_struct; struct task_struct;
@ -107,5 +107,4 @@ extern void user_disable_single_step(struct task_struct *);
#define profile_pc(regs) ((regs)->pc) #define profile_pc(regs) ((regs)->pc)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_PTRACE_H */ #endif /* _ASM_PTRACE_H */

3
arch/mn10300/include/asm/setup.h
View File

@ -11,7 +11,8 @@
#ifndef _ASM_SETUP_H #ifndef _ASM_SETUP_H
#define _ASM_SETUP_H #define _ASM_SETUP_H
#ifdef __KERNEL__
extern void __init unit_setup(void); extern void __init unit_setup(void);
extern void __init unit_init_IRQ(void); extern void __init unit_init_IRQ(void);
#endif
#endif /* _ASM_SETUP_H */ #endif /* _ASM_SETUP_H */