Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae937deb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9cf46a35 0419bb46

arch/mn10300/include/asm/ptrace.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -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 */

arch/mn10300/include/asm/setup.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -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 */