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

Commit 6e51c9ff authored by Zhang Yanfei's avatar Zhang Yanfei Committed by Jiri Kosina
Browse files

powerpc: remove cast for kmalloc/kzalloc return value 



remove cast for kmalloc/kzalloc return value.

Signed-off-by: default avatarZhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 9624e347

arch/powerpc/kernel/nvram_64.c

+1 −2
Original line number Diff line number Diff line
@@ -511,8 +511,7 @@ int __init nvram_scan_partitions(void) 
			       "detected: 0-length partition\n");

			goto out;

		}

		tmp_part = (struct nvram_partition *)

			kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);

		tmp_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);

		err = -ENOMEM;

		if (!tmp_part) {

			printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n");

arch/powerpc/kvm/book3s_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id) 
	if (!vcpu_book3s)

		goto out;



	vcpu_book3s->shadow_vcpu = (struct kvmppc_book3s_shadow_vcpu *)

	vcpu_book3s->shadow_vcpu =

		kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL);

	if (!vcpu_book3s->shadow_vcpu)

		goto free_vcpu;