Commit e7bc537d authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] fix frv headers_check

a) registers.h is really needed there
b) include of asm-generic/termios should be under __KERNEL__
c) includes of asm-generic/{memory_model,page} should be under
   __KERNEL (nothing in there that would work in userland)
d) a lot of stuff in ptrace.h should be under __KERNEL__.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 190ff5b3
include include/asm-generic/Kbuild.asm include include/asm-generic/Kbuild.asm
header-y += registers.h
unifdef-y += termios.h
unifdef-y += ptrace.h
unifdef-y += page.h
...@@ -76,8 +76,6 @@ extern unsigned long max_pfn; ...@@ -76,8 +76,6 @@ extern unsigned long max_pfn;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC #ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC
#define WANT_PAGE_VIRTUAL 1 #define WANT_PAGE_VIRTUAL 1
#endif #endif
...@@ -85,4 +83,6 @@ extern unsigned long max_pfn; ...@@ -85,4 +83,6 @@ extern unsigned long max_pfn;
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/page.h>
#endif /* __KERNEL__ */
#endif /* _ASM_PAGE_H */ #endif /* _ASM_PAGE_H */
...@@ -12,9 +12,11 @@ ...@@ -12,9 +12,11 @@
#define _ASM_PTRACE_H #define _ASM_PTRACE_H
#include <asm/registers.h> #include <asm/registers.h>
#ifdef __KERNEL__
#include <asm/irq_regs.h> #include <asm/irq_regs.h>
#define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0) #define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0)
#endif
#define PT_PSR 0 #define PT_PSR 0
...@@ -60,6 +62,7 @@ ...@@ -60,6 +62,7 @@
#define PTRACE_GETFDPIC_EXEC 0 /* [addr] request the executable loadmap */ #define PTRACE_GETFDPIC_EXEC 0 /* [addr] request the executable loadmap */
#define PTRACE_GETFDPIC_INTERP 1 /* [addr] request the interpreter loadmap */ #define PTRACE_GETFDPIC_INTERP 1 /* [addr] request the interpreter loadmap */
#ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* /*
...@@ -74,6 +77,7 @@ register struct pt_regs *__frame asm("gr28"); ...@@ -74,6 +77,7 @@ register struct pt_regs *__frame asm("gr28");
extern unsigned long user_stack(const struct pt_regs *); extern unsigned long user_stack(const struct pt_regs *);
extern void show_regs(struct pt_regs *); extern void show_regs(struct pt_regs *);
#define profile_pc(regs) ((regs)->pc) #define profile_pc(regs) ((regs)->pc)
#endif
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* _ASM_PTRACE_H */ #endif /* _ASM_PTRACE_H */
...@@ -69,6 +69,8 @@ struct termio { ...@@ -69,6 +69,8 @@ struct termio {
#define N_SYNC_PPP 14 #define N_SYNC_PPP 14
#define N_HCI 15 /* Bluetooth HCI UART */ #define N_HCI 15 /* Bluetooth HCI UART */
#ifdef __KERNEL__
#include <asm-generic/termios.h> #include <asm-generic/termios.h>
#endif
#endif /* _ASM_TERMIOS_H */ #endif /* _ASM_TERMIOS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment