Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5759641 authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds
Browse files

[PATCH] Fix 'make headers_check' on ia64 



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: default avatarDavid Woodhouse <dwmw2@infradead.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 124b51c7

include/asm-ia64/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -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	\

	 ptrace_offsets.h rse.h setup.h ucontext.h



unifdef-y += perfmon.h
 
unifdef-y += perfmon.h ustack.h

include/asm-ia64/page.h

+2 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *	David Mosberger-Tang <davidm@hpl.hp.com>

 */



# ifdef __KERNEL__



#include <asm/intrinsics.h>

#include <asm/types.h>
@@ -64,7 +65,6 @@ 
# define __pa(x)		((x) - PAGE_OFFSET)

# define __va(x)		((x) + PAGE_OFFSET)

#else /* !__ASSEMBLY */

# ifdef __KERNEL__

#  define STRICT_MM_TYPECHECKS



extern void clear_page (void *page);
@@ -174,7 +174,6 @@ get_order (unsigned long size) 
	return order;

}



# endif /* __KERNEL__ */

#endif /* !__ASSEMBLY__ */



#ifdef STRICT_MM_TYPECHECKS
@@ -228,4 +227,5 @@ get_order (unsigned long size) 
					 (((current->personality & READ_IMPLIES_EXEC) != 0)	\

					  ? VM_EXEC : 0))



# endif /* __KERNEL__ */

#endif /* _ASM_IA64_PAGE_H */

include/asm-ia64/ptrace.h

+7 −3
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 




#include <asm/fpu.h>



#ifdef __KERNEL__

#ifndef ASM_OFFSETS_C

#include <asm/asm-offsets.h>

#endif
@@ -79,10 +81,9 @@ 


#define KERNEL_STACK_SIZE		IA64_STK_OFFSET



#ifndef __ASSEMBLY__

#endif /* __KERNEL__ */



#include <asm/current.h>

#include <asm/page.h>

#ifndef __ASSEMBLY__



/*

 * This struct defines the way the registers are saved on system
@@ -229,6 +230,9 @@ struct switch_stack { 


#ifdef __KERNEL__



#include <asm/current.h>

#include <asm/page.h>



#define __ARCH_SYS_PTRACE	1



/*

include/asm-ia64/ustack.h

+5 −2
Original line number Diff line number Diff line
@@ -5,12 +5,15 @@ 
 * Constants for the user stack size

 */



#ifdef __KERNEL__

#include <asm/page.h>



/* 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)

/* Make a default stack size of 2GB */

#define DEFAULT_USER_STACK_SIZE	(1UL << 31)

#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 */