git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
m68k
/
mm
/
init_no.c
diff --git
a/arch/m68k/mm/init_no.c
b/arch/m68k/mm/init_no.c
index
50cd12c
..
1e33d39
100644
(file)
--- a/
arch/m68k/mm/init_no.c
+++ b/
arch/m68k/mm/init_no.c
@@
-32,6
+32,7
@@
#include <linux/gfp.h>
#include <asm/setup.h>
#include <linux/gfp.h>
#include <asm/setup.h>
+#include <asm/sections.h>
#include <asm/segment.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/segment.h>
#include <asm/page.h>
#include <asm/pgtable.h>
@@
-44,9
+45,6
@@
*/
void *empty_zero_page;
*/
void *empty_zero_page;
-extern unsigned long memory_start;
-extern unsigned long memory_end;
-
/*
* paging_init() continues the virtual memory environment setup which
* was begun by the code in arch/head.S.
/*
* paging_init() continues the virtual memory environment setup which
* was begun by the code in arch/head.S.
@@
-78,8
+76,6
@@
void __init mem_init(void)
{
int codek = 0, datak = 0, initk = 0;
unsigned long tmp;
{
int codek = 0, datak = 0, initk = 0;
unsigned long tmp;
- extern char _etext, _stext, _sdata, _ebss, __init_begin, __init_end;
- extern unsigned int _ramend, _rambase;
unsigned long len = _ramend - _rambase;
unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */
unsigned long end_mem = memory_end; /* DAVIDM - this must not include kernel stack at top */
unsigned long len = _ramend - _rambase;
unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */
unsigned long end_mem = memory_end; /* DAVIDM - this must not include kernel stack at top */
@@
-95,9
+91,9
@@
void __init mem_init(void)
/* this will put all memory onto the freelists */
totalram_pages = free_all_bootmem();
/* this will put all memory onto the freelists */
totalram_pages = free_all_bootmem();
- codek = (
&_etext - &
_stext) >> 10;
- datak = (
&_ebss - &
_sdata) >> 10;
- initk = (
&__init_begin - &
__init_end) >> 10;
+ codek = (
_etext -
_stext) >> 10;
+ datak = (
_ebss -
_sdata) >> 10;
+ initk = (
__init_begin -
__init_end) >> 10;
tmp = nr_free_pages() << PAGE_SHIFT;
printk(KERN_INFO "Memory available: %luk/%luk RAM, (%dk kernel code, %dk data)\n",
tmp = nr_free_pages() << PAGE_SHIFT;
printk(KERN_INFO "Memory available: %luk/%luk RAM, (%dk kernel code, %dk data)\n",
@@
-129,22
+125,21
@@
void free_initmem(void)
{
#ifdef CONFIG_RAMKERNEL
unsigned long addr;
{
#ifdef CONFIG_RAMKERNEL
unsigned long addr;
- extern char __init_begin, __init_end;
/*
* The following code should be cool even if these sections
* are not page aligned.
*/
/*
* The following code should be cool even if these sections
* are not page aligned.
*/
- addr = PAGE_ALIGN((unsigned long)
(&__init_begin)
);
+ addr = PAGE_ALIGN((unsigned long)
__init_begin
);
/* next to check that the page we free is not a partial page */
/* next to check that the page we free is not a partial page */
- for (; addr + PAGE_SIZE < (
unsigned long)(&__init_end); addr +=
PAGE_SIZE) {
+ for (; addr + PAGE_SIZE < (
(unsigned long) __init_end); addr +=
PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
free_page(addr);
totalram_pages++;
}
pr_notice("Freeing unused kernel memory: %luk freed (0x%x - 0x%x)\n",
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
free_page(addr);
totalram_pages++;
}
pr_notice("Freeing unused kernel memory: %luk freed (0x%x - 0x%x)\n",
- (addr - PAGE_ALIGN((
long) &
__init_begin)) >> 10,
- (int)(PAGE_ALIGN((unsigned long)
(&__init_begin)
)),
+ (addr - PAGE_ALIGN((
unsigned long)
__init_begin)) >> 10,
+ (int)(PAGE_ALIGN((unsigned long)
__init_begin
)),
(int)(addr - PAGE_SIZE));
#endif
}
(int)(addr - PAGE_SIZE));
#endif
}