diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/debug.c | 8 | ||||
-rw-r--r-- | arch/s390/kernel/s390_ext.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index ef5266fbce62..bb57bc0e3fc8 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
@@ -191,13 +191,13 @@ debug_areas_alloc(int pages_per_area, int nr_areas) | |||
191 | debug_entry_t*** areas; | 191 | debug_entry_t*** areas; |
192 | int i,j; | 192 | int i,j; |
193 | 193 | ||
194 | areas = (debug_entry_t ***) kmalloc(nr_areas * | 194 | areas = kmalloc(nr_areas * |
195 | sizeof(debug_entry_t**), | 195 | sizeof(debug_entry_t**), |
196 | GFP_KERNEL); | 196 | GFP_KERNEL); |
197 | if (!areas) | 197 | if (!areas) |
198 | goto fail_malloc_areas; | 198 | goto fail_malloc_areas; |
199 | for (i = 0; i < nr_areas; i++) { | 199 | for (i = 0; i < nr_areas; i++) { |
200 | areas[i] = (debug_entry_t**) kmalloc(pages_per_area * | 200 | areas[i] = kmalloc(pages_per_area * |
201 | sizeof(debug_entry_t*),GFP_KERNEL); | 201 | sizeof(debug_entry_t*),GFP_KERNEL); |
202 | if (!areas[i]) { | 202 | if (!areas[i]) { |
203 | goto fail_malloc_areas2; | 203 | goto fail_malloc_areas2; |
@@ -242,7 +242,7 @@ debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size, | |||
242 | 242 | ||
243 | /* alloc everything */ | 243 | /* alloc everything */ |
244 | 244 | ||
245 | rc = (debug_info_t*) kmalloc(sizeof(debug_info_t), GFP_KERNEL); | 245 | rc = kmalloc(sizeof(debug_info_t), GFP_KERNEL); |
246 | if(!rc) | 246 | if(!rc) |
247 | goto fail_malloc_rc; | 247 | goto fail_malloc_rc; |
248 | rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL); | 248 | rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL); |
@@ -634,7 +634,7 @@ found: | |||
634 | rc = -ENOMEM; | 634 | rc = -ENOMEM; |
635 | goto out; | 635 | goto out; |
636 | } | 636 | } |
637 | p_info = (file_private_info_t *) kmalloc(sizeof(file_private_info_t), | 637 | p_info = kmalloc(sizeof(file_private_info_t), |
638 | GFP_KERNEL); | 638 | GFP_KERNEL); |
639 | if(!p_info){ | 639 | if(!p_info){ |
640 | if(debug_info_snapshot) | 640 | if(debug_info_snapshot) |
diff --git a/arch/s390/kernel/s390_ext.c b/arch/s390/kernel/s390_ext.c index 4faf96f8a834..bc5beaa8f98e 100644 --- a/arch/s390/kernel/s390_ext.c +++ b/arch/s390/kernel/s390_ext.c | |||
@@ -37,7 +37,7 @@ int register_external_interrupt(__u16 code, ext_int_handler_t handler) | |||
37 | ext_int_info_t *p; | 37 | ext_int_info_t *p; |
38 | int index; | 38 | int index; |
39 | 39 | ||
40 | p = (ext_int_info_t *) kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC); | 40 | p = kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC); |
41 | if (p == NULL) | 41 | if (p == NULL) |
42 | return -ENOMEM; | 42 | return -ENOMEM; |
43 | p->code = code; | 43 | p->code = code; |