aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-04-26 23:47:10 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-26 23:47:10 -0400
commit274f5946dcb7c970455067be9e13a22174787592 (patch)
tree6f6929a35540273c90730f77c07eed827ae89728 /include
parentb7b3c76a0a21c5a98124e90c47c488f7e4166f87 (diff)
Don't include implementation details from asm-s390/ptrace.h and page.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-s390/page.h6
-rw-r--r--include/asm-s390/ptrace.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h
index 3b1138ac7e79..b2628dc5c490 100644
--- a/include/asm-s390/page.h
+++ b/include/asm-s390/page.h
@@ -9,7 +9,6 @@
9#ifndef _S390_PAGE_H 9#ifndef _S390_PAGE_H
10#define _S390_PAGE_H 10#define _S390_PAGE_H
11 11
12#include <asm/setup.h>
13#include <asm/types.h> 12#include <asm/types.h>
14 13
15/* PAGE_SHIFT determines the page size */ 14/* PAGE_SHIFT determines the page size */
@@ -20,6 +19,7 @@
20#define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4) 19#define PAGE_DEFAULT_KEY (PAGE_DEFAULT_ACC << 4)
21 20
22#ifdef __KERNEL__ 21#ifdef __KERNEL__
22#include <asm/setup.h>
23#ifndef __ASSEMBLY__ 23#ifndef __ASSEMBLY__
24 24
25#ifndef __s390x__ 25#ifndef __s390x__
@@ -189,9 +189,9 @@ page_get_storage_key(unsigned long addr)
189#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ 189#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
190 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) 190 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
191 191
192#endif /* __KERNEL__ */
193
194#include <asm-generic/memory_model.h> 192#include <asm-generic/memory_model.h>
195#include <asm-generic/page.h> 193#include <asm-generic/page.h>
196 194
195#endif /* __KERNEL__ */
196
197#endif /* _S390_PAGE_H */ 197#endif /* _S390_PAGE_H */
diff --git a/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h
index a867e94ae484..4d75d77b0f99 100644
--- a/include/asm-s390/ptrace.h
+++ b/include/asm-s390/ptrace.h
@@ -183,8 +183,6 @@
183#ifndef __ASSEMBLY__ 183#ifndef __ASSEMBLY__
184#include <linux/stddef.h> 184#include <linux/stddef.h>
185#include <linux/types.h> 185#include <linux/types.h>
186#include <asm/setup.h>
187#include <asm/page.h>
188 186
189typedef union 187typedef union
190{ 188{
@@ -300,6 +298,9 @@ typedef struct
300} s390_regs; 298} s390_regs;
301 299
302#ifdef __KERNEL__ 300#ifdef __KERNEL__
301#include <asm/setup.h>
302#include <asm/page.h>
303
303/* 304/*
304 * The pt_regs struct defines the way the registers are stored on 305 * The pt_regs struct defines the way the registers are stored on
305 * the stack during a system call. 306 * the stack during a system call.