Skip to content

L
linux
Commit 5b1755f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix rename of pt_regs offset defines breakage
  m68knommu: remove duplicated #include
  m68knommu: show KiB rather than pages in "Freeing initrd memory:" message
parents 374576a8 c84b564e
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 53 deletions
arch/m68knommu/kernel/asm-offsets.c
View file @ 5b1755f2
...@@ -45,25 +45,25 @@ int main(void) ...@@ -45,25 +45,25 @@ int main(void)
DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate)); DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
/* offsets into the pt_regs */ /* offsets into the pt_regs */
DEFINE(PT_D0, offsetof(struct pt_regs, d0)); DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0));
DEFINE(PT_ORIG_D0, offsetof(struct pt_regs, orig_d0)); DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0));
DEFINE(PT_D1, offsetof(struct pt_regs, d1)); DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1));
DEFINE(PT_D2, offsetof(struct pt_regs, d2)); DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2));
DEFINE(PT_D3, offsetof(struct pt_regs, d3)); DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3));
DEFINE(PT_D4, offsetof(struct pt_regs, d4)); DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4));
DEFINE(PT_D5, offsetof(struct pt_regs, d5)); DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5));
DEFINE(PT_A0, offsetof(struct pt_regs, a0)); DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0));
DEFINE(PT_A1, offsetof(struct pt_regs, a1)); DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1));
DEFINE(PT_A2, offsetof(struct pt_regs, a2)); DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2));
DEFINE(PT_PC, offsetof(struct pt_regs, pc)); DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc));
DEFINE(PT_SR, offsetof(struct pt_regs, sr)); DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr));
#ifdef CONFIG_COLDFIRE #ifdef CONFIG_COLDFIRE
/* bitfields are a bit difficult */ /* bitfields are a bit difficult */
DEFINE(PT_FORMATVEC, offsetof(struct pt_regs, sr) - 2); DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, sr) - 2);
#else #else
/* bitfields are a bit difficult */ /* bitfields are a bit difficult */
DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) + 4); DEFINE(PT_OFF_VECTOR, offsetof(struct pt_regs, pc) + 4);
#endif #endif
/* signal defines */ /* signal defines */
......
arch/m68knommu/kernel/entry.S
View file @ 5b1755f2
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
ENTRY(buserr) ENTRY(buserr)
SAVE_ALL SAVE_ALL
moveq #-1,%d0 moveq #-1,%d0
movel %d0,%sp@(PT_ORIG_D0) movel %d0,%sp@(PT_OFF_ORIG_D0)
movel %sp,%sp@- /* stack frame pointer argument */ movel %sp,%sp@- /* stack frame pointer argument */
jsr buserr_c jsr buserr_c
addql #4,%sp addql #4,%sp
...@@ -55,7 +55,7 @@ ENTRY(buserr) ...@@ -55,7 +55,7 @@ ENTRY(buserr)
ENTRY(trap) ENTRY(trap)
SAVE_ALL SAVE_ALL
moveq #-1,%d0 moveq #-1,%d0
movel %d0,%sp@(PT_ORIG_D0) movel %d0,%sp@(PT_OFF_ORIG_D0)
movel %sp,%sp@- /* stack frame pointer argument */ movel %sp,%sp@- /* stack frame pointer argument */
jsr trap_c jsr trap_c
addql #4,%sp addql #4,%sp
...@@ -67,7 +67,7 @@ ENTRY(trap) ...@@ -67,7 +67,7 @@ ENTRY(trap)
ENTRY(dbginterrupt) ENTRY(dbginterrupt)
SAVE_ALL SAVE_ALL
moveq #-1,%d0 moveq #-1,%d0
movel %d0,%sp@(PT_ORIG_D0) movel %d0,%sp@(PT_OFF_ORIG_D0)
movel %sp,%sp@- /* stack frame pointer argument */ movel %sp,%sp@- /* stack frame pointer argument */
jsr dbginterrupt_c jsr dbginterrupt_c
addql #4,%sp addql #4,%sp
......
arch/m68knommu/mm/init.c
View file @ 5b1755f2
...@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) ...@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
totalram_pages++; totalram_pages++;
pages++; pages++;
} }
printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages); printk (KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages * (PAGE_SIZE / 1024));
} }
#endif #endif
......
arch/m68knommu/platform/5206e/config.c
View file @ 5b1755f2
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <asm/mcfsim.h> #include <asm/mcfsim.h>
#include <asm/mcfuart.h> #include <asm/mcfuart.h>
#include <asm/mcfdma.h> #include <asm/mcfdma.h>
#include <asm/mcfuart.h>
/***************************************************************************/ /***************************************************************************/
......
arch/m68knommu/platform/68328/entry.S
View file @ 5b1755f2
...@@ -39,17 +39,17 @@ ...@@ -39,17 +39,17 @@
.globl inthandler7 .globl inthandler7
badsys: badsys:
movel #-ENOSYS,%sp@(PT_D0) movel #-ENOSYS,%sp@(PT_OFF_D0)
jra ret_from_exception jra ret_from_exception
do_trace: do_trace:
movel #-ENOSYS,%sp@(PT_D0) /* needed for strace*/ movel #-ENOSYS,%sp@(PT_OFF_D0) /* needed for strace*/
subql #4,%sp subql #4,%sp
SAVE_SWITCH_STACK SAVE_SWITCH_STACK
jbsr syscall_trace jbsr syscall_trace
RESTORE_SWITCH_STACK RESTORE_SWITCH_STACK
addql #4,%sp addql #4,%sp
movel %sp@(PT_ORIG_D0),%d1 movel %sp@(PT_OFF_ORIG_D0),%d1
movel #-ENOSYS,%d0 movel #-ENOSYS,%d0
cmpl #NR_syscalls,%d1 cmpl #NR_syscalls,%d1
jcc 1f jcc 1f
...@@ -57,7 +57,7 @@ do_trace: ...@@ -57,7 +57,7 @@ do_trace:
lea sys_call_table, %a0 lea sys_call_table, %a0
jbsr %a0@(%d1) jbsr %a0@(%d1)
1: movel %d0,%sp@(PT_D0) /* save the return value */ 1: movel %d0,%sp@(PT_OFF_D0) /* save the return value */
subql #4,%sp /* dummy return address */ subql #4,%sp /* dummy return address */
SAVE_SWITCH_STACK SAVE_SWITCH_STACK
jbsr syscall_trace jbsr syscall_trace
...@@ -75,7 +75,7 @@ ENTRY(system_call) ...@@ -75,7 +75,7 @@ ENTRY(system_call)
jbsr set_esp0 jbsr set_esp0
addql #4,%sp addql #4,%sp
movel %sp@(PT_ORIG_D0),%d0 movel %sp@(PT_OFF_ORIG_D0),%d0
movel %sp,%d1 /* get thread_info pointer */ movel %sp,%d1 /* get thread_info pointer */
andl #-THREAD_SIZE,%d1 andl #-THREAD_SIZE,%d1
...@@ -88,10 +88,10 @@ ENTRY(system_call) ...@@ -88,10 +88,10 @@ ENTRY(system_call)
lea sys_call_table,%a0 lea sys_call_table,%a0
movel %a0@(%d0), %a0 movel %a0@(%d0), %a0
jbsr %a0@ jbsr %a0@
movel %d0,%sp@(PT_D0) /* save the return value*/ movel %d0,%sp@(PT_OFF_D0) /* save the return value*/
ret_from_exception: ret_from_exception:
btst #5,%sp@(PT_SR) /* check if returning to kernel*/ btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel*/
jeq Luser_return /* if so, skip resched, signals*/ jeq Luser_return /* if so, skip resched, signals*/
Lkernel_return: Lkernel_return:
...@@ -133,7 +133,7 @@ Lreturn: ...@@ -133,7 +133,7 @@ Lreturn:
*/ */
inthandler1: inthandler1:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and #0x3ff, %d0 and #0x3ff, %d0
movel %sp,%sp@- movel %sp,%sp@-
...@@ -144,7 +144,7 @@ inthandler1: ...@@ -144,7 +144,7 @@ inthandler1:
inthandler2: inthandler2:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and #0x3ff, %d0 and #0x3ff, %d0
movel %sp,%sp@- movel %sp,%sp@-
...@@ -155,7 +155,7 @@ inthandler2: ...@@ -155,7 +155,7 @@ inthandler2:
inthandler3: inthandler3:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and #0x3ff, %d0 and #0x3ff, %d0
movel %sp,%sp@- movel %sp,%sp@-
...@@ -166,7 +166,7 @@ inthandler3: ...@@ -166,7 +166,7 @@ inthandler3:
inthandler4: inthandler4:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and #0x3ff, %d0 and #0x3ff, %d0
movel %sp,%sp@- movel %sp,%sp@-
...@@ -177,7 +177,7 @@ inthandler4: ...@@ -177,7 +177,7 @@ inthandler4:
inthandler5: inthandler5:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and #0x3ff, %d0 and #0x3ff, %d0
movel %sp,%sp@- movel %sp,%sp@-
...@@ -188,7 +188,7 @@ inthandler5: ...@@ -188,7 +188,7 @@ inthandler5:
inthandler6: inthandler6:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and #0x3ff, %d0 and #0x3ff, %d0
movel %sp,%sp@- movel %sp,%sp@-
...@@ -199,7 +199,7 @@ inthandler6: ...@@ -199,7 +199,7 @@ inthandler6:
inthandler7: inthandler7:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and #0x3ff, %d0 and #0x3ff, %d0
movel %sp,%sp@- movel %sp,%sp@-
...@@ -210,7 +210,7 @@ inthandler7: ...@@ -210,7 +210,7 @@ inthandler7:
inthandler: inthandler:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and #0x3ff, %d0 and #0x3ff, %d0
movel %sp,%sp@- movel %sp,%sp@-
...@@ -224,7 +224,7 @@ ret_from_interrupt: ...@@ -224,7 +224,7 @@ ret_from_interrupt:
2: 2:
RESTORE_ALL RESTORE_ALL
1: 1:
moveb %sp@(PT_SR), %d0 moveb %sp@(PT_OFF_SR), %d0
and #7, %d0 and #7, %d0
jhi 2b jhi 2b
......
arch/m68knommu/platform/68360/entry.S
View file @ 5b1755f2
...@@ -35,17 +35,17 @@ ...@@ -35,17 +35,17 @@
.globl inthandler .globl inthandler
badsys: badsys:
movel #-ENOSYS,%sp@(PT_D0) movel #-ENOSYS,%sp@(PT_OFF_D0)
jra ret_from_exception jra ret_from_exception
do_trace: do_trace:
movel #-ENOSYS,%sp@(PT_D0) /* needed for strace*/ movel #-ENOSYS,%sp@(PT_OFF_D0) /* needed for strace*/
subql #4,%sp subql #4,%sp
SAVE_SWITCH_STACK SAVE_SWITCH_STACK
jbsr syscall_trace jbsr syscall_trace
RESTORE_SWITCH_STACK RESTORE_SWITCH_STACK
addql #4,%sp addql #4,%sp
movel %sp@(PT_ORIG_D0),%d1 movel %sp@(PT_OFF_ORIG_D0),%d1
movel #-ENOSYS,%d0 movel #-ENOSYS,%d0
cmpl #NR_syscalls,%d1 cmpl #NR_syscalls,%d1
jcc 1f jcc 1f
...@@ -53,7 +53,7 @@ do_trace: ...@@ -53,7 +53,7 @@ do_trace:
lea sys_call_table, %a0 lea sys_call_table, %a0
jbsr %a0@(%d1) jbsr %a0@(%d1)
1: movel %d0,%sp@(PT_D0) /* save the return value */ 1: movel %d0,%sp@(PT_OFF_D0) /* save the return value */
subql #4,%sp /* dummy return address */ subql #4,%sp /* dummy return address */
SAVE_SWITCH_STACK SAVE_SWITCH_STACK
jbsr syscall_trace jbsr syscall_trace
...@@ -79,10 +79,10 @@ ENTRY(system_call) ...@@ -79,10 +79,10 @@ ENTRY(system_call)
lea sys_call_table,%a0 lea sys_call_table,%a0
movel %a0@(%d0), %a0 movel %a0@(%d0), %a0
jbsr %a0@ jbsr %a0@
movel %d0,%sp@(PT_D0) /* save the return value*/ movel %d0,%sp@(PT_OFF_D0) /* save the return value*/
ret_from_exception: ret_from_exception:
btst #5,%sp@(PT_SR) /* check if returning to kernel*/ btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel*/
jeq Luser_return /* if so, skip resched, signals*/ jeq Luser_return /* if so, skip resched, signals*/
Lkernel_return: Lkernel_return:
...@@ -124,7 +124,7 @@ Lreturn: ...@@ -124,7 +124,7 @@ Lreturn:
*/ */
inthandler: inthandler:
SAVE_ALL SAVE_ALL
movew %sp@(PT_VECTOR), %d0 movew %sp@(PT_OFF_VECTOR), %d0
and.l #0x3ff, %d0 and.l #0x3ff, %d0
lsr.l #0x02, %d0 lsr.l #0x02, %d0
...@@ -139,7 +139,7 @@ ret_from_interrupt: ...@@ -139,7 +139,7 @@ ret_from_interrupt:
2: 2:
RESTORE_ALL RESTORE_ALL
1: 1:
moveb %sp@(PT_SR), %d0 moveb %sp@(PT_OFF_SR), %d0
and #7, %d0 and #7, %d0
jhi 2b jhi 2b
/* check if we need to do software interrupts */ /* check if we need to do software interrupts */
......
arch/m68knommu/platform/coldfire/entry.S
View file @ 5b1755f2
...@@ -81,11 +81,11 @@ ENTRY(system_call) ...@@ -81,11 +81,11 @@ ENTRY(system_call)
movel %d3,%a0 movel %d3,%a0
jbsr %a0@ jbsr %a0@
movel %d0,%sp@(PT_D0) /* save the return value */ movel %d0,%sp@(PT_OFF_D0) /* save the return value */
jra ret_from_exception jra ret_from_exception
1: 1:
movel #-ENOSYS,%d2 /* strace needs -ENOSYS in PT_D0 */ movel #-ENOSYS,%d2 /* strace needs -ENOSYS in PT_OFF_D0 */
movel %d2,PT_D0(%sp) /* on syscall entry */ movel %d2,PT_OFF_D0(%sp) /* on syscall entry */
subql #4,%sp subql #4,%sp
SAVE_SWITCH_STACK SAVE_SWITCH_STACK
jbsr syscall_trace jbsr syscall_trace
...@@ -93,7 +93,7 @@ ENTRY(system_call) ...@@ -93,7 +93,7 @@ ENTRY(system_call)
addql #4,%sp addql #4,%sp
movel %d3,%a0 movel %d3,%a0
jbsr %a0@ jbsr %a0@
movel %d0,%sp@(PT_D0) /* save the return value */ movel %d0,%sp@(PT_OFF_D0) /* save the return value */
subql #4,%sp /* dummy return address */ subql #4,%sp /* dummy return address */
SAVE_SWITCH_STACK SAVE_SWITCH_STACK
jbsr syscall_trace jbsr syscall_trace
...@@ -104,7 +104,7 @@ ret_from_signal: ...@@ -104,7 +104,7 @@ ret_from_signal:
ret_from_exception: ret_from_exception:
move #0x2700,%sr /* disable intrs */ move #0x2700,%sr /* disable intrs */
btst #5,%sp@(PT_SR) /* check if returning to kernel */ btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel */
jeq Luser_return /* if so, skip resched, signals */ jeq Luser_return /* if so, skip resched, signals */
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
...@@ -142,8 +142,8 @@ Luser_return: ...@@ -142,8 +142,8 @@ Luser_return:
Lreturn: Lreturn:
move #0x2700,%sr /* disable intrs */ move #0x2700,%sr /* disable intrs */
movel sw_usp,%a0 /* get usp */ movel sw_usp,%a0 /* get usp */
movel %sp@(PT_PC),%a0@- /* copy exception program counter */ movel %sp@(PT_OFF_PC),%a0@- /* copy exception program counter */
movel %sp@(PT_FORMATVEC),%a0@-/* copy exception format/vector/sr */ movel %sp@(PT_OFF_FORMATVEC),%a0@- /* copy exception format/vector/sr */
moveml %sp@,%d1-%d5/%a0-%a2 moveml %sp@,%d1-%d5/%a0-%a2
lea %sp@(32),%sp /* space for 8 regs */ lea %sp@(32),%sp /* space for 8 regs */
movel %sp@+,%d0 movel %sp@+,%d0
...@@ -181,9 +181,9 @@ Lsignal_return: ...@@ -181,9 +181,9 @@ Lsignal_return:
ENTRY(inthandler) ENTRY(inthandler)
SAVE_ALL SAVE_ALL
moveq #-1,%d0 moveq #-1,%d0
movel %d0,%sp@(PT_ORIG_D0) movel %d0,%sp@(PT_OFF_ORIG_D0)
movew %sp@(PT_FORMATVEC),%d0 /* put exception # in d0 */ movew %sp@(PT_OFF_FORMATVEC),%d0 /* put exception # in d0 */
andl #0x03fc,%d0 /* mask out vector only */ andl #0x03fc,%d0 /* mask out vector only */
movel %sp,%sp@- /* push regs arg */ movel %sp,%sp@- /* push regs arg */
...@@ -203,7 +203,7 @@ ENTRY(inthandler) ...@@ -203,7 +203,7 @@ ENTRY(inthandler)
ENTRY(fasthandler) ENTRY(fasthandler)
SAVE_LOCAL SAVE_LOCAL
movew %sp@(PT_FORMATVEC),%d0 movew %sp@(PT_OFF_FORMATVEC),%d0
andl #0x03fc,%d0 /* mask out vector only */ andl #0x03fc,%d0 /* mask out vector only */
movel %sp,%sp@- /* push regs arg */ movel %sp,%sp@- /* push regs arg */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7