leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Fix 'make headers_check' on ia64

Browse Source 
On Tue, 2006-09-12 at 17:44 +0100, David Woodhouse wrote:
> asm-ia64/ptrace.h requires asm/asm-offsets.h, which does not exist
> asm-ia64/resource.h requires asm/ustack.h, which does not exist

Hide parts which shouldn't be visible to userspace.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
David Woodhouse 2006-09-16 12:15:47 -07:00 committed by Linus Torvalds
parent 124b51c7a8
commit d5759641f5
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-ia64/Kbuild
View File

@ -4,4 +4,4 @@ header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h \
intel_intrin.h intrinsics.h perfmon_default_smpl.h \ intel_intrin.h intrinsics.h perfmon_default_smpl.h \
ptrace_offsets.h rse.h setup.h ucontext.h ptrace_offsets.h rse.h setup.h ucontext.h
unifdef-y += perfmon.h unifdef-y += perfmon.h ustack.h

4
include/asm-ia64/page.h
View File

@ -7,6 +7,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com> * David Mosberger-Tang <davidm@hpl.hp.com>
*/ */
# ifdef __KERNEL__
#include <asm/intrinsics.h> #include <asm/intrinsics.h>
#include <asm/types.h> #include <asm/types.h>
@ -64,7 +65,6 @@
# define __pa(x) ((x) - PAGE_OFFSET) # define __pa(x) ((x) - PAGE_OFFSET)
# define __va(x) ((x) + PAGE_OFFSET) # define __va(x) ((x) + PAGE_OFFSET)
#else /* !__ASSEMBLY */ #else /* !__ASSEMBLY */
# ifdef __KERNEL__
# define STRICT_MM_TYPECHECKS # define STRICT_MM_TYPECHECKS
extern void clear_page (void *page); extern void clear_page (void *page);
@ -174,7 +174,6 @@ get_order (unsigned long size)
return order; return order;
} }
# endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#ifdef STRICT_MM_TYPECHECKS #ifdef STRICT_MM_TYPECHECKS
@ -228,4 +227,5 @@ get_order (unsigned long size)
(((current->personality & READ_IMPLIES_EXEC) != 0) \ (((current->personality & READ_IMPLIES_EXEC) != 0) \
? VM_EXEC : 0)) ? VM_EXEC : 0))
# endif /* __KERNEL__ */
#endif /* _ASM_IA64_PAGE_H */ #endif /* _ASM_IA64_PAGE_H */

10
include/asm-ia64/ptrace.h
View File

@ -56,6 +56,8 @@
#include <asm/fpu.h> #include <asm/fpu.h>
#ifdef __KERNEL__
#ifndef ASM_OFFSETS_C #ifndef ASM_OFFSETS_C
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#endif #endif
@ -79,10 +81,9 @@
#define KERNEL_STACK_SIZE IA64_STK_OFFSET #define KERNEL_STACK_SIZE IA64_STK_OFFSET
#ifndef __ASSEMBLY__ #endif /* __KERNEL__ */
#include <asm/current.h> #ifndef __ASSEMBLY__
#include <asm/page.h>
/* /*
* This struct defines the way the registers are saved on system * This struct defines the way the registers are saved on system
@ -229,6 +230,9 @@ struct switch_stack {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/current.h>
#include <asm/page.h>
#define __ARCH_SYS_PTRACE 1 #define __ARCH_SYS_PTRACE 1
/* /*

7
include/asm-ia64/ustack.h
View File

@ -5,12 +5,15 @@
* Constants for the user stack size * Constants for the user stack size
*/ */
#ifdef __KERNEL__
#include <asm/page.h> #include <asm/page.h>
/* The absolute hard limit for stack size is 1/2 of the mappable space in the region */ /* The absolute hard limit for stack size is 1/2 of the mappable space in the region */
#define MAX_USER_STACK_SIZE (RGN_MAP_LIMIT/2) #define MAX_USER_STACK_SIZE (RGN_MAP_LIMIT/2)
/* Make a default stack size of 2GB */
#define DEFAULT_USER_STACK_SIZE (1UL << 31)
#define STACK_TOP (0x6000000000000000UL + RGN_MAP_LIMIT) #define STACK_TOP (0x6000000000000000UL + RGN_MAP_LIMIT)
#endif
/* Make a default stack size of 2GiB */
#define DEFAULT_USER_STACK_SIZE (1UL << 31)
#endif /* _ASM_IA64_USTACK_H */ #endif /* _ASM_IA64_USTACK_H */