[PATCH] i386: replace kmalloc+memset with kzalloc (116780fc) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/i386/kernel/cpu/intel_cacheinfo.c

+3 −8

Original line number	Original line	Diff line number	Diff line
	@@ -480,12 +480,10 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
	if (num_cache_leaves == 0)		if (num_cache_leaves == 0)
	return -ENOENT;		return -ENOENT;

	cpuid4_info[cpu] = kmalloc(		cpuid4_info[cpu] = kzalloc(
	sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL);		sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL);
	if (unlikely(cpuid4_info[cpu] == NULL))		if (unlikely(cpuid4_info[cpu] == NULL))
	return -ENOMEM;		return -ENOMEM;
	memset(cpuid4_info[cpu], 0,
	sizeof(struct _cpuid4_info) * num_cache_leaves);

	oldmask = current->cpus_allowed;		oldmask = current->cpus_allowed;
	retval = set_cpus_allowed(current, cpumask_of_cpu(cpu));		retval = set_cpus_allowed(current, cpumask_of_cpu(cpu));
	@@ -658,17 +656,14 @@ static int __cpuinit cpuid4_cache_sysfs_init(unsigned int cpu)
	return -ENOENT;		return -ENOENT;

	/* Allocate all required memory */		/* Allocate all required memory */
	cache_kobject[cpu] = kmalloc(sizeof(struct kobject), GFP_KERNEL);		cache_kobject[cpu] = kzalloc(sizeof(struct kobject), GFP_KERNEL);
	if (unlikely(cache_kobject[cpu] == NULL))		if (unlikely(cache_kobject[cpu] == NULL))
	goto err_out;		goto err_out;
	memset(cache_kobject[cpu], 0, sizeof(struct kobject));

	index_kobject[cpu] = kmalloc(		index_kobject[cpu] = kzalloc(
	sizeof(struct _index_kobject ) * num_cache_leaves, GFP_KERNEL);		sizeof(struct _index_kobject ) * num_cache_leaves, GFP_KERNEL);
	if (unlikely(index_kobject[cpu] == NULL))		if (unlikely(index_kobject[cpu] == NULL))
	goto err_out;		goto err_out;
	memset(index_kobject[cpu], 0,
	sizeof(struct _index_kobject) * num_cache_leaves);

	return 0;		return 0;

arch/i386/kernel/mca.c

+4 −9

Original line number	Original line	Diff line number	Diff line
	@@ -283,10 +283,9 @@ static int __init mca_init(void)
	bus->f.mca_transform_memory = mca_dummy_transform_memory;		bus->f.mca_transform_memory = mca_dummy_transform_memory;

	/* get the motherboard device */		/* get the motherboard device */
	mca_dev = kmalloc(sizeof(struct mca_device), GFP_KERNEL);		mca_dev = kzalloc(sizeof(struct mca_device), GFP_KERNEL);
	if(unlikely(!mca_dev))		if(unlikely(!mca_dev))
	goto out_nomem;		goto out_nomem;
	memset(mca_dev, 0, sizeof(struct mca_device));

	/*		/*
	* We do not expect many MCA interrupts during initialization,		* We do not expect many MCA interrupts during initialization,
	@@ -310,11 +309,9 @@ static int __init mca_init(void)
	mca_dev->slot = MCA_MOTHERBOARD;		mca_dev->slot = MCA_MOTHERBOARD;
	mca_register_device(MCA_PRIMARY_BUS, mca_dev);		mca_register_device(MCA_PRIMARY_BUS, mca_dev);

	mca_dev = kmalloc(sizeof(struct mca_device), GFP_ATOMIC);		mca_dev = kzalloc(sizeof(struct mca_device), GFP_ATOMIC);
	if(unlikely(!mca_dev))		if(unlikely(!mca_dev))
	goto out_unlock_nomem;		goto out_unlock_nomem;
	memset(mca_dev, 0, sizeof(struct mca_device));


	/* Put motherboard into video setup mode, read integrated video		/* Put motherboard into video setup mode, read integrated video
	* POS registers, and turn motherboard setup off.		* POS registers, and turn motherboard setup off.
	@@ -349,10 +346,9 @@ static int __init mca_init(void)
	}		}
	if(which_scsi) {		if(which_scsi) {
	/* found a scsi card */		/* found a scsi card */
	mca_dev = kmalloc(sizeof(struct mca_device), GFP_ATOMIC);		mca_dev = kzalloc(sizeof(struct mca_device), GFP_ATOMIC);
	if(unlikely(!mca_dev))		if(unlikely(!mca_dev))
	goto out_unlock_nomem;		goto out_unlock_nomem;
	memset(mca_dev, 0, sizeof(struct mca_device));

	for(j = 0; j < 8; j++)		for(j = 0; j < 8; j++)
	mca_dev->pos[j] = pos[j];		mca_dev->pos[j] = pos[j];
	@@ -378,10 +374,9 @@ static int __init mca_init(void)
	if(!mca_read_and_store_pos(pos))		if(!mca_read_and_store_pos(pos))
	continue;		continue;

	mca_dev = kmalloc(sizeof(struct mca_device), GFP_ATOMIC);		mca_dev = kzalloc(sizeof(struct mca_device), GFP_ATOMIC);
	if(unlikely(!mca_dev))		if(unlikely(!mca_dev))
	goto out_unlock_nomem;		goto out_unlock_nomem;
	memset(mca_dev, 0, sizeof(struct mca_device));

	for(j=0; j<8; j++)		for(j=0; j<8; j++)
	mca_dev->pos[j]=pos[j];		mca_dev->pos[j]=pos[j];

