Commit 220cf2d8 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 8049c664 ff1457fc
...@@ -31,7 +31,6 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags, ...@@ -31,7 +31,6 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags,
char **cmdline, struct meminfo *mi) char **cmdline, struct meminfo *mi)
{ {
mi->nr_banks=1; mi->nr_banks=1;
mi->end = 0xc0FFFFFF;
mi->bank[0].start = 0xc0000000; mi->bank[0].start = 0xc0000000;
mi->bank[0].size = 0x01000000; mi->bank[0].size = 0x01000000;
mi->bank[0].node = 0; mi->bank[0].node = 0;
......
...@@ -34,7 +34,16 @@ ...@@ -34,7 +34,16 @@
extern void clps711x_map_io(void); extern void clps711x_map_io(void);
extern void clps711x_init_irq(void); extern void clps711x_init_irq(void);
struct meminfo memmap = { 1, 0xC1000000, {{0xC0000000,0x01000000,0}}}; struct meminfo memmap = {
.nr_banks = 1,
.bank = {
{
.start = 0xC0000000,
.size = 0x01000000,
.node = 0
},
},
};
typedef struct tag_IMAGE_PARAMS typedef struct tag_IMAGE_PARAMS
{ {
...@@ -53,9 +62,8 @@ static void __init ...@@ -53,9 +62,8 @@ static void __init
fortunet_fixup(struct machine_desc *desc, struct tag *tags, fortunet_fixup(struct machine_desc *desc, struct tag *tags,
char **cmdline, struct meminfo *mi) char **cmdline, struct meminfo *mi)
{ {
IMAGE_PARAMS *ip; IMAGE_PARAMS *ip = phys_to_virt(IMAGE_PARAMS_PHYS);
ip = (IMAGE_PARAMS *)__phys_to_virt(IMAGE_PARAMS_PHYS); *cmdline = phys_to_virt(ip->command_line);
*cmdline = (char *)__phys_to_virt(ip->command_line);
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
if(ip->ramdisk_ok) if(ip->ramdisk_ok)
{ {
...@@ -64,7 +72,6 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags, ...@@ -64,7 +72,6 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags,
} }
#endif #endif
memmap.bank[0].size = ip->ram_size; memmap.bank[0].size = ip->ram_size;
memmap.end = ip->ram_size+0xC0000000;
*mi = memmap; *mi = memmap;
} }
......
...@@ -225,6 +225,8 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np) ...@@ -225,6 +225,8 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
bootmem_pages += np[i].bootmap_pages; bootmem_pages += np[i].bootmap_pages;
} }
high_memory = __va(memend_pfn << PAGE_SHIFT);
/* /*
* This doesn't seem to be used by the Linux memory * This doesn't seem to be used by the Linux memory
* manager any more. If we can get rid of it, we * manager any more. If we can get rid of it, we
...@@ -232,7 +234,6 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np) ...@@ -232,7 +234,6 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
*/ */
max_low_pfn = memend_pfn - O_PFN_DOWN(PHYS_OFFSET); max_low_pfn = memend_pfn - O_PFN_DOWN(PHYS_OFFSET);
max_pfn = memend_pfn - O_PFN_DOWN(PHYS_OFFSET); max_pfn = memend_pfn - O_PFN_DOWN(PHYS_OFFSET);
mi->end = memend_pfn << PAGE_SHIFT;
return bootmem_pages; return bootmem_pages;
} }
...@@ -546,7 +547,6 @@ void __init mem_init(void) ...@@ -546,7 +547,6 @@ void __init mem_init(void)
datapages = &_end - &_etext; datapages = &_end - &_etext;
initpages = &__init_end - &__init_begin; initpages = &__init_end - &__init_begin;
high_memory = (void *)__va(meminfo.end);
#ifndef CONFIG_DISCONTIGMEM #ifndef CONFIG_DISCONTIGMEM
max_mapnr = virt_to_page(high_memory) - mem_map; max_mapnr = virt_to_page(high_memory) - mem_map;
#endif #endif
......
...@@ -196,7 +196,6 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } ...@@ -196,7 +196,6 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn }
struct meminfo { struct meminfo {
int nr_banks; int nr_banks;
unsigned long end;
struct { struct {
unsigned long start; unsigned long start;
unsigned long size; unsigned long size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment