diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-09-20 03:25:34 +0900 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-21 08:36:50 +0100 |
| commit | b5233d0704c9a6147ebbfabc576d1638b3ac5274 (patch) | |
| tree | af5f587d45cba760ddee8304d8b72fb9007fc1f7 | |
| parent | 6ff6340abeaaf1a15587c87dac3e56754778cc7a (diff) | |
Fix 'make headers_check' on sh
Cleanup for user headers, as noted:
asm-sh/page.h requires asm-generic/memory_model.h, which does not exist in exported headers
asm-sh/ptrace.h requires asm/ubc.h, which does not exist in exported headers
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | arch/sh/kernel/process.c | 1 | ||||
| -rw-r--r-- | include/asm-sh/page.h | 3 | ||||
| -rw-r--r-- | include/asm-sh/ptrace.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index 22dc9c21201..f2031314cb2 100644 --- a/arch/sh/kernel/process.c +++ b/arch/sh/kernel/process.c @@ -26,6 +26,7 @@ #include <asm/uaccess.h> #include <asm/mmu_context.h> #include <asm/elf.h> +#include <asm/ubc.h> static int hlt_counter=0; diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index 5a057b00f19..6f7eb8a3aba 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h @@ -112,9 +112,8 @@ typedef struct { unsigned long pgprot; } pgprot_t; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ - #include <asm-generic/memory_model.h> #include <asm-generic/page.h> +#endif /* __KERNEL__ */ #endif /* __ASM_SH_PAGE_H */ diff --git a/include/asm-sh/ptrace.h b/include/asm-sh/ptrace.h index 792fc35bd62..ed358a376e6 100644 --- a/include/asm-sh/ptrace.h +++ b/include/asm-sh/ptrace.h @@ -1,8 +1,6 @@ #ifndef __ASM_SH_PTRACE_H #define __ASM_SH_PTRACE_H -#include <asm/ubc.h> - /* * Copyright (C) 1999, 2000 Niibe Yutaka * |