arch/i386/kernel/pci-dma.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -92,14 +92,12 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
	if (!mem_base)		if (!mem_base)
	goto out;		goto out;

	dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);		dev->dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
	if (!dev->dma_mem)		if (!dev->dma_mem)
	goto out;		goto out;
	memset(dev->dma_mem, 0, sizeof(struct dma_coherent_mem));		dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
	dev->dma_mem->bitmap = kmalloc(bitmap_size, GFP_KERNEL);
	if (!dev->dma_mem->bitmap)		if (!dev->dma_mem->bitmap)
	goto free1_out;		goto free1_out;
	memset(dev->dma_mem->bitmap, 0, bitmap_size);

	dev->dma_mem->virt_base = mem_base;		dev->dma_mem->virt_base = mem_base;
	dev->dma_mem->device_base = device_addr;		dev->dma_mem->device_base = device_addr;

arch/i386/mach-voyager/voyager_cat.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -776,7 +776,7 @@ voyager_cat_init(void)
	for(asic=0; asic < (*modpp)->num_asics; asic++) {		for(asic=0; asic < (*modpp)->num_asics; asic++) {
	int j;		int j;
	voyager_asic_t asicp = asicpp		voyager_asic_t asicp = asicpp
	= kmalloc(sizeof(voyager_asic_t), GFP_KERNEL); /&voyager_asic_storage[asic_count++];/		= kzalloc(sizeof(voyager_asic_t), GFP_KERNEL); /&voyager_asic_storage[asic_count++];/
	voyager_sp_table_t *sp_table;		voyager_sp_table_t *sp_table;
	voyager_at_t *asic_table;		voyager_at_t *asic_table;
	voyager_jtt_t *jtag_table;		voyager_jtt_t *jtag_table;
	@@ -785,7 +785,6 @@ voyager_cat_init(void)
	printk("WARNING kmalloc failure in cat_init\n");		printk("WARNING kmalloc failure in cat_init\n");
	continue;		continue;
	}		}
	memset(asicp, 0, sizeof(voyager_asic_t));
	asicpp = &(asicp->next);		asicpp = &(asicp->next);
	asicp->asic_location = asic;		asicp->asic_location = asic;
	sp_table = (voyager_sp_table_t *)(eprom_buf + sp_offset);		sp_table = (voyager_sp_table_t *)(eprom_buf + sp_offset);
	@@ -851,8 +850,7 @@ voyager_cat_init(void)
	#endif		#endif

	{		{
	struct resource *res = kmalloc(sizeof(struct resource),GFP_KERNEL);		struct resource *res = kzalloc(sizeof(struct resource),GFP_KERNEL);
	memset(res, 0, sizeof(struct resource));
	res->name = kmalloc(128, GFP_KERNEL);		res->name = kmalloc(128, GFP_KERNEL);
	sprintf((char *)res->name, "Voyager %s Quad CPI", cat_module_name(i));		sprintf((char *)res->name, "Voyager %s Quad CPI", cat_module_name(i));
	res->start = qic_addr;		res->start = qic_addr;

include/asm-i386/thread_info.h

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -95,15 +95,7 @@ static inline struct thread_info *current_thread_info(void)

	/* thread information allocation */		/* thread information allocation */
	#ifdef CONFIG_DEBUG_STACK_USAGE		#ifdef CONFIG_DEBUG_STACK_USAGE
	#define alloc_thread_info(tsk) \		#define alloc_thread_info(tsk) kzalloc(THREAD_SIZE, GFP_KERNEL)
	({ \
	struct thread_info *ret; \
	\
	ret = kmalloc(THREAD_SIZE, GFP_KERNEL); \
	if (ret) \
	memset(ret, 0, THREAD_SIZE); \
	ret; \
	})
	#else		#else
	#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)		#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)
	#endif		#endif