diff options
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/head.S | 12 | ||||
-rw-r--r-- | arch/m68k/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux.lds_no.S | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index ef54128baa0b..27622b3273c1 100644 --- a/arch/m68k/kernel/head.S +++ b/arch/m68k/kernel/head.S | |||
@@ -134,7 +134,7 @@ | |||
134 | * Thanks to a small helping routine enabling the mmu got quite simple | 134 | * Thanks to a small helping routine enabling the mmu got quite simple |
135 | * and there is only one way left. mmu_engage makes a complete a new mapping | 135 | * and there is only one way left. mmu_engage makes a complete a new mapping |
136 | * that only includes the absolute necessary to be able to jump to the final | 136 | * that only includes the absolute necessary to be able to jump to the final |
137 | * postion and to restore the original mapping. | 137 | * position and to restore the original mapping. |
138 | * As this code doesn't need a transparent translation register anymore this | 138 | * As this code doesn't need a transparent translation register anymore this |
139 | * means all registers are free to be used by machines that needs them for | 139 | * means all registers are free to be used by machines that needs them for |
140 | * other purposes. | 140 | * other purposes. |
@@ -969,7 +969,7 @@ L(mmu_init_amiga): | |||
969 | is_not_040_or_060(1f) | 969 | is_not_040_or_060(1f) |
970 | 970 | ||
971 | /* | 971 | /* |
972 | * 040: Map the 16Meg range physical 0x0 upto logical 0x8000.0000 | 972 | * 040: Map the 16Meg range physical 0x0 up to logical 0x8000.0000 |
973 | */ | 973 | */ |
974 | mmu_map #0x80000000,#0,#0x01000000,#_PAGE_NOCACHE_S | 974 | mmu_map #0x80000000,#0,#0x01000000,#_PAGE_NOCACHE_S |
975 | /* | 975 | /* |
@@ -982,7 +982,7 @@ L(mmu_init_amiga): | |||
982 | 982 | ||
983 | 1: | 983 | 1: |
984 | /* | 984 | /* |
985 | * 030: Map the 32Meg range physical 0x0 upto logical 0x8000.0000 | 985 | * 030: Map the 32Meg range physical 0x0 up to logical 0x8000.0000 |
986 | */ | 986 | */ |
987 | mmu_map #0x80000000,#0,#0x02000000,#_PAGE_NOCACHE030 | 987 | mmu_map #0x80000000,#0,#0x02000000,#_PAGE_NOCACHE030 |
988 | mmu_map_tt #1,#0x40000000,#0x20000000,#_PAGE_NOCACHE030 | 988 | mmu_map_tt #1,#0x40000000,#0x20000000,#_PAGE_NOCACHE030 |
@@ -1074,7 +1074,7 @@ L(notq40): | |||
1074 | is_040(1f) | 1074 | is_040(1f) |
1075 | 1075 | ||
1076 | /* | 1076 | /* |
1077 | * 030: Map the 32Meg range physical 0x0 upto logical 0xf000.0000 | 1077 | * 030: Map the 32Meg range physical 0x0 up to logical 0xf000.0000 |
1078 | */ | 1078 | */ |
1079 | mmu_map #0xf0000000,#0,#0x02000000,#_PAGE_NOCACHE030 | 1079 | mmu_map #0xf0000000,#0,#0x02000000,#_PAGE_NOCACHE030 |
1080 | 1080 | ||
@@ -1082,7 +1082,7 @@ L(notq40): | |||
1082 | 1082 | ||
1083 | 1: | 1083 | 1: |
1084 | /* | 1084 | /* |
1085 | * 040: Map the 16Meg range physical 0x0 upto logical 0xf000.0000 | 1085 | * 040: Map the 16Meg range physical 0x0 up to logical 0xf000.0000 |
1086 | */ | 1086 | */ |
1087 | mmu_map #0xf0000000,#0,#0x01000000,#_PAGE_NOCACHE_S | 1087 | mmu_map #0xf0000000,#0,#0x01000000,#_PAGE_NOCACHE_S |
1088 | 1088 | ||
@@ -3078,7 +3078,7 @@ func_start serial_putc,%d0/%d1/%a0/%a1 | |||
3078 | /* | 3078 | /* |
3079 | * If the loader gave us a board type then we can use that to | 3079 | * If the loader gave us a board type then we can use that to |
3080 | * select an appropriate output routine; otherwise we just use | 3080 | * select an appropriate output routine; otherwise we just use |
3081 | * the Bug code. If we haev to use the Bug that means the Bug | 3081 | * the Bug code. If we have to use the Bug that means the Bug |
3082 | * workspace has to be valid, which means the Bug has to use | 3082 | * workspace has to be valid, which means the Bug has to use |
3083 | * the SRAM, which is non-standard. | 3083 | * the SRAM, which is non-standard. |
3084 | */ | 3084 | */ |
diff --git a/arch/m68k/kernel/irq.c b/arch/m68k/kernel/irq.c index c7dd48f37bee..15dbc3e9d20c 100644 --- a/arch/m68k/kernel/irq.c +++ b/arch/m68k/kernel/irq.c | |||
@@ -44,7 +44,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
44 | if (ap) { | 44 | if (ap) { |
45 | seq_printf(p, "%3d: ", irq); | 45 | seq_printf(p, "%3d: ", irq); |
46 | seq_printf(p, "%10u ", kstat_irqs(irq)); | 46 | seq_printf(p, "%10u ", kstat_irqs(irq)); |
47 | seq_printf(p, "%14s ", get_irq_desc_chip(desc)->name); | 47 | seq_printf(p, "%14s ", irq_desc_get_chip(desc)->name); |
48 | 48 | ||
49 | seq_printf(p, "%s", ap->name); | 49 | seq_printf(p, "%s", ap->name); |
50 | for (ap = ap->next; ap; ap = ap->next) | 50 | for (ap = ap->next; ap; ap = ap->next) |
diff --git a/arch/m68k/kernel/vmlinux.lds_no.S b/arch/m68k/kernel/vmlinux.lds_no.S index 47e15ebfd893..f4d715cdca0e 100644 --- a/arch/m68k/kernel/vmlinux.lds_no.S +++ b/arch/m68k/kernel/vmlinux.lds_no.S | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * (C) Copyright 2002-2006, Greg Ungerer <gerg@snapgear.com> | 4 | * (C) Copyright 2002-2006, Greg Ungerer <gerg@snapgear.com> |
5 | * | 5 | * |
6 | * This linker script is equiped to build either ROM loaded or RAM | 6 | * This linker script is equipped to build either ROM loaded or RAM |
7 | * run kernels. | 7 | * run kernels. |
8 | */ | 8 | */ |
9 | 9 | ||