diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /arch/ppc/amiga/bootinfo.c | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'arch/ppc/amiga/bootinfo.c')
| -rw-r--r-- | arch/ppc/amiga/bootinfo.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/ppc/amiga/bootinfo.c b/arch/ppc/amiga/bootinfo.c index 21fd37aa1..6011910e0 100644 --- a/arch/ppc/amiga/bootinfo.c +++ b/arch/ppc/amiga/bootinfo.c @@ -16,9 +16,11 @@ extern char cmd_line[CL_SIZE]; -int num_memory = 0; -struct mem_info memory[NUM_MEMINFO]; -struct mem_info ramdisk; +extern int num_memory; +extern int m68k_realnum_memory; +extern struct mem_info memory[NUM_MEMINFO]; +extern struct mem_info m68k_memory[NUM_MEMINFO]; +extern struct mem_info ramdisk; extern int amiga_parse_bootinfo(const struct bi_record *); extern int atari_parse_bootinfo(const struct bi_record *); @@ -42,6 +44,11 @@ void __init parse_bootinfo(const struct bi_record *record) memory[num_memory].addr = data[0]; memory[num_memory].size = data[1]; num_memory++; + + /* FIXME: duplicate for m68k drivers. */ + m68k_memory[m68k_realnum_memory].addr = data[0]; + m68k_memory[m68k_realnum_memory].size = data[1]; + m68k_realnum_memory++; } else printk("parse_bootinfo: too many memory chunks\n"); break; |