Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Al Viro and committed by
Linus Torvalds
e7bc537d 190ff5b3

+14 -2
+6
include/asm-frv/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 + 3 + header-y += registers.h 4 + 5 + unifdef-y += termios.h 6 + unifdef-y += ptrace.h 7 + unifdef-y += page.h
+2 -2
include/asm-frv/page.h
··· 76 76 77 77 #endif /* __ASSEMBLY__ */ 78 78 79 - #endif /* __KERNEL__ */ 80 - 81 79 #ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC 82 80 #define WANT_PAGE_VIRTUAL 1 83 81 #endif 84 82 85 83 #include <asm-generic/memory_model.h> 86 84 #include <asm-generic/page.h> 85 + 86 + #endif /* __KERNEL__ */ 87 87 88 88 #endif /* _ASM_PAGE_H */
+4
include/asm-frv/ptrace.h
··· 12 12 #define _ASM_PTRACE_H 13 13 14 14 #include <asm/registers.h> 15 + #ifdef __KERNEL__ 15 16 #include <asm/irq_regs.h> 16 17 17 18 #define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0) 19 + #endif 18 20 19 21 20 22 #define PT_PSR 0 ··· 62 60 #define PTRACE_GETFDPIC_EXEC 0 /* [addr] request the executable loadmap */ 63 61 #define PTRACE_GETFDPIC_INTERP 1 /* [addr] request the interpreter loadmap */ 64 62 63 + #ifdef __KERNEL__ 65 64 #ifndef __ASSEMBLY__ 66 65 67 66 /* ··· 77 74 extern unsigned long user_stack(const struct pt_regs *); 78 75 extern void show_regs(struct pt_regs *); 79 76 #define profile_pc(regs) ((regs)->pc) 77 + #endif 80 78 81 79 #endif /* !__ASSEMBLY__ */ 82 80 #endif /* _ASM_PTRACE_H */
+2
include/asm-frv/termios.h
··· 69 69 #define N_SYNC_PPP 14 70 70 #define N_HCI 15 /* Bluetooth HCI UART */ 71 71 72 + #ifdef __KERNEL__ 72 73 #include <asm-generic/termios.h> 74 + #endif 73 75 74 76 #endif /* _ASM_TERMIOS_H */