Skip to content

Commit

Permalink
Blackfin: drop unused bad_page pages and move zero_page to the bss
Browse files Browse the repository at this point in the history
The empty_bad_page/empty_bad_page_table pages are unused, so punt them.
The zero_page is always allocated, so push it out to the bss to speed up
the booting process a bit and pack data nicer.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  • Loading branch information
Mike Frysinger committed May 21, 2010
1 parent 7a9b149 commit f074e48
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 26 deletions.
3 changes: 2 additions & 1 deletion arch/blackfin/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ PTE_BIT_FUNC(mkyoung, |= _PAGE_ACCESSED);
* ZERO_PAGE is a global shared page that is always zero: used
* for zero-mapped memory areas etc..
*/
#define ZERO_PAGE(vaddr) (virt_to_page(0))
#define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page)
extern char empty_zero_page[];

extern unsigned int kobjsize(const void *objp);

Expand Down
29 changes: 4 additions & 25 deletions arch/blackfin/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,11 @@
#include "blackfin_sram.h"

/*
* BAD_PAGE is the page that is used for page faults when linux
* is out-of-memory. Older versions of linux just did a
* do_exit(), but using this instead means there is less risk
* for a process dying in kernel mode, possibly leaving a inode
* unused etc..
*
* BAD_PAGETABLE is the accompanying page-table: it is initialized
* to point to BAD_PAGE entries.
*
* ZERO_PAGE is a special page that is used for zero-initialized
* data and COW.
* ZERO_PAGE is a special page that is used for zero-initialized data and COW.
* Let the bss do its zero-init magic so we don't have to do it ourselves.
*/
static unsigned long empty_bad_page_table;

static unsigned long empty_bad_page;

static unsigned long empty_zero_page;
char empty_zero_page[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE)));
EXPORT_SYMBOL(empty_zero_page);

#ifndef CONFIG_EXCEPTION_L1_SCRATCH
#if defined CONFIG_SYSCALL_TAB_L1
Expand Down Expand Up @@ -59,15 +47,6 @@ void __init paging_init(void)

pr_debug("start_mem is %#lx virtual_end is %#lx\n", PAGE_ALIGN(memory_start), end_mem);

/*
* initialize the bad page table and bad page to point
* to a couple of allocated pages
*/
empty_bad_page_table = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
empty_bad_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
memset((void *)empty_zero_page, 0, PAGE_SIZE);

/*
* Set up SFC/DFC registers (user data space)
*/
Expand Down

0 comments on commit f074e48

Please sign in to comment.