Skip to content

Commit

Permalink
Fix 'make headers_check' on sh64
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt authored and David Woodhouse committed Sep 21, 2006
1 parent b5233d0 commit 029669d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 16 deletions.
3 changes: 1 addition & 2 deletions include/asm-sh64/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
16 changes: 4 additions & 12 deletions include/asm-sh64/shmparam.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
1 change: 0 additions & 1 deletion include/asm-sh64/signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/

#include <linux/types.h>
#include <asm/processor.h>

/* Avoid too many header ordering problems. */
struct siginfo;
Expand Down
1 change: 0 additions & 1 deletion include/asm-sh64/user.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/

#include <linux/types.h>
#include <asm/processor.h>
#include <asm/ptrace.h>
#include <asm/page.h>

Expand Down

0 comments on commit 029669d

Please sign in to comment.