diff options
Diffstat (limited to 'arch/s390/include/asm/idals.h')
-rw-r--r-- | arch/s390/include/asm/idals.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/s390/include/asm/idals.h b/arch/s390/include/asm/idals.h index ea5a6e45fd93..a7b2d7504049 100644 --- a/arch/s390/include/asm/idals.h +++ b/arch/s390/include/asm/idals.h | |||
@@ -19,11 +19,7 @@ | |||
19 | #include <asm/cio.h> | 19 | #include <asm/cio.h> |
20 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
21 | 21 | ||
22 | #ifdef CONFIG_64BIT | ||
23 | #define IDA_SIZE_LOG 12 /* 11 for 2k , 12 for 4k */ | 22 | #define IDA_SIZE_LOG 12 /* 11 for 2k , 12 for 4k */ |
24 | #else | ||
25 | #define IDA_SIZE_LOG 11 /* 11 for 2k , 12 for 4k */ | ||
26 | #endif | ||
27 | #define IDA_BLOCK_SIZE (1L<<IDA_SIZE_LOG) | 23 | #define IDA_BLOCK_SIZE (1L<<IDA_SIZE_LOG) |
28 | 24 | ||
29 | /* | 25 | /* |
@@ -32,11 +28,7 @@ | |||
32 | static inline int | 28 | static inline int |
33 | idal_is_needed(void *vaddr, unsigned int length) | 29 | idal_is_needed(void *vaddr, unsigned int length) |
34 | { | 30 | { |
35 | #ifdef CONFIG_64BIT | ||
36 | return ((__pa(vaddr) + length - 1) >> 31) != 0; | 31 | return ((__pa(vaddr) + length - 1) >> 31) != 0; |
37 | #else | ||
38 | return 0; | ||
39 | #endif | ||
40 | } | 32 | } |
41 | 33 | ||
42 | 34 | ||
@@ -77,7 +69,6 @@ static inline unsigned long *idal_create_words(unsigned long *idaws, | |||
77 | static inline int | 69 | static inline int |
78 | set_normalized_cda(struct ccw1 * ccw, void *vaddr) | 70 | set_normalized_cda(struct ccw1 * ccw, void *vaddr) |
79 | { | 71 | { |
80 | #ifdef CONFIG_64BIT | ||
81 | unsigned int nridaws; | 72 | unsigned int nridaws; |
82 | unsigned long *idal; | 73 | unsigned long *idal; |
83 | 74 | ||
@@ -93,7 +84,6 @@ set_normalized_cda(struct ccw1 * ccw, void *vaddr) | |||
93 | ccw->flags |= CCW_FLAG_IDA; | 84 | ccw->flags |= CCW_FLAG_IDA; |
94 | vaddr = idal; | 85 | vaddr = idal; |
95 | } | 86 | } |
96 | #endif | ||
97 | ccw->cda = (__u32)(unsigned long) vaddr; | 87 | ccw->cda = (__u32)(unsigned long) vaddr; |
98 | return 0; | 88 | return 0; |
99 | } | 89 | } |
@@ -104,12 +94,10 @@ set_normalized_cda(struct ccw1 * ccw, void *vaddr) | |||
104 | static inline void | 94 | static inline void |
105 | clear_normalized_cda(struct ccw1 * ccw) | 95 | clear_normalized_cda(struct ccw1 * ccw) |
106 | { | 96 | { |
107 | #ifdef CONFIG_64BIT | ||
108 | if (ccw->flags & CCW_FLAG_IDA) { | 97 | if (ccw->flags & CCW_FLAG_IDA) { |
109 | kfree((void *)(unsigned long) ccw->cda); | 98 | kfree((void *)(unsigned long) ccw->cda); |
110 | ccw->flags &= ~CCW_FLAG_IDA; | 99 | ccw->flags &= ~CCW_FLAG_IDA; |
111 | } | 100 | } |
112 | #endif | ||
113 | ccw->cda = 0; | 101 | ccw->cda = 0; |
114 | } | 102 | } |
115 | 103 | ||
@@ -181,12 +169,8 @@ idal_buffer_free(struct idal_buffer *ib) | |||
181 | static inline int | 169 | static inline int |
182 | __idal_buffer_is_needed(struct idal_buffer *ib) | 170 | __idal_buffer_is_needed(struct idal_buffer *ib) |
183 | { | 171 | { |
184 | #ifdef CONFIG_64BIT | ||
185 | return ib->size > (4096ul << ib->page_order) || | 172 | return ib->size > (4096ul << ib->page_order) || |
186 | idal_is_needed(ib->data[0], ib->size); | 173 | idal_is_needed(ib->data[0], ib->size); |
187 | #else | ||
188 | return ib->size > (4096ul << ib->page_order); | ||
189 | #endif | ||
190 | } | 174 | } |
191 | 175 | ||
192 | /* | 176 | /* |