aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/idals.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390/include/asm/idals.h')
-rw-r--r--arch/s390/include/asm/idals.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/include/asm/idals.h b/arch/s390/include/asm/idals.h
index aae276d00383..aef0dde340d1 100644
--- a/arch/s390/include/asm/idals.h
+++ b/arch/s390/include/asm/idals.h
@@ -20,7 +20,7 @@
20#include <asm/cio.h> 20#include <asm/cio.h>
21#include <asm/uaccess.h> 21#include <asm/uaccess.h>
22 22
23#ifdef __s390x__ 23#ifdef CONFIG_64BIT
24#define IDA_SIZE_LOG 12 /* 11 for 2k , 12 for 4k */ 24#define IDA_SIZE_LOG 12 /* 11 for 2k , 12 for 4k */
25#else 25#else
26#define IDA_SIZE_LOG 11 /* 11 for 2k , 12 for 4k */ 26#define IDA_SIZE_LOG 11 /* 11 for 2k , 12 for 4k */
@@ -33,7 +33,7 @@
33static inline int 33static inline int
34idal_is_needed(void *vaddr, unsigned int length) 34idal_is_needed(void *vaddr, unsigned int length)
35{ 35{
36#ifdef __s390x__ 36#ifdef CONFIG_64BIT
37 return ((__pa(vaddr) + length - 1) >> 31) != 0; 37 return ((__pa(vaddr) + length - 1) >> 31) != 0;
38#else 38#else
39 return 0; 39 return 0;
@@ -78,7 +78,7 @@ static inline unsigned long *idal_create_words(unsigned long *idaws,
78static inline int 78static inline int
79set_normalized_cda(struct ccw1 * ccw, void *vaddr) 79set_normalized_cda(struct ccw1 * ccw, void *vaddr)
80{ 80{
81#ifdef __s390x__ 81#ifdef CONFIG_64BIT
82 unsigned int nridaws; 82 unsigned int nridaws;
83 unsigned long *idal; 83 unsigned long *idal;
84 84
@@ -105,7 +105,7 @@ set_normalized_cda(struct ccw1 * ccw, void *vaddr)
105static inline void 105static inline void
106clear_normalized_cda(struct ccw1 * ccw) 106clear_normalized_cda(struct ccw1 * ccw)
107{ 107{
108#ifdef __s390x__ 108#ifdef CONFIG_64BIT
109 if (ccw->flags & CCW_FLAG_IDA) { 109 if (ccw->flags & CCW_FLAG_IDA) {
110 kfree((void *)(unsigned long) ccw->cda); 110 kfree((void *)(unsigned long) ccw->cda);
111 ccw->flags &= ~CCW_FLAG_IDA; 111 ccw->flags &= ~CCW_FLAG_IDA;
@@ -182,7 +182,7 @@ idal_buffer_free(struct idal_buffer *ib)
182static inline int 182static inline int
183__idal_buffer_is_needed(struct idal_buffer *ib) 183__idal_buffer_is_needed(struct idal_buffer *ib)
184{ 184{
185#ifdef __s390x__ 185#ifdef CONFIG_64BIT
186 return ib->size > (4096ul << ib->page_order) || 186 return ib->size > (4096ul << ib->page_order) ||
187 idal_is_needed(ib->data[0], ib->size); 187 idal_is_needed(ib->data[0], ib->size);
188#else 188#else