2005-09-16 22:27:51 -04:00
|
|
|
/*
|
2008-02-05 01:30:53 -05:00
|
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
2005-04-16 18:20:36 -04:00
|
|
|
* Licensed under the GPL
|
|
|
|
*/
|
|
|
|
|
2008-02-05 01:30:53 -05:00
|
|
|
#include <linux/stddef.h>
|
|
|
|
#include <linux/bootmem.h>
|
|
|
|
#include <linux/highmem.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/swap.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 04:04:11 -04:00
|
|
|
#include <linux/slab.h>
|
2008-02-05 01:30:53 -05:00
|
|
|
#include <asm/fixmap.h>
|
|
|
|
#include <asm/page.h>
|
2007-05-06 17:51:08 -04:00
|
|
|
#include "as-layout.h"
|
2008-02-05 01:30:53 -05:00
|
|
|
#include "init.h"
|
2005-04-16 18:20:36 -04:00
|
|
|
#include "kern.h"
|
2008-02-05 01:30:53 -05:00
|
|
|
#include "kern_util.h"
|
2005-04-16 18:20:36 -04:00
|
|
|
#include "mem_user.h"
|
|
|
|
#include "os.h"
|
|
|
|
|
2007-02-10 04:44:18 -05:00
|
|
|
/* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */
|
2005-04-16 18:20:36 -04:00
|
|
|
unsigned long *empty_zero_page = NULL;
|
2007-02-10 04:44:18 -05:00
|
|
|
/* allocated in paging_init and unchanged thereafter */
|
2008-07-24 00:28:49 -04:00
|
|
|
static unsigned long *empty_bad_page = NULL;
|
2008-02-05 01:31:17 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialized during boot, and readonly for initializing page tables
|
|
|
|
* afterwards
|
|
|
|
*/
|
2005-04-16 18:20:36 -04:00
|
|
|
pgd_t swapper_pg_dir[PTRS_PER_PGD];
|
2008-02-05 01:31:17 -05:00
|
|
|
|
|
|
|
/* Initialized at boot time, and readonly after that */
|
2006-03-31 05:30:09 -05:00
|
|
|
unsigned long long highmem;
|
2005-04-16 18:20:36 -04:00
|
|
|
int kmalloc_ok = 0;
|
|
|
|
|
2008-02-05 01:31:17 -05:00
|
|
|
/* Used during early boot */
|
2005-04-16 18:20:36 -04:00
|
|
|
static unsigned long brk_end;
|
|
|
|
|
|
|
|
#ifdef CONFIG_HIGHMEM
|
|
|
|
static void setup_highmem(unsigned long highmem_start,
|
|
|
|
unsigned long highmem_len)
|
|
|
|
{
|
|
|
|
struct page *page;
|
|
|
|
unsigned long highmem_pfn;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
highmem_pfn = __pa(highmem_start) >> PAGE_SHIFT;
|
2008-02-05 01:30:53 -05:00
|
|
|
for (i = 0; i < highmem_len >> PAGE_SHIFT; i++) {
|
2005-04-16 18:20:36 -04:00
|
|
|
page = &mem_map[highmem_pfn + i];
|
|
|
|
ClearPageReserved(page);
|
2006-03-22 03:08:40 -05:00
|
|
|
init_page_count(page);
|
2005-04-16 18:20:36 -04:00
|
|
|
__free_page(page);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-07-23 21:43:48 -04:00
|
|
|
void __init mem_init(void)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2007-02-10 04:44:10 -05:00
|
|
|
/* clear the zero-page */
|
2008-02-05 01:30:41 -05:00
|
|
|
memset(empty_zero_page, 0, PAGE_SIZE);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
/* Map in the area just after the brk now that kmalloc is about
|
|
|
|
* to be turned on.
|
|
|
|
*/
|
|
|
|
brk_end = (unsigned long) UML_ROUND_UP(sbrk(0));
|
2008-02-05 01:31:24 -05:00
|
|
|
map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
|
2005-04-16 18:20:36 -04:00
|
|
|
free_bootmem(__pa(brk_end), uml_reserved - brk_end);
|
|
|
|
uml_reserved = brk_end;
|
|
|
|
|
|
|
|
/* this will put all low memory onto the freelists */
|
|
|
|
totalram_pages = free_all_bootmem();
|
2007-03-29 04:20:31 -04:00
|
|
|
max_low_pfn = totalram_pages;
|
2006-09-26 02:31:11 -04:00
|
|
|
#ifdef CONFIG_HIGHMEM
|
2005-04-16 18:20:36 -04:00
|
|
|
totalhigh_pages = highmem >> PAGE_SHIFT;
|
|
|
|
totalram_pages += totalhigh_pages;
|
2006-09-26 02:31:11 -04:00
|
|
|
#endif
|
2005-04-16 18:20:36 -04:00
|
|
|
num_physpages = totalram_pages;
|
|
|
|
max_pfn = totalram_pages;
|
2008-02-05 01:30:53 -05:00
|
|
|
printk(KERN_INFO "Memory: %luk available\n",
|
2009-09-21 20:02:36 -04:00
|
|
|
nr_free_pages() << (PAGE_SHIFT-10));
|
2005-04-16 18:20:36 -04:00
|
|
|
kmalloc_ok = 1;
|
|
|
|
|
|
|
|
#ifdef CONFIG_HIGHMEM
|
|
|
|
setup_highmem(end_iomem, highmem);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2005-05-20 16:59:12 -04:00
|
|
|
/*
|
|
|
|
* Create a page table and place a pointer to it in a middle page
|
|
|
|
* directory entry.
|
|
|
|
*/
|
|
|
|
static void __init one_page_table_init(pmd_t *pmd)
|
|
|
|
{
|
|
|
|
if (pmd_none(*pmd)) {
|
|
|
|
pte_t *pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
|
|
|
|
set_pmd(pmd, __pmd(_KERNPG_TABLE +
|
|
|
|
(unsigned long) __pa(pte)));
|
|
|
|
if (pte != pte_offset_kernel(pmd, 0))
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __init one_md_table_init(pud_t *pud)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_3_LEVEL_PGTABLES
|
|
|
|
pmd_t *pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
|
|
|
|
set_pud(pud, __pud(_KERNPG_TABLE + (unsigned long) __pa(pmd_table)));
|
|
|
|
if (pmd_table != pmd_offset(pud, 0))
|
|
|
|
BUG();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-02-05 01:30:53 -05:00
|
|
|
static void __init fixrange_init(unsigned long start, unsigned long end,
|
2005-04-16 18:20:36 -04:00
|
|
|
pgd_t *pgd_base)
|
|
|
|
{
|
|
|
|
pgd_t *pgd;
|
2005-05-20 16:59:12 -04:00
|
|
|
pud_t *pud;
|
2005-04-16 18:20:36 -04:00
|
|
|
pmd_t *pmd;
|
|
|
|
int i, j;
|
|
|
|
unsigned long vaddr;
|
|
|
|
|
|
|
|
vaddr = start;
|
|
|
|
i = pgd_index(vaddr);
|
|
|
|
j = pmd_index(vaddr);
|
|
|
|
pgd = pgd_base + i;
|
|
|
|
|
|
|
|
for ( ; (i < PTRS_PER_PGD) && (vaddr < end); pgd++, i++) {
|
2005-05-20 16:59:12 -04:00
|
|
|
pud = pud_offset(pgd, vaddr);
|
|
|
|
if (pud_none(*pud))
|
|
|
|
one_md_table_init(pud);
|
|
|
|
pmd = pmd_offset(pud, vaddr);
|
2008-02-05 01:30:55 -05:00
|
|
|
for (; (j < PTRS_PER_PMD) && (vaddr < end); pmd++, j++) {
|
2005-05-20 16:59:12 -04:00
|
|
|
one_page_table_init(pmd);
|
2005-04-16 18:20:36 -04:00
|
|
|
vaddr += PMD_SIZE;
|
|
|
|
}
|
|
|
|
j = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_HIGHMEM
|
|
|
|
pte_t *kmap_pte;
|
|
|
|
pgprot_t kmap_prot;
|
|
|
|
|
|
|
|
#define kmap_get_fixmap_pte(vaddr) \
|
|
|
|
pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)),\
|
uml: header untangling
Untangle UML headers somewhat and add some includes where they were
needed explicitly, but gotten accidentally via some other header.
arch/um/include/um_uaccess.h loses asm/fixmap.h because it uses no
fixmap stuff and gains elf.h, because it needs FIXADDR_USER_*, and
archsetjmp.h, because it needs jmp_buf.
pmd_alloc_one is uninlined because it needs mm_struct, and that's
inconvenient to provide in asm-um/pgtable-3level.h.
elf_core_copy_fpregs is also uninlined from elf-i386.h and
elf-x86_64.h, which duplicated the code anyway, to
arch/um/kernel/process.c, so that the reference to current_thread
doesn't pull sched.h or anything related into asm/elf.h.
arch/um/sys-i386/ldt.c, arch/um/kernel/tlb.c and
arch/um/kernel/skas/uaccess.c got sched.h because they dereference
task_structs. Its includes of linux and asm headers got turned from
"" to <>.
arch/um/sys-i386/bug.c gets asm/errno.h because it needs errno
constants.
asm/elf-i386 gets asm/user.h because it needs user_regs_struct.
asm/fixmap.h gets page.h because it needs PAGE_SIZE and PAGE_MASK and
system.h for BUG_ON.
asm/pgtable doesn't need sched.h.
asm/processor-generic.h defined mm_segment_t, but didn't use it. So,
that definition is moved to uaccess.h, which defines a bunch of
mm_segment_t-related stuff. thread_info.h uses mm_segment_t, and
includes uaccess.h, which causes a recursion. So, the definition is
placed above the include of thread_info. in uaccess.h. thread_info.h
also gets page.h because it needs PAGE_SIZE.
ObCheckpatchViolationJustification - I'm not adding a typedef; I'm
moving mm_segment_t from one place to another.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-05 01:30:53 -05:00
|
|
|
(vaddr)), (vaddr))
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
static void __init kmap_init(void)
|
|
|
|
{
|
|
|
|
unsigned long kmap_vstart;
|
|
|
|
|
|
|
|
/* cache the first kmap pte */
|
|
|
|
kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
|
|
|
|
kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
|
|
|
|
|
|
|
|
kmap_prot = PAGE_KERNEL;
|
|
|
|
}
|
|
|
|
|
2007-10-29 00:36:10 -04:00
|
|
|
static void __init init_highmem(void)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
pgd_t *pgd;
|
|
|
|
pud_t *pud;
|
|
|
|
pmd_t *pmd;
|
|
|
|
pte_t *pte;
|
|
|
|
unsigned long vaddr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Permanent kmaps:
|
|
|
|
*/
|
|
|
|
vaddr = PKMAP_BASE;
|
|
|
|
fixrange_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, swapper_pg_dir);
|
|
|
|
|
|
|
|
pgd = swapper_pg_dir + pgd_index(vaddr);
|
|
|
|
pud = pud_offset(pgd, vaddr);
|
|
|
|
pmd = pmd_offset(pud, vaddr);
|
|
|
|
pte = pte_offset_kernel(pmd, vaddr);
|
|
|
|
pkmap_page_table = pte;
|
|
|
|
|
|
|
|
kmap_init();
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_HIGHMEM */
|
|
|
|
|
|
|
|
static void __init fixaddr_user_init( void)
|
|
|
|
{
|
2005-09-07 18:21:11 -04:00
|
|
|
#ifdef CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA
|
2005-04-16 18:20:36 -04:00
|
|
|
long size = FIXADDR_USER_END - FIXADDR_USER_START;
|
|
|
|
pgd_t *pgd;
|
|
|
|
pud_t *pud;
|
|
|
|
pmd_t *pmd;
|
|
|
|
pte_t *pte;
|
2008-02-05 01:30:55 -05:00
|
|
|
phys_t p;
|
|
|
|
unsigned long v, vaddr = FIXADDR_USER_START;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-02-05 01:30:55 -05:00
|
|
|
if (!size)
|
2005-04-16 18:20:36 -04:00
|
|
|
return;
|
|
|
|
|
|
|
|
fixrange_init( FIXADDR_USER_START, FIXADDR_USER_END, swapper_pg_dir);
|
2008-02-05 01:30:55 -05:00
|
|
|
v = (unsigned long) alloc_bootmem_low_pages(size);
|
|
|
|
memcpy((void *) v , (void *) FIXADDR_USER_START, size);
|
|
|
|
p = __pa(v);
|
2008-02-05 01:30:53 -05:00
|
|
|
for ( ; size > 0; size -= PAGE_SIZE, vaddr += PAGE_SIZE,
|
2008-02-05 01:30:55 -05:00
|
|
|
p += PAGE_SIZE) {
|
2005-04-16 18:20:36 -04:00
|
|
|
pgd = swapper_pg_dir + pgd_index(vaddr);
|
|
|
|
pud = pud_offset(pgd, vaddr);
|
|
|
|
pmd = pmd_offset(pud, vaddr);
|
|
|
|
pte = pte_offset_kernel(pmd, vaddr);
|
2008-02-05 01:30:55 -05:00
|
|
|
pte_set_val(*pte, p, PAGE_READONLY);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-05-06 17:51:11 -04:00
|
|
|
void __init paging_init(void)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
unsigned long zones_size[MAX_NR_ZONES], vaddr;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
|
|
|
|
empty_bad_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
|
2008-02-05 01:30:53 -05:00
|
|
|
for (i = 0; i < ARRAY_SIZE(zones_size); i++)
|
2005-04-16 18:20:36 -04:00
|
|
|
zones_size[i] = 0;
|
2006-09-26 02:33:00 -04:00
|
|
|
|
2006-09-27 04:50:34 -04:00
|
|
|
zones_size[ZONE_NORMAL] = (end_iomem >> PAGE_SHIFT) -
|
|
|
|
(uml_physmem >> PAGE_SHIFT);
|
2006-09-26 02:31:14 -04:00
|
|
|
#ifdef CONFIG_HIGHMEM
|
2005-11-07 03:58:58 -05:00
|
|
|
zones_size[ZONE_HIGHMEM] = highmem >> PAGE_SHIFT;
|
2006-09-26 02:31:14 -04:00
|
|
|
#endif
|
2005-04-16 18:20:36 -04:00
|
|
|
free_area_init(zones_size);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fixed mappings, only the page table structure has to be
|
|
|
|
* created - mappings will be set by set_fixmap():
|
|
|
|
*/
|
|
|
|
vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
|
|
|
|
fixrange_init(vaddr, FIXADDR_TOP, swapper_pg_dir);
|
|
|
|
|
|
|
|
fixaddr_user_init();
|
|
|
|
|
|
|
|
#ifdef CONFIG_HIGHMEM
|
|
|
|
init_highmem();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
uml: header untangling
Untangle UML headers somewhat and add some includes where they were
needed explicitly, but gotten accidentally via some other header.
arch/um/include/um_uaccess.h loses asm/fixmap.h because it uses no
fixmap stuff and gains elf.h, because it needs FIXADDR_USER_*, and
archsetjmp.h, because it needs jmp_buf.
pmd_alloc_one is uninlined because it needs mm_struct, and that's
inconvenient to provide in asm-um/pgtable-3level.h.
elf_core_copy_fpregs is also uninlined from elf-i386.h and
elf-x86_64.h, which duplicated the code anyway, to
arch/um/kernel/process.c, so that the reference to current_thread
doesn't pull sched.h or anything related into asm/elf.h.
arch/um/sys-i386/ldt.c, arch/um/kernel/tlb.c and
arch/um/kernel/skas/uaccess.c got sched.h because they dereference
task_structs. Its includes of linux and asm headers got turned from
"" to <>.
arch/um/sys-i386/bug.c gets asm/errno.h because it needs errno
constants.
asm/elf-i386 gets asm/user.h because it needs user_regs_struct.
asm/fixmap.h gets page.h because it needs PAGE_SIZE and PAGE_MASK and
system.h for BUG_ON.
asm/pgtable doesn't need sched.h.
asm/processor-generic.h defined mm_segment_t, but didn't use it. So,
that definition is moved to uaccess.h, which defines a bunch of
mm_segment_t-related stuff. thread_info.h uses mm_segment_t, and
includes uaccess.h, which causes a recursion. So, the definition is
placed above the include of thread_info. in uaccess.h. thread_info.h
also gets page.h because it needs PAGE_SIZE.
ObCheckpatchViolationJustification - I'm not adding a typedef; I'm
moving mm_segment_t from one place to another.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-05 01:30:53 -05:00
|
|
|
/*
|
|
|
|
* This can't do anything because nothing in the kernel image can be freed
|
2005-04-16 18:20:36 -04:00
|
|
|
* since it's not in kernel physical memory.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void free_initmem(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
|
void free_initrd_mem(unsigned long start, unsigned long end)
|
|
|
|
{
|
|
|
|
if (start < end)
|
2008-02-05 01:30:53 -05:00
|
|
|
printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",
|
|
|
|
(end - start) >> 10);
|
2005-04-16 18:20:36 -04:00
|
|
|
for (; start < end; start += PAGE_SIZE) {
|
|
|
|
ClearPageReserved(virt_to_page(start));
|
2006-03-22 03:08:40 -05:00
|
|
|
init_page_count(virt_to_page(start));
|
2005-04-16 18:20:36 -04:00
|
|
|
free_page(start);
|
|
|
|
totalram_pages++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
uml: header untangling
Untangle UML headers somewhat and add some includes where they were
needed explicitly, but gotten accidentally via some other header.
arch/um/include/um_uaccess.h loses asm/fixmap.h because it uses no
fixmap stuff and gains elf.h, because it needs FIXADDR_USER_*, and
archsetjmp.h, because it needs jmp_buf.
pmd_alloc_one is uninlined because it needs mm_struct, and that's
inconvenient to provide in asm-um/pgtable-3level.h.
elf_core_copy_fpregs is also uninlined from elf-i386.h and
elf-x86_64.h, which duplicated the code anyway, to
arch/um/kernel/process.c, so that the reference to current_thread
doesn't pull sched.h or anything related into asm/elf.h.
arch/um/sys-i386/ldt.c, arch/um/kernel/tlb.c and
arch/um/kernel/skas/uaccess.c got sched.h because they dereference
task_structs. Its includes of linux and asm headers got turned from
"" to <>.
arch/um/sys-i386/bug.c gets asm/errno.h because it needs errno
constants.
asm/elf-i386 gets asm/user.h because it needs user_regs_struct.
asm/fixmap.h gets page.h because it needs PAGE_SIZE and PAGE_MASK and
system.h for BUG_ON.
asm/pgtable doesn't need sched.h.
asm/processor-generic.h defined mm_segment_t, but didn't use it. So,
that definition is moved to uaccess.h, which defines a bunch of
mm_segment_t-related stuff. thread_info.h uses mm_segment_t, and
includes uaccess.h, which causes a recursion. So, the definition is
placed above the include of thread_info. in uaccess.h. thread_info.h
also gets page.h because it needs PAGE_SIZE.
ObCheckpatchViolationJustification - I'm not adding a typedef; I'm
moving mm_segment_t from one place to another.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-05 01:30:53 -05:00
|
|
|
/* Allocate and free page tables. */
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
pgd_t *pgd_alloc(struct mm_struct *mm)
|
|
|
|
{
|
|
|
|
pgd_t *pgd = (pgd_t *)__get_free_page(GFP_KERNEL);
|
|
|
|
|
|
|
|
if (pgd) {
|
|
|
|
memset(pgd, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));
|
2008-02-05 01:30:53 -05:00
|
|
|
memcpy(pgd + USER_PTRS_PER_PGD,
|
|
|
|
swapper_pg_dir + USER_PTRS_PER_PGD,
|
2005-04-16 18:20:36 -04:00
|
|
|
(PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
|
|
|
|
}
|
|
|
|
return pgd;
|
|
|
|
}
|
|
|
|
|
2008-02-05 01:29:14 -05:00
|
|
|
void pgd_free(struct mm_struct *mm, pgd_t *pgd)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
free_page((unsigned long) pgd);
|
|
|
|
}
|
|
|
|
|
|
|
|
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
|
|
|
|
{
|
|
|
|
pte_t *pte;
|
|
|
|
|
|
|
|
pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
|
|
|
|
return pte;
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:22:04 -05:00
|
|
|
pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
struct page *pte;
|
2007-02-10 04:44:10 -05:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
pte = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
|
2008-02-08 07:22:04 -05:00
|
|
|
if (pte)
|
|
|
|
pgtable_page_ctor(pte);
|
2005-04-16 18:20:36 -04:00
|
|
|
return pte;
|
|
|
|
}
|
uml: header untangling
Untangle UML headers somewhat and add some includes where they were
needed explicitly, but gotten accidentally via some other header.
arch/um/include/um_uaccess.h loses asm/fixmap.h because it uses no
fixmap stuff and gains elf.h, because it needs FIXADDR_USER_*, and
archsetjmp.h, because it needs jmp_buf.
pmd_alloc_one is uninlined because it needs mm_struct, and that's
inconvenient to provide in asm-um/pgtable-3level.h.
elf_core_copy_fpregs is also uninlined from elf-i386.h and
elf-x86_64.h, which duplicated the code anyway, to
arch/um/kernel/process.c, so that the reference to current_thread
doesn't pull sched.h or anything related into asm/elf.h.
arch/um/sys-i386/ldt.c, arch/um/kernel/tlb.c and
arch/um/kernel/skas/uaccess.c got sched.h because they dereference
task_structs. Its includes of linux and asm headers got turned from
"" to <>.
arch/um/sys-i386/bug.c gets asm/errno.h because it needs errno
constants.
asm/elf-i386 gets asm/user.h because it needs user_regs_struct.
asm/fixmap.h gets page.h because it needs PAGE_SIZE and PAGE_MASK and
system.h for BUG_ON.
asm/pgtable doesn't need sched.h.
asm/processor-generic.h defined mm_segment_t, but didn't use it. So,
that definition is moved to uaccess.h, which defines a bunch of
mm_segment_t-related stuff. thread_info.h uses mm_segment_t, and
includes uaccess.h, which causes a recursion. So, the definition is
placed above the include of thread_info. in uaccess.h. thread_info.h
also gets page.h because it needs PAGE_SIZE.
ObCheckpatchViolationJustification - I'm not adding a typedef; I'm
moving mm_segment_t from one place to another.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-05 01:30:53 -05:00
|
|
|
|
|
|
|
#ifdef CONFIG_3_LEVEL_PGTABLES
|
|
|
|
pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
|
|
|
|
{
|
|
|
|
pmd_t *pmd = (pmd_t *) __get_free_page(GFP_KERNEL);
|
|
|
|
|
|
|
|
if (pmd)
|
|
|
|
memset(pmd, 0, PAGE_SIZE);
|
|
|
|
|
|
|
|
return pmd;
|
|
|
|
}
|
|
|
|
#endif
|
2008-05-12 17:01:52 -04:00
|
|
|
|
|
|
|
void *uml_kmalloc(int size, int flags)
|
|
|
|
{
|
|
|
|
return kmalloc(size, flags);
|
|
|
|
}
|