tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[S390] appldata/extmem/kvm: add missing GFP_KERNEL flag

Add missing GFP flag to memory allocations. The part in cio only
changes a comment.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Heiko Carstens and committed by
Martin Schwidefsky c2f0e8c8 3975d167

+13 -12
+1 -1
arch/s390/appldata/appldata_os.c
··· 181 181 goto out; 182 182 } 183 183 184 - appldata_os_data = kzalloc(max_size, GFP_DMA); 184 + appldata_os_data = kzalloc(max_size, GFP_KERNEL | GFP_DMA); 185 185 if (appldata_os_data == NULL) { 186 186 rc = -ENOMEM; 187 187 goto out;
+1 -1
arch/s390/kvm/kvm-s390.c
··· 761 761 * to hold the maximum amount of facilites. On the other hand, we 762 762 * only set facilities that are known to work in KVM. 763 763 */ 764 - facilities = (unsigned long long *) get_zeroed_page(GFP_DMA); 764 + facilities = (unsigned long long *) get_zeroed_page(GFP_KERNEL|GFP_DMA); 765 765 if (!facilities) { 766 766 kvm_exit(); 767 767 return -ENOMEM;
+10 -9
arch/s390/mm/extmem.c
··· 105 105 dcss_set_subcodes(void) 106 106 { 107 107 #ifdef CONFIG_64BIT 108 - char *name = kmalloc(8 * sizeof(char), GFP_DMA); 108 + char *name = kmalloc(8 * sizeof(char), GFP_KERNEL | GFP_DMA); 109 109 unsigned long rx, ry; 110 110 int rc; 111 111 ··· 252 252 static int 253 253 query_segment_type (struct dcss_segment *seg) 254 254 { 255 - struct qin64 *qin = kmalloc (sizeof(struct qin64), GFP_DMA); 256 - struct qout64 *qout = kmalloc (sizeof(struct qout64), GFP_DMA); 257 - 258 - int diag_cc, rc, i; 259 255 unsigned long dummy, vmrc; 256 + int diag_cc, rc, i; 257 + struct qout64 *qout; 258 + struct qin64 *qin; 260 259 260 + qin = kmalloc(sizeof(*qin), GFP_KERNEL | GFP_DMA); 261 + qout = kmalloc(sizeof(*qout), GFP_KERNEL | GFP_DMA); 261 262 if ((qin == NULL) || (qout == NULL)) { 262 263 rc = -ENOMEM; 263 264 goto out_free; ··· 287 286 copy data for the new format. */ 288 287 if (segext_scode == DCSS_SEGEXT) { 289 288 struct qout64_old *qout_old; 290 - qout_old = kzalloc(sizeof(struct qout64_old), GFP_DMA); 289 + qout_old = kzalloc(sizeof(*qout_old), GFP_KERNEL | GFP_DMA); 291 290 if (qout_old == NULL) { 292 291 rc = -ENOMEM; 293 292 goto out_free; ··· 408 407 static int 409 408 __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long *end) 410 409 { 411 - struct dcss_segment *seg = kmalloc(sizeof(struct dcss_segment), 412 - GFP_DMA); 413 - int rc, diag_cc; 414 410 unsigned long start_addr, end_addr, dummy; 411 + struct dcss_segment *seg; 412 + int rc, diag_cc; 415 413 414 + seg = kmalloc(sizeof(*seg), GFP_KERNEL | GFP_DMA); 416 415 if (seg == NULL) { 417 416 rc = -ENOMEM; 418 417 goto out;
+1 -1
drivers/s390/cio/itcw.c
··· 42 42 * size_t size; 43 43 * 44 44 * size = itcw_calc_size(1, 2, 0); 45 - * buffer = kmalloc(size, GFP_DMA); 45 + * buffer = kmalloc(size, GFP_KERNEL | GFP_DMA); 46 46 * if (!buffer) 47 47 * return -ENOMEM; 48 48 * itcw = itcw_init(buffer, size, ITCW_OP_READ, 1, 2, 0);