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

Commit c3762229 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files

[PATCH] Transform kmem_cache_alloc()+memset(0) -> kmem_cache_zalloc(). 



Replace appropriate pairs of "kmem_cache_alloc()" + "memset(0)" with the
corresponding "kmem_cache_zalloc()" call.

Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Roland McGrath <roland@redhat.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Jan Kara <jack@ucw.cz>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1b135431

arch/ia64/ia32/binfmt_elf32.c

+4 −9
Original line number Diff line number Diff line
@@ -91,9 +91,8 @@ ia64_elf32_init (struct pt_regs *regs) 
	 * it with privilege level 3 because the IVE uses non-privileged accesses to these

	 * tables.  IA-32 segmentation is used to protect against IA-32 accesses to them.

	 */

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (vma) {

		memset(vma, 0, sizeof(*vma));

		vma->vm_mm = current->mm;

		vma->vm_start = IA32_GDT_OFFSET;

		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -117,9 +116,8 @@ ia64_elf32_init (struct pt_regs *regs) 
	 * code is locked in specific gate page, which is pointed by pretcode

	 * when setup_frame_ia32

	 */

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (vma) {

		memset(vma, 0, sizeof(*vma));

		vma->vm_mm = current->mm;

		vma->vm_start = IA32_GATE_OFFSET;

		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -142,9 +140,8 @@ ia64_elf32_init (struct pt_regs *regs) 
	 * Install LDT as anonymous memory.  This gives us all-zero segment descriptors

	 * until a task modifies them via modify_ldt().

	 */

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (vma) {

		memset(vma, 0, sizeof(*vma));

		vma->vm_mm = current->mm;

		vma->vm_start = IA32_LDT_OFFSET;

		vma->vm_end = vma->vm_start + PAGE_ALIGN(IA32_LDT_ENTRIES*IA32_LDT_ENTRY_SIZE);
@@ -214,12 +211,10 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack) 
		bprm->loader += stack_base;

	bprm->exec += stack_base;



	mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	mpnt = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (!mpnt)

		return -ENOMEM;



	memset(mpnt, 0, sizeof(*mpnt));



	down_write(&current->mm->mmap_sem);

	{

		mpnt->vm_mm = current->mm;

arch/ia64/kernel/perfmon.c

+1 −2
Original line number Diff line number Diff line
@@ -2301,12 +2301,11 @@ pfm_smpl_buffer_alloc(struct task_struct *task, pfm_context_t *ctx, unsigned lon 
	DPRINT(("smpl_buf @%p\n", smpl_buf));



	/* allocate vma */

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (!vma) {

		DPRINT(("Cannot allocate vma\n"));

		goto error_kmem;

	}

	memset(vma, 0, sizeof(*vma));



	/*

	 * partially initialize the vma for the sampling buffer

arch/ia64/mm/init.c

+2 −4
Original line number Diff line number Diff line
@@ -176,9 +176,8 @@ ia64_init_addr_space (void) 
	 * the problem.  When the process attempts to write to the register backing store

	 * for the first time, it will get a SEGFAULT in this case.

	 */

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (vma) {

		memset(vma, 0, sizeof(*vma));

		vma->vm_mm = current->mm;

		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;

		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -195,9 +194,8 @@ ia64_init_addr_space (void) 


	/* map NaT-page at address zero to speed up speculative dereferencing of NULL: */

	if (!(current->personality & MMAP_PAGE_ZERO)) {

		vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

		vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

		if (vma) {

			memset(vma, 0, sizeof(*vma));

			vma->vm_mm = current->mm;

			vma->vm_end = PAGE_SIZE;

			vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);

arch/x86_64/ia32/ia32_binfmt.c

+1 −3
Original line number Diff line number Diff line
@@ -300,12 +300,10 @@ int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top, 
		bprm->loader += stack_base;

	bprm->exec += stack_base;



	mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	mpnt = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (!mpnt) 

		return -ENOMEM; 



	memset(mpnt, 0, sizeof(*mpnt));



	down_write(&mm->mmap_sem);

	{

		mpnt->vm_mm = mm;

drivers/infiniband/hw/ehca/ehca_cq.c

+1 −2
Original line number Diff line number Diff line
@@ -134,14 +134,13 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, 
	if (cqe >= 0xFFFFFFFF - 64 - additional_cqe)

		return ERR_PTR(-EINVAL);



	my_cq = kmem_cache_alloc(cq_cache, GFP_KERNEL);

	my_cq = kmem_cache_zalloc(cq_cache, GFP_KERNEL);

	if (!my_cq) {

		ehca_err(device, "Out of memory for ehca_cq struct device=%p",

			 device);

		return ERR_PTR(-ENOMEM);

	}



	memset(my_cq, 0, sizeof(struct ehca_cq));

	memset(&param, 0, sizeof(struct ehca_alloc_cq_parms));



	spin_lock_init(&my_cq->spinlock);