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

Commit 4e3408d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-locking-for-linus' of... 

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits)
  locking, m68k/asm-offsets: Rename signal defines
  locking: Inline spinlock code for all locking variants on s390
  locking: Simplify spinlock inlining
  locking: Allow arch-inlined spinlocks
  locking: Move spinlock function bodies to header file
  locking, m68k: Calculate thread_info offset with asm offset
  locking, m68k/asm-offsets: Rename pt_regs offset defines
  locking, sparc: Rename __spin_try_lock() and friends
  locking, powerpc: Rename __spin_try_lock() and friends
  lockdep: Remove recursion stattistics
  lockdep: Simplify lock_stat seqfile code
  lockdep: Simplify lockdep_chains seqfile code
  lockdep: Simplify lockdep seqfile code
  lockdep: Fix missing entries in /proc/lock_chains
  lockdep: Fix missing entry in /proc/lock_stat
  lockdep: Fix memory usage info of BFS
  lockdep: Reintroduce generation count to make BFS faster
  lockdep: Deal with many similar locks
  lockdep: Introduce lockdep_assert_held()
  lockdep: Fix style nits
  ...
parents a66a5005 96910b6d

arch/m68k/include/asm/entry_mm.h

+0 −4
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#define curptr a2



LFLUSH_I_AND_D = 0x00000808

LSIGTRAP = 5



/* process bits for task_struct.ptrace */

PT_TRACESYS_OFF = 3
@@ -118,9 +117,6 @@ PT_DTRACE_BIT = 2 
#define STR(X) STR1(X)

#define STR1(X) #X



#define PT_OFF_ORIG_D0	 0x24

#define PT_OFF_FORMATVEC 0x32

#define PT_OFF_SR	 0x2C

#define SAVE_ALL_INT				\

	"clrl	%%sp@-;"    /* stk_adj */	\

	"pea	-1:w;"	    /* orig d0 = -1 */	\

arch/m68k/include/asm/entry_no.h

+4 −4
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ LENOSYS = 38 
	lea	%sp@(-32),%sp		/* space for 8 regs */

	moveml	%d1-%d5/%a0-%a2,%sp@

	movel	sw_usp,%a0		/* get usp */

	movel	%a0@-,%sp@(PT_PC)	/* copy exception program counter */

	movel	%a0@-,%sp@(PT_FORMATVEC)/* copy exception format/vector/sr */

	movel	%a0@-,%sp@(PT_OFF_PC)	/* copy exception program counter */

	movel	%a0@-,%sp@(PT_OFF_FORMATVEC)/*copy exception format/vector/sr */

	bra	7f

	6:

	clrl	%sp@-			/* stkadj */
@@ -89,8 +89,8 @@ LENOSYS = 38 
	bnes	8f			/* no, skip */

	move	#0x2700,%sr		/* disable intrs */

	movel	sw_usp,%a0		/* get usp */

	movel	%sp@(PT_PC),%a0@-	/* copy exception program counter */

	movel	%sp@(PT_FORMATVEC),%a0@-/* copy exception format/vector/sr */

	movel	%sp@(PT_OFF_PC),%a0@-	/* copy exception program counter */

	movel	%sp@(PT_OFF_FORMATVEC),%a0@-/*copy exception format/vector/sr */

	moveml	%sp@,%d1-%d5/%a0-%a2

	lea	%sp@(32),%sp		/* space for 8 regs */

	movel	%sp@+,%d0

arch/m68k/include/asm/math-emu.h

+10 −10
Original line number Diff line number Diff line
@@ -145,16 +145,16 @@ extern unsigned int fp_debugprint; 
 * these are only used during instruction decoding

 * where we always know how deep we're on the stack.

 */

#define FPS_DO		(PT_D0)

#define FPS_D1		(PT_D1)

#define FPS_D2		(PT_D2)

#define FPS_A0		(PT_A0)

#define FPS_A1		(PT_A1)

#define FPS_A2		(PT_A2)

#define FPS_SR		(PT_SR)

#define FPS_PC		(PT_PC)

#define FPS_EA		(PT_PC+6)

#define FPS_PC2		(PT_PC+10)

#define FPS_DO		(PT_OFF_D0)

#define FPS_D1		(PT_OFF_D1)

#define FPS_D2		(PT_OFF_D2)

#define FPS_A0		(PT_OFF_A0)

#define FPS_A1		(PT_OFF_A1)

#define FPS_A2		(PT_OFF_A2)

#define FPS_SR		(PT_OFF_SR)

#define FPS_PC		(PT_OFF_PC)

#define FPS_EA		(PT_OFF_PC+6)

#define FPS_PC2		(PT_OFF_PC+10)



.macro	fp_get_fp_reg

	lea	(FPD_FPREG,FPDATA,%d0.w*4),%a0

arch/m68k/include/asm/thread_info_mm.h

+10 −1
Original line number Diff line number Diff line 
#ifndef _ASM_M68K_THREAD_INFO_H

#define _ASM_M68K_THREAD_INFO_H



#ifndef ASM_OFFSETS_C

#include <asm/asm-offsets.h>

#endif

#include <asm/current.h>

#include <asm/types.h>

#include <asm/page.h>
@@ -31,7 +35,12 @@ struct thread_info { 
#define init_thread_info	(init_task.thread.info)

#define init_stack		(init_thread_union.stack)



#define task_thread_info(tsk)	(&(tsk)->thread.info)

#ifdef ASM_OFFSETS_C

#define task_thread_info(tsk)	((struct thread_info *) NULL)

#else

#define task_thread_info(tsk)	((struct thread_info *)((char *)tsk+TASK_TINFO))

#endif



#define task_stack_page(tsk)	((tsk)->stack)

#define current_thread_info()	task_thread_info(current)

arch/m68k/kernel/asm-offsets.c

+22 −17
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
 * #defines from the assembly-language output.

 */



#define ASM_OFFSETS_C



#include <linux/stddef.h>

#include <linux/sched.h>

#include <linux/kernel_stat.h>
@@ -27,6 +29,9 @@ int main(void) 
	DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));

	DEFINE(TASK_MM, offsetof(struct task_struct, mm));

	DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));

#ifdef CONFIG_MMU

	DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info));

#endif



	/* offsets into the thread struct */

	DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));
@@ -44,20 +49,20 @@ int main(void) 
	DEFINE(TINFO_FLAGS, offsetof(struct thread_info, flags));



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

	/* bitfields are a bit difficult */

	DEFINE(PT_VECTOR, offsetof(struct pt_regs, pc) + 4);

	DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4);



	/* offsets into the irq_handler struct */

	DEFINE(IRQ_HANDLER, offsetof(struct irq_node, handler));
@@ -84,10 +89,10 @@ int main(void) 
	DEFINE(FONT_DESC_PREF, offsetof(struct font_desc, pref));



	/* signal defines */

	DEFINE(SIGSEGV, SIGSEGV);

	DEFINE(SEGV_MAPERR, SEGV_MAPERR);

	DEFINE(SIGTRAP, SIGTRAP);

	DEFINE(TRAP_TRACE, TRAP_TRACE);

	DEFINE(LSIGSEGV, SIGSEGV);

	DEFINE(LSEGV_MAPERR, SEGV_MAPERR);

	DEFINE(LSIGTRAP, SIGTRAP);

	DEFINE(LTRAP_TRACE, TRAP_TRACE);



	/* offsets into the custom struct */

	DEFINE(CUSTOMBASE, &amiga_custom);