forked from Minki/linux
mm: now that all old mmu_gather code is gone, remove the storage
Fold all the mmu_gather rework patches into one for submission Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Reported-by: Hugh Dickins <hughd@google.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David Miller <davem@davemloft.net> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Jeff Dike <jdike@addtoit.com> Cc: Richard Weinberger <richard@nod.at> Cc: Tony Luck <tony.luck@intel.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Nick Piggin <npiggin@kernel.dk> Cc: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ff075d6055
commit
1c39517696
@ -32,8 +32,6 @@
|
|||||||
#include <asm/console.h>
|
#include <asm/console.h>
|
||||||
#include <asm/tlb.h>
|
#include <asm/tlb.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
extern void die_if_kernel(char *,struct pt_regs *,long);
|
extern void die_if_kernel(char *,struct pt_regs *,long);
|
||||||
|
|
||||||
static struct pcb_struct original_pcb;
|
static struct pcb_struct original_pcb;
|
||||||
|
@ -31,8 +31,6 @@
|
|||||||
|
|
||||||
#include "mm.h"
|
#include "mm.h"
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* empty_zero_page is a special page that is used for
|
* empty_zero_page is a special page that is used for
|
||||||
* zero-initialized data and COW.
|
* zero-initialized data and COW.
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data;
|
pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data;
|
||||||
|
|
||||||
struct page *empty_zero_page;
|
struct page *empty_zero_page;
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
#include <linux/bootmem.h>
|
#include <linux/bootmem.h>
|
||||||
#include <asm/tlb.h>
|
#include <asm/tlb.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
unsigned long empty_zero_page;
|
unsigned long empty_zero_page;
|
||||||
|
|
||||||
extern char _stext, _edata, _etext; /* From linkerscript */
|
extern char _stext, _edata, _etext; /* From linkerscript */
|
||||||
|
@ -41,8 +41,6 @@
|
|||||||
|
|
||||||
#undef DEBUG
|
#undef DEBUG
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BAD_PAGE is the page that is used for page faults when linux
|
* BAD_PAGE is the page that is used for page faults when linux
|
||||||
* is out-of-memory. Older versions of linux just did a
|
* is out-of-memory. Older versions of linux just did a
|
||||||
|
@ -36,8 +36,6 @@
|
|||||||
#include <asm/mca.h>
|
#include <asm/mca.h>
|
||||||
#include <asm/paravirt.h>
|
#include <asm/paravirt.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
extern void ia64_tlb_init (void);
|
extern void ia64_tlb_init (void);
|
||||||
|
|
||||||
unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL;
|
unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL;
|
||||||
|
@ -35,8 +35,6 @@ extern char __init_begin, __init_end;
|
|||||||
|
|
||||||
pgd_t swapper_pg_dir[1024];
|
pgd_t swapper_pg_dir[1024];
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Cache of MMU context last used.
|
* Cache of MMU context last used.
|
||||||
*/
|
*/
|
||||||
|
@ -32,8 +32,6 @@
|
|||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
#include <asm/tlb.h>
|
#include <asm/tlb.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
pg_data_t pg_data_map[MAX_NUMNODES];
|
pg_data_t pg_data_map[MAX_NUMNODES];
|
||||||
EXPORT_SYMBOL(pg_data_map);
|
EXPORT_SYMBOL(pg_data_map);
|
||||||
|
|
||||||
|
@ -32,8 +32,6 @@ unsigned int __page_offset;
|
|||||||
EXPORT_SYMBOL(__page_offset);
|
EXPORT_SYMBOL(__page_offset);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
static int init_bootmem_done;
|
static int init_bootmem_done;
|
||||||
#endif /* CONFIG_MMU */
|
#endif /* CONFIG_MMU */
|
||||||
|
|
||||||
|
@ -64,8 +64,6 @@
|
|||||||
|
|
||||||
#endif /* CONFIG_MIPS_MT_SMTC */
|
#endif /* CONFIG_MIPS_MT_SMTC */
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We have up to 8 empty zeroed pages so we can map one of the right colour
|
* We have up to 8 empty zeroed pages so we can map one of the right colour
|
||||||
* when needed. This is necessary only on R4000 / R4400 SC and MC versions
|
* when needed. This is necessary only on R4000 / R4400 SC and MC versions
|
||||||
|
@ -37,8 +37,6 @@
|
|||||||
#include <asm/tlb.h>
|
#include <asm/tlb.h>
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
unsigned long highstart_pfn, highend_pfn;
|
unsigned long highstart_pfn, highend_pfn;
|
||||||
|
|
||||||
#ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT
|
#ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT
|
||||||
|
@ -31,8 +31,6 @@
|
|||||||
#include <asm/mmzone.h>
|
#include <asm/mmzone.h>
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
extern int data_start;
|
extern int data_start;
|
||||||
|
|
||||||
#ifdef CONFIG_DISCONTIGMEM
|
#ifdef CONFIG_DISCONTIGMEM
|
||||||
|
@ -36,7 +36,6 @@ struct rcu_table_freelist {
|
|||||||
((PAGE_SIZE - sizeof(struct rcu_table_freelist)) \
|
((PAGE_SIZE - sizeof(struct rcu_table_freelist)) \
|
||||||
/ sizeof(unsigned long))
|
/ sizeof(unsigned long))
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
static DEFINE_PER_CPU(struct rcu_table_freelist *, rcu_table_freelist);
|
static DEFINE_PER_CPU(struct rcu_table_freelist *, rcu_table_freelist);
|
||||||
|
|
||||||
static void __page_table_free(struct mm_struct *mm, unsigned long *table);
|
static void __page_table_free(struct mm_struct *mm, unsigned long *table);
|
||||||
|
@ -38,8 +38,6 @@
|
|||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
#include <asm/tlb.h>
|
#include <asm/tlb.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
unsigned long empty_zero_page;
|
unsigned long empty_zero_page;
|
||||||
EXPORT_SYMBOL_GPL(empty_zero_page);
|
EXPORT_SYMBOL_GPL(empty_zero_page);
|
||||||
|
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#include <asm/cache.h>
|
#include <asm/cache.h>
|
||||||
#include <asm/sizes.h>
|
#include <asm/sizes.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
pgd_t swapper_pg_dir[PTRS_PER_PGD];
|
pgd_t swapper_pg_dir[PTRS_PER_PGD];
|
||||||
|
|
||||||
void __init generic_mem_init(void)
|
void __init generic_mem_init(void)
|
||||||
|
@ -37,8 +37,6 @@
|
|||||||
#include <asm/prom.h>
|
#include <asm/prom.h>
|
||||||
#include <asm/leon.h>
|
#include <asm/leon.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
unsigned long *sparc_valid_addr_bitmap;
|
unsigned long *sparc_valid_addr_bitmap;
|
||||||
EXPORT_SYMBOL(sparc_valid_addr_bitmap);
|
EXPORT_SYMBOL(sparc_valid_addr_bitmap);
|
||||||
|
|
||||||
|
@ -60,8 +60,6 @@ unsigned long VMALLOC_RESERVE = CONFIG_VMALLOC_RESERVE;
|
|||||||
EXPORT_SYMBOL(VMALLOC_RESERVE);
|
EXPORT_SYMBOL(VMALLOC_RESERVE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
/* Create an L2 page table */
|
/* Create an L2 page table */
|
||||||
static pte_t * __init alloc_pte(void)
|
static pte_t * __init alloc_pte(void)
|
||||||
{
|
{
|
||||||
|
@ -7,9 +7,6 @@
|
|||||||
#include "asm/pgalloc.h"
|
#include "asm/pgalloc.h"
|
||||||
#include "asm/tlb.h"
|
#include "asm/tlb.h"
|
||||||
|
|
||||||
/* For some reason, mmu_gathers are referenced when CONFIG_SMP is off. */
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
|
|
||||||
#include "linux/sched.h"
|
#include "linux/sched.h"
|
||||||
|
@ -30,8 +30,6 @@
|
|||||||
|
|
||||||
#include "mm.h"
|
#include "mm.h"
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* empty_zero_page is a special page that is used for
|
* empty_zero_page is a special page that is used for
|
||||||
* zero-initialized data and COW.
|
* zero-initialized data and COW.
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
#include <asm/tlb.h>
|
#include <asm/tlb.h>
|
||||||
#include <asm/proto.h>
|
#include <asm/proto.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
unsigned long __initdata pgt_buf_start;
|
unsigned long __initdata pgt_buf_start;
|
||||||
unsigned long __meminitdata pgt_buf_end;
|
unsigned long __meminitdata pgt_buf_end;
|
||||||
unsigned long __meminitdata pgt_buf_top;
|
unsigned long __meminitdata pgt_buf_top;
|
||||||
|
@ -14,8 +14,6 @@
|
|||||||
#include <asm/mmu_context.h>
|
#include <asm/mmu_context.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
|
||||||
|
|
||||||
void __init paging_init(void)
|
void __init paging_init(void)
|
||||||
{
|
{
|
||||||
memset(swapper_pg_dir, 0, PAGE_SIZE);
|
memset(swapper_pg_dir, 0, PAGE_SIZE);
|
||||||
|
Loading…
Reference in New Issue
Block a user