diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-09-20 03:27:17 +0900 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-21 08:37:10 +0100 |
| commit | 029669da25efa18ee4b8911e694fdcf4a11c8cbe (patch) | |
| tree | 6abe2d1a290865a11e554c92110316cc31560dc8 | |
| parent | b5233d0704c9a6147ebbfabc576d1638b3ac5274 (diff) | |
Fix 'make headers_check' on sh64
Cleanup for user headers, as noted:
asm-sh64/page.h requires asm-generic/memory_model.h, which does not exist in exported headers
asm-sh64/shmparam.h requires asm/cache.h, which does not exist in exported headers
asm-sh64/signal.h requires asm/processor.h, which does not exist in exported headers
asm-sh64/user.h requires asm/processor.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-- | include/asm-sh64/page.h | 3 | ||||
| -rw-r--r-- | include/asm-sh64/shmparam.h | 16 | ||||
| -rw-r--r-- | include/asm-sh64/signal.h | 1 | ||||
| -rw-r--r-- | include/asm-sh64/user.h | 1 |
4 files changed, 5 insertions, 16 deletions
diff --git a/include/asm-sh64/page.h b/include/asm-sh64/page.h index 34fb34754ae6..472089aefc60 100644 --- a/include/asm-sh64/page.h +++ b/include/asm-sh64/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_SH64_PAGE_H */ diff --git a/include/asm-sh64/shmparam.h b/include/asm-sh64/shmparam.h index d3a99a4dc0e3..1bb820c833ee 100644 --- a/include/asm-sh64/shmparam.h +++ b/include/asm-sh64/shmparam.h @@ -2,19 +2,11 @@ #define __ASM_SH64_SHMPARAM_H /* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * include/asm-sh64/shmparam.h - * - * Copyright (C) 2000, 2001 Paolo Alberelli - * + * Set this to a sensible safe default, we'll work out the specifics for the + * align mask from the cache descriptor at run-time. */ +#define SHMLBA 0x4000 -#include <asm/cache.h> - -/* attach addr a multiple of this */ -#define SHMLBA (cpu_data->dcache.sets * L1_CACHE_BYTES) +#define __ARCH_FORCE_SHMLBA #endif /* __ASM_SH64_SHMPARAM_H */ diff --git a/include/asm-sh64/signal.h b/include/asm-sh64/signal.h index a5a28203cb3b..244e134730d9 100644 --- a/include/asm-sh64/signal.h +++ b/include/asm-sh64/signal.h @@ -13,7 +13,6 @@ */ #include <linux/types.h> -#include <asm/processor.h> /* Avoid too many header ordering problems. */ struct siginfo; diff --git a/include/asm-sh64/user.h b/include/asm-sh64/user.h index 8f32f39a8ca9..eb3b33edd73e 100644 --- a/include/asm-sh64/user.h +++ b/include/asm-sh64/user.h @@ -13,7 +13,6 @@ */ #include <linux/types.h> -#include <asm/processor.h> #include <asm/ptrace.h> #include <asm/page.h> |