Skip to content

Commit

Permalink
[PATCH] fix frv headers_check
Browse files Browse the repository at this point in the history
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: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Feb 2, 2007
1 parent 190ff5b commit e7bc537
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
6 changes: 6 additions & 0 deletions include/asm-frv/Kbuild
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
include include/asm-generic/Kbuild.asm

header-y += registers.h

unifdef-y += termios.h
unifdef-y += ptrace.h
unifdef-y += page.h
4 changes: 2 additions & 2 deletions include/asm-frv/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ extern unsigned long max_pfn;

#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC
#define WANT_PAGE_VIRTUAL 1
#endif

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>

#endif /* __KERNEL__ */

#endif /* _ASM_PAGE_H */
4 changes: 4 additions & 0 deletions include/asm-frv/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
#define _ASM_PTRACE_H

#include <asm/registers.h>
#ifdef __KERNEL__
#include <asm/irq_regs.h>

#define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0)
#endif


#define PT_PSR 0
Expand Down Expand Up @@ -60,6 +62,7 @@
#define PTRACE_GETFDPIC_EXEC 0 /* [addr] request the executable loadmap */
#define PTRACE_GETFDPIC_INTERP 1 /* [addr] request the interpreter loadmap */

#ifdef __KERNEL__
#ifndef __ASSEMBLY__

/*
Expand All @@ -74,6 +77,7 @@ register struct pt_regs *__frame asm("gr28");
extern unsigned long user_stack(const struct pt_regs *);
extern void show_regs(struct pt_regs *);
#define profile_pc(regs) ((regs)->pc)
#endif

#endif /* !__ASSEMBLY__ */
#endif /* _ASM_PTRACE_H */
2 changes: 2 additions & 0 deletions include/asm-frv/termios.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ struct termio {
#define N_SYNC_PPP 14
#define N_HCI 15 /* Bluetooth HCI UART */

#ifdef __KERNEL__
#include <asm-generic/termios.h>
#endif

#endif /* _ASM_TERMIOS_H */

0 comments on commit e7bc537

Please sign in to comment.