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

Commit c9cf5528 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

[PATCH] add poison.h and patch primary users 



Localize poison values into one header file for better documentation and
easier/quicker debugging and so that the same values won't be used for
multiple purposes.

Use these constants in core arch., mm, driver, and fs code.

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Acked-by: default avatarMatt Mackall <mpm@selenic.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e6e5494c

arch/i386/mm/init.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/init.h>

#include <linux/highmem.h>

#include <linux/pagemap.h>

#include <linux/poison.h>

#include <linux/bootmem.h>

#include <linux/slab.h>

#include <linux/proc_fs.h>
@@ -753,7 +754,7 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) 
	for (addr = begin; addr < end; addr += PAGE_SIZE) {

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		memset((void *)addr, 0xcc, PAGE_SIZE);

		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);

		free_page(addr);

		totalram_pages++;

	}

arch/powerpc/mm/init_64.c

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/idr.h>

#include <linux/nodemask.h>

#include <linux/module.h>

#include <linux/poison.h>



#include <asm/pgalloc.h>

#include <asm/page.h>
@@ -90,7 +91,7 @@ void free_initmem(void) 


	addr = (unsigned long)__init_begin;

	for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {

		memset((void *)addr, 0xcc, PAGE_SIZE);

		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		free_page(addr);

arch/sparc64/mm/init.c

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/initrd.h>

#include <linux/swap.h>

#include <linux/pagemap.h>

#include <linux/poison.h>

#include <linux/fs.h>

#include <linux/seq_file.h>

#include <linux/kprobes.h>
@@ -1520,7 +1521,7 @@ void free_initmem(void) 
		page = (addr +

			((unsigned long) __va(kern_base)) -

			((unsigned long) KERNBASE));

		memset((void *)addr, 0xcc, PAGE_SIZE);

		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);

		p = virt_to_page(page);



		ClearPageReserved(p);

arch/x86_64/mm/init.c

+5 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/bootmem.h>

#include <linux/proc_fs.h>

#include <linux/pci.h>

#include <linux/poison.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>

#include <linux/memory_hotplug.h>
@@ -660,7 +661,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) 
	for (addr = begin; addr < end; addr += PAGE_SIZE) {

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE); 

		memset((void *)(addr & ~(PAGE_SIZE-1)),

			POISON_FREE_INITMEM, PAGE_SIZE);

		free_page(addr);

		totalram_pages++;

	}
@@ -668,7 +670,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) 


void free_initmem(void)

{

	memset(__initdata_begin, 0xba, __initdata_end - __initdata_begin);

	memset(__initdata_begin, POISON_FREE_INITDATA,

		__initdata_end - __initdata_begin);

	free_init_pages("unused kernel memory",

			(unsigned long)(&__init_begin),

			(unsigned long)(&__init_end));

drivers/base/dmapool.c

+1 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/dmapool.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/poison.h>



/*

 * Pool allocator ... wraps the dma_alloc_coherent page allocator, so
@@ -35,8 +36,6 @@ struct dma_page { /* cacheable header for 'allocation' bytes */ 
};



#define	POOL_TIMEOUT_JIFFIES	((100 /* msec */ * HZ) / 1000)

#define	POOL_POISON_FREED	0xa7	/* !inuse */

#define	POOL_POISON_ALLOCATED	0xa9	/* !initted */



static DECLARE_MUTEX (pools_lock);