Commit a3a79bd7c75f0055df16540c7e9dbe270060ebe8
Committed by
Linus Torvalds
Linus Torvalds
1 parent
8e8858e932
[PATCH] Sun3: General updates
General compile fixes for 2.6.16 for sun3, and some updates to make the new bootloader work correctly. Tested on 3/50, 3/60, 3/80. Signed-off-by: Sam Creasey <sammy@sammy.net> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Showing 5 changed files with 7 additions and 14 deletions Side-by-side Diff
arch/m68k/kernel/sun3-head.S
| ... | ... | @@ -67,16 +67,6 @@ |
| 67 | 67 | 1: lea init_task,%curptr | get initial thread... |
| 68 | 68 | lea init_thread_union+THREAD_SIZE,%sp | ...and its stack. |
| 69 | 69 | |
| 70 | -/* copy bootinfo records from the loader to _end */ | |
| 71 | - lea _end, %a1 | |
| 72 | - lea BI_START, %a0 | |
| 73 | - /* number of longs to copy */ | |
| 74 | - movel %a0@, %d0 | |
| 75 | -1: addl #4, %a0 | |
| 76 | - movel %a0@, %a1@ | |
| 77 | - addl #4, %a1 | |
| 78 | - dbf %d0, 1b | |
| 79 | - | |
| 80 | 70 | /* Point MSP at an invalid page to trap if it's used. --m */ |
| 81 | 71 | movl #(PAGESIZE),%d0 |
| 82 | 72 | movc %d0,%msp |
arch/m68k/kernel/vmlinux-sun3.lds
arch/m68k/mm/sun3mmu.c
| ... | ... | @@ -49,7 +49,6 @@ |
| 49 | 49 | unsigned long zones_size[MAX_NR_ZONES] = { 0, }; |
| 50 | 50 | unsigned long size; |
| 51 | 51 | |
| 52 | - | |
| 53 | 52 | #ifdef TEST_VERIFY_AREA |
| 54 | 53 | wp_works_ok = 0; |
| 55 | 54 | #endif |
| ... | ... | @@ -94,7 +93,11 @@ |
| 94 | 93 | /* memory sizing is a hack stolen from motorola.c.. hope it works for us */ |
| 95 | 94 | zones_size[ZONE_DMA] = ((unsigned long)high_memory - PAGE_OFFSET) >> PAGE_SHIFT; |
| 96 | 95 | |
| 97 | - free_area_init(zones_size); | |
| 96 | + /* I really wish I knew why the following change made things better... -- Sam */ | |
| 97 | +/* free_area_init(zones_size); */ | |
| 98 | + free_area_init_node(0, NODE_DATA(0), zones_size, | |
| 99 | + (__pa(PAGE_OFFSET) >> PAGE_SHIFT) + 1, NULL); | |
| 100 | + | |
| 98 | 101 | |
| 99 | 102 | } |
include/asm-m68k/sun3-head.h
| ... | ... | @@ -4,7 +4,6 @@ |
| 4 | 4 | |
| 5 | 5 | #define KERNBASE 0xE000000 /* First address the kernel will eventually be */ |
| 6 | 6 | #define LOAD_ADDR 0x4000 /* prom jumps to us here unless this is elf /boot */ |
| 7 | -#define BI_START (KERNBASE + 0x3000) /* beginning of the bootinfo records */ | |
| 8 | 7 | #define FC_CONTROL 3 |
| 9 | 8 | #define FC_SUPERD 5 |
| 10 | 9 | #define FC_CPU 7 |