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

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

[PATCH] Get rid of "double zeroing" of allocated pages 



Simplify the few instances where a call to "get_zeroed_page()" is closely
followed by an unnecessary call to memset() to clear that page.

Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Cc: chas williams <chas@cmf.nrl.navy.mil>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 78ba2faf

drivers/atm/eni.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -912,7 +912,6 @@ static int start_rx(struct atm_dev *dev) 
		free_page((unsigned long) eni_dev->free_list);

		free_page((unsigned long) eni_dev->free_list);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	memset(eni_dev->rx_map,0,PAGE_SIZE);

	eni_dev->rx_mult = DEFAULT_RX_MULT;

	eni_dev->rx_mult = DEFAULT_RX_MULT;

	eni_dev->fast = eni_dev->last_fast = NULL;

	eni_dev->fast = eni_dev->last_fast = NULL;

	eni_dev->slow = eni_dev->last_slow = NULL;

	eni_dev->slow = eni_dev->last_slow = NULL;

drivers/media/video/zoran_driver.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -562,7 +562,6 @@ jpg_fbuffer_alloc (struct file *file) 
			jpg_fbuffer_free(file);

			jpg_fbuffer_free(file);

			return -ENOBUFS;

			return -ENOBUFS;

		}

		}

		memset((void *) mem, 0, PAGE_SIZE);

		fh->jpg_buffers.buffer[i].frag_tab = (u32 *) mem;

		fh->jpg_buffers.buffer[i].frag_tab = (u32 *) mem;

		fh->jpg_buffers.buffer[i].frag_tab_bus =

		fh->jpg_buffers.buffer[i].frag_tab_bus =

		    virt_to_bus((void *) mem);

		    virt_to_bus((void *) mem);

drivers/scsi/53c7xx.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -3099,7 +3099,6 @@ allocate_cmd (Scsi_Cmnd *cmd) { 
        real = get_zeroed_page(GFP_ATOMIC);

        real = get_zeroed_page(GFP_ATOMIC);

        if (real == 0)

        if (real == 0)

        	return NULL;

        	return NULL;

        memset((void *)real, 0, 4096);

        cache_push(virt_to_phys((void *)real), 4096);

        cache_push(virt_to_phys((void *)real), 4096);

        cache_clear(virt_to_phys((void *)real), 4096);

        cache_clear(virt_to_phys((void *)real), 4096);

        kernel_set_cachemode((void *)real, 4096, IOMAP_NOCACHE_SER);

        kernel_set_cachemode((void *)real, 4096, IOMAP_NOCACHE_SER);