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/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
mm
/
mem.c
diff --git
a/arch/powerpc/mm/mem.c
b/arch/powerpc/mm/mem.c
index
51f82d8
..
1ca2235
100644
(file)
--- a/
arch/powerpc/mm/mem.c
+++ b/
arch/powerpc/mm/mem.c
@@
-44,6
+44,7
@@
#include <asm/btext.h>
#include <asm/tlb.h>
#include <asm/sections.h>
#include <asm/btext.h>
#include <asm/tlb.h>
#include <asm/sections.h>
+#include <asm/sparsemem.h>
#include <asm/vdso.h>
#include <asm/fixmap.h>
#include <asm/vdso.h>
#include <asm/fixmap.h>
@@
-329,7
+330,7
@@
static int __init mark_nonram_nosave(void)
void __init paging_init(void)
{
unsigned long total_ram = lmb_phys_mem_size();
void __init paging_init(void)
{
unsigned long total_ram = lmb_phys_mem_size();
-
unsigned long
top_of_ram = lmb_end_of_DRAM();
+
phys_addr_t
top_of_ram = lmb_end_of_DRAM();
unsigned long max_zone_pfns[MAX_NR_ZONES];
#ifdef CONFIG_PPC32
unsigned long max_zone_pfns[MAX_NR_ZONES];
#ifdef CONFIG_PPC32
@@
-348,10
+349,10
@@
void __init paging_init(void)
kmap_prot = PAGE_KERNEL;
#endif /* CONFIG_HIGHMEM */
kmap_prot = PAGE_KERNEL;
#endif /* CONFIG_HIGHMEM */
- printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
- top_of_ram, total_ram);
+ printk(KERN_DEBUG "Top of RAM: 0x%l
l
x, Total RAM: 0x%lx\n",
+
(u64)
top_of_ram, total_ram);
printk(KERN_DEBUG "Memory hole size: %ldMB\n",
printk(KERN_DEBUG "Memory hole size: %ldMB\n",
- (
top_of_ram - total_ram) >> 20
);
+ (
long int)((top_of_ram - total_ram) >> 20)
);
memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
#ifdef CONFIG_HIGHMEM
max_zone_pfns[ZONE_DMA] = lowmem_end_addr >> PAGE_SHIFT;
memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
#ifdef CONFIG_HIGHMEM
max_zone_pfns[ZONE_DMA] = lowmem_end_addr >> PAGE_SHIFT;