Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d5759641f5809b19bad4e2af6ca97b830545aaba

Authored by David Woodhouse
Committed by Linus Torvalds
1 parent 124b51c7a8
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: 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>

Showing 4 changed files with 15 additions and 8 deletions Side-by-side Diff

include/asm-ia64/Kbuild
Diff comments   View file @ d575964
... ... @@ -4,5 +4,5 @@
4 4 intel_intrin.h intrinsics.h perfmon_default_smpl.h \
5 5 ptrace_offsets.h rse.h setup.h ucontext.h
6 6  
7   -unifdef-y += perfmon.h
  7 +unifdef-y += perfmon.h ustack.h
include/asm-ia64/page.h
Diff comments   View file @ d575964
... ... @@ -7,6 +7,7 @@
7 7 * David Mosberger-Tang <davidm@hpl.hp.com>
8 8 */
9 9  
  10 +# ifdef __KERNEL__
10 11  
11 12 #include <asm/intrinsics.h>
12 13 #include <asm/types.h>
... ... @@ -64,7 +65,6 @@
64 65 # define __pa(x) ((x) - PAGE_OFFSET)
65 66 # define __va(x) ((x) + PAGE_OFFSET)
66 67 #else /* !__ASSEMBLY */
67   -# ifdef __KERNEL__
68 68 # define STRICT_MM_TYPECHECKS
69 69  
70 70 extern void clear_page (void *page);
... ... @@ -174,7 +174,6 @@
174 174 return order;
175 175 }
176 176  
177   -# endif /* __KERNEL__ */
178 177 #endif /* !__ASSEMBLY__ */
179 178  
180 179 #ifdef STRICT_MM_TYPECHECKS
... ... @@ -228,5 +227,6 @@
228 227 (((current->personality & READ_IMPLIES_EXEC) != 0) \
229 228 ? VM_EXEC : 0))
230 229  
  230 +# endif /* __KERNEL__ */
231 231 #endif /* _ASM_IA64_PAGE_H */
include/asm-ia64/ptrace.h
Diff comments   View file @ d575964
... ... @@ -56,6 +56,8 @@
56 56  
57 57  
58 58 #include <asm/fpu.h>
  59 +
  60 +#ifdef __KERNEL__
59 61 #ifndef ASM_OFFSETS_C
60 62 #include <asm/asm-offsets.h>
61 63 #endif
62 64  
... ... @@ -79,11 +81,10 @@
79 81  
80 82 #define KERNEL_STACK_SIZE IA64_STK_OFFSET
81 83  
  84 +#endif /* __KERNEL__ */
  85 +
82 86 #ifndef __ASSEMBLY__
83 87  
84   -#include <asm/current.h>
85   -#include <asm/page.h>
86   -
87 88 /*
88 89 * This struct defines the way the registers are saved on system
89 90 * calls.
... ... @@ -228,6 +229,9 @@
228 229 };
229 230  
230 231 #ifdef __KERNEL__
  232 +
  233 +#include <asm/current.h>
  234 +#include <asm/page.h>
231 235  
232 236 #define __ARCH_SYS_PTRACE 1
233 237  
include/asm-ia64/ustack.h
Diff comments   View file @ d575964
... ... @@ -5,13 +5,16 @@
5 5 * Constants for the user stack size
6 6 */
7 7  
  8 +#ifdef __KERNEL__
8 9 #include <asm/page.h>
9 10  
10 11 /* The absolute hard limit for stack size is 1/2 of the mappable space in the region */
11 12 #define MAX_USER_STACK_SIZE (RGN_MAP_LIMIT/2)
12   -/* Make a default stack size of 2GB */
13   -#define DEFAULT_USER_STACK_SIZE (1UL << 31)
14 13 #define STACK_TOP (0x6000000000000000UL + RGN_MAP_LIMIT)
  14 +#endif
  15 +
  16 +/* Make a default stack size of 2GiB */
  17 +#define DEFAULT_USER_STACK_SIZE (1UL << 31)
15 18  
16 19 #endif /* _ASM_IA64_USTACK_H */