projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[powerpc.git]
/
arch
/
um
/
kernel
/
mem.c
diff --git
a/arch/um/kernel/mem.c
b/arch/um/kernel/mem.c
index
e85d65d
..
72ff856
100644
(file)
--- a/
arch/um/kernel/mem.c
+++ b/
arch/um/kernel/mem.c
@@
-13,8
+13,8
@@
#include "asm/page.h"
#include "asm/fixmap.h"
#include "asm/pgalloc.h"
#include "asm/page.h"
#include "asm/fixmap.h"
#include "asm/pgalloc.h"
-#include "user_util.h"
#include "kern_util.h"
#include "kern_util.h"
+#include "as-layout.h"
#include "kern.h"
#include "mem_user.h"
#include "uml_uaccess.h"
#include "kern.h"
#include "mem_user.h"
#include "uml_uaccess.h"
@@
-64,8
+64,6
@@
static void setup_highmem(unsigned long highmem_start,
void mem_init(void)
{
void mem_init(void)
{
- max_low_pfn = (high_physmem - uml_physmem) >> PAGE_SHIFT;
-
/* clear the zero-page */
memset((void *) empty_zero_page, 0, PAGE_SIZE);
/* clear the zero-page */
memset((void *) empty_zero_page, 0, PAGE_SIZE);
@@
-80,6
+78,7
@@
void mem_init(void)
/* this will put all low memory onto the freelists */
totalram_pages = free_all_bootmem();
/* this will put all low memory onto the freelists */
totalram_pages = free_all_bootmem();
+ max_low_pfn = totalram_pages;
#ifdef CONFIG_HIGHMEM
totalhigh_pages = highmem >> PAGE_SHIFT;
totalram_pages += totalhigh_pages;
#ifdef CONFIG_HIGHMEM
totalhigh_pages = highmem >> PAGE_SHIFT;
totalram_pages += totalhigh_pages;
@@
-217,7
+216,7
@@
static void __init fixaddr_user_init( void)
#endif
}
#endif
}
-void paging_init(void)
+void
__init
paging_init(void)
{
unsigned long zones_size[MAX_NR_ZONES], vaddr;
int i;
{
unsigned long zones_size[MAX_NR_ZONES], vaddr;
int i;