Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/m68knommu/kernel/asm-offsets.c

+14 −14
Original line number Diff line number Diff line
@@ -45,25 +45,25 @@ int main(void) 
	DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));



	/* offsets into the pt_regs */

	DEFINE(PT_D0, offsetof(struct pt_regs, d0));

	DEFINE(PT_ORIG_D0, offsetof(struct pt_regs, orig_d0));

	DEFINE(PT_D1, offsetof(struct pt_regs, d1));

	DEFINE(PT_D2, offsetof(struct pt_regs, d2));

	DEFINE(PT_D3, offsetof(struct pt_regs, d3));

	DEFINE(PT_D4, offsetof(struct pt_regs, d4));

	DEFINE(PT_D5, offsetof(struct pt_regs, d5));

	DEFINE(PT_A0, offsetof(struct pt_regs, a0));

	DEFINE(PT_A1, offsetof(struct pt_regs, a1));

	DEFINE(PT_A2, offsetof(struct pt_regs, a2));

	DEFINE(PT_PC, offsetof(struct pt_regs, pc));

	DEFINE(PT_SR, offsetof(struct pt_regs, sr));

	DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0));

	DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0));

	DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1));

	DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2));

	DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3));

	DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4));

	DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5));

	DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0));

	DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1));

	DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2));

	DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc));

	DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr));



#ifdef CONFIG_COLDFIRE

	/* 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

	/* 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



	/* signal defines */

arch/m68knommu/kernel/entry.S

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
ENTRY(buserr)

	SAVE_ALL

	moveq	#-1,%d0

	movel	%d0,%sp@(PT_ORIG_D0)

	movel	%d0,%sp@(PT_OFF_ORIG_D0)

	movel	%sp,%sp@- 		/* stack frame pointer argument */

	jsr	buserr_c

	addql	#4,%sp
@@ -55,7 +55,7 @@ ENTRY(buserr) 
ENTRY(trap)

	SAVE_ALL

	moveq	#-1,%d0

	movel	%d0,%sp@(PT_ORIG_D0)

	movel	%d0,%sp@(PT_OFF_ORIG_D0)

	movel	%sp,%sp@- 		/* stack frame pointer argument */

	jsr	trap_c

	addql	#4,%sp
@@ -67,7 +67,7 @@ ENTRY(trap) 
ENTRY(dbginterrupt)

	SAVE_ALL

	moveq	#-1,%d0

	movel	%d0,%sp@(PT_ORIG_D0)

	movel	%d0,%sp@(PT_OFF_ORIG_D0)

	movel	%sp,%sp@- 		/* stack frame pointer argument */

	jsr	dbginterrupt_c

	addql	#4,%sp

arch/m68knommu/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
		totalram_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

arch/m68knommu/platform/5206e/config.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <asm/mcfsim.h>

#include <asm/mcfuart.h>

#include <asm/mcfdma.h>

#include <asm/mcfuart.h>



/***************************************************************************/

arch/m68knommu/platform/68328/entry.S

+16 −16
Original line number Diff line number Diff line
@@ -39,17 +39,17 @@ 
.globl inthandler7



badsys:

	movel	#-ENOSYS,%sp@(PT_D0)

	movel	#-ENOSYS,%sp@(PT_OFF_D0)

	jra	ret_from_exception



do_trace:

	movel	#-ENOSYS,%sp@(PT_D0)	/* needed for strace*/

	movel	#-ENOSYS,%sp@(PT_OFF_D0)	/* needed for strace*/

	subql	#4,%sp

	SAVE_SWITCH_STACK

	jbsr	syscall_trace

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	movel	%sp@(PT_ORIG_D0),%d1

	movel	%sp@(PT_OFF_ORIG_D0),%d1

	movel	#-ENOSYS,%d0

	cmpl	#NR_syscalls,%d1

	jcc	1f
@@ -57,7 +57,7 @@ do_trace: 
	lea	sys_call_table, %a0

	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 */

	SAVE_SWITCH_STACK

	jbsr	syscall_trace
@@ -75,7 +75,7 @@ ENTRY(system_call) 
	jbsr    set_esp0

	addql   #4,%sp



	movel	%sp@(PT_ORIG_D0),%d0

	movel	%sp@(PT_OFF_ORIG_D0),%d0



	movel	%sp,%d1			/* get thread_info pointer */

	andl	#-THREAD_SIZE,%d1
@@ -88,10 +88,10 @@ ENTRY(system_call) 
	lea	sys_call_table,%a0

	movel	%a0@(%d0), %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:

	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*/



Lkernel_return:
@@ -133,7 +133,7 @@ Lreturn: 
 */

inthandler1:

	SAVE_ALL

	movew	%sp@(PT_VECTOR), %d0

	movew	%sp@(PT_OFF_VECTOR), %d0

	and	#0x3ff, %d0



	movel	%sp,%sp@-
@@ -144,7 +144,7 @@ inthandler1: 


inthandler2:

	SAVE_ALL

	movew	%sp@(PT_VECTOR), %d0

	movew	%sp@(PT_OFF_VECTOR), %d0

	and	#0x3ff, %d0



	movel	%sp,%sp@-
@@ -155,7 +155,7 @@ inthandler2: 


inthandler3:

	SAVE_ALL

	movew	%sp@(PT_VECTOR), %d0

	movew	%sp@(PT_OFF_VECTOR), %d0

	and	#0x3ff, %d0



	movel	%sp,%sp@-
@@ -166,7 +166,7 @@ inthandler3: 


inthandler4:

	SAVE_ALL

	movew	%sp@(PT_VECTOR), %d0

	movew	%sp@(PT_OFF_VECTOR), %d0

	and	#0x3ff, %d0



	movel	%sp,%sp@-
@@ -177,7 +177,7 @@ inthandler4: 


inthandler5:

	SAVE_ALL

	movew	%sp@(PT_VECTOR), %d0

	movew	%sp@(PT_OFF_VECTOR), %d0

	and	#0x3ff, %d0



	movel	%sp,%sp@-
@@ -188,7 +188,7 @@ inthandler5: 


inthandler6:

	SAVE_ALL

	movew	%sp@(PT_VECTOR), %d0

	movew	%sp@(PT_OFF_VECTOR), %d0

	and	#0x3ff, %d0



	movel	%sp,%sp@-
@@ -199,7 +199,7 @@ inthandler6: 


inthandler7:

	SAVE_ALL

	movew	%sp@(PT_VECTOR), %d0

	movew	%sp@(PT_OFF_VECTOR), %d0

	and	#0x3ff, %d0



	movel	%sp,%sp@-
@@ -210,7 +210,7 @@ inthandler7: 


inthandler:

	SAVE_ALL

	movew	%sp@(PT_VECTOR), %d0

	movew	%sp@(PT_OFF_VECTOR), %d0

	and	#0x3ff, %d0



	movel	%sp,%sp@-
@@ -224,7 +224,7 @@ ret_from_interrupt: 
2:

	RESTORE_ALL

1:

	moveb	%sp@(PT_SR), %d0

	moveb	%sp@(PT_OFF_SR), %d0

	and	#7, %d0

	jhi	2b