Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2f0e8c8 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 3975d167

arch/s390/appldata/appldata_os.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int __init appldata_os_init(void) 
		goto out;

	}



	appldata_os_data = kzalloc(max_size, GFP_DMA);

	appldata_os_data = kzalloc(max_size, GFP_KERNEL | GFP_DMA);

	if (appldata_os_data == NULL) {

		rc = -ENOMEM;

		goto out;

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static int __init kvm_s390_init(void) 
	 * to hold the maximum amount of facilites. On the other hand, we

	 * only set facilities that are known to work in KVM.

	 */

	facilities = (unsigned long long *) get_zeroed_page(GFP_DMA);

	facilities = (unsigned long long *) get_zeroed_page(GFP_KERNEL|GFP_DMA);

	if (!facilities) {

		kvm_exit();

		return -ENOMEM;

arch/s390/mm/extmem.c

+10 −9
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int 
dcss_set_subcodes(void)

{

#ifdef CONFIG_64BIT

	char *name = kmalloc(8 * sizeof(char), GFP_DMA);

	char *name = kmalloc(8 * sizeof(char), GFP_KERNEL | GFP_DMA);

	unsigned long rx, ry;

	int rc;
@@ -252,12 +252,13 @@ dcss_diag_translate_rc (int vm_rc) { 
static int

query_segment_type (struct dcss_segment *seg)

{

	struct qin64  *qin = kmalloc (sizeof(struct qin64), GFP_DMA);

	struct qout64 *qout = kmalloc (sizeof(struct qout64), GFP_DMA);



	int diag_cc, rc, i;

	unsigned long dummy, vmrc;

	int diag_cc, rc, i;

	struct qout64 *qout;

	struct qin64 *qin;



	qin = kmalloc(sizeof(*qin), GFP_KERNEL | GFP_DMA);

	qout = kmalloc(sizeof(*qout), GFP_KERNEL | GFP_DMA);

	if ((qin == NULL) || (qout == NULL)) {

		rc = -ENOMEM;

		goto out_free;
@@ -286,7 +287,7 @@ query_segment_type (struct dcss_segment *seg) 
	   copy data for the new format. */

	if (segext_scode == DCSS_SEGEXT) {

		struct qout64_old *qout_old;

		qout_old = kzalloc(sizeof(struct qout64_old), GFP_DMA);

		qout_old = kzalloc(sizeof(*qout_old), GFP_KERNEL | GFP_DMA);

		if (qout_old == NULL) {

			rc = -ENOMEM;

			goto out_free;
@@ -407,11 +408,11 @@ segment_overlaps_others (struct dcss_segment *seg) 
static int

__segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long *end)

{

	struct dcss_segment *seg = kmalloc(sizeof(struct dcss_segment),

			GFP_DMA);

	int rc, diag_cc;

	unsigned long start_addr, end_addr, dummy;

	struct dcss_segment *seg;

	int rc, diag_cc;



	seg = kmalloc(sizeof(*seg), GFP_KERNEL | GFP_DMA);

	if (seg == NULL) {

		rc = -ENOMEM;

		goto out;

drivers/s390/cio/itcw.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
 * size_t size;

 *

 * size = itcw_calc_size(1, 2, 0);

 * buffer = kmalloc(size, GFP_DMA);

 * buffer = kmalloc(size, GFP_KERNEL | GFP_DMA);

 * if (!buffer)

 *	return -ENOMEM;

 * itcw = itcw_init(buffer, size, ITCW_OP_READ, 1, 2, 0);