Commit 801493c2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/core 



Merge reason: pick up fixes that are upstream, we need them
              because we'll apply dependent patches.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 939ddcfa 74ea15d9

arch/m68k/atari/config.c

+4 −4
Original line number Diff line number Diff line
@@ -414,9 +414,9 @@ void __init config_atari(void) 
					 * FDC val = 4 -> Supervisor only */

		asm volatile ("\n"

			"	.chip	68030\n"

			"	pmove	%0@,%/tt1\n"

			"	pmove	%0,%/tt1\n"

			"	.chip	68k"

			: : "a" (&tt1_val));

			: : "m" (tt1_val));

	} else {

	        asm volatile ("\n"

			"	.chip	68040\n"
@@ -569,10 +569,10 @@ static void atari_reset(void) 
			: "d0");

	} else

		asm volatile ("\n"

			"	pmove	%0@,%%tc\n"

			"	pmove	%0,%%tc\n"

			"	jmp	%1@"

			: /* no outputs */

			: "a" (&tc_val), "a" (reset_addr));

			: "m" (tc_val), "a" (reset_addr));

}

arch/m68k/include/asm/irq.h

+0 −13
Original line number Diff line number Diff line
@@ -50,19 +50,6 @@ 


#define IRQ_USER	8



/*

 * various flags for request_irq() - the Amiga now uses the standard

 * mechanism like all other architectures - IRQF_DISABLED and

 * IRQF_SHARED are your friends.

 */

#ifndef MACH_AMIGA_ONLY

#define IRQ_FLG_LOCK	(0x0001)	/* handler is not replaceable	*/

#define IRQ_FLG_REPLACE	(0x0002)	/* replace existing handler	*/

#define IRQ_FLG_FAST	(0x0004)

#define IRQ_FLG_SLOW	(0x0008)

#define IRQ_FLG_STD	(0x8000)	/* internally used		*/

#endif



struct irq_data;

struct irq_chip;

struct irq_desc;

arch/m68k/kernel/process_mm.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ void flush_thread(void) 


	current->thread.fs = __USER_DS;

	if (!FPU_IS_EMU)

		asm volatile ("frestore %0@" : : "a" (&zero) : "memory");

		asm volatile("frestore %0": :"m" (zero));

}



/*

arch/m68k/kernel/process_no.c

+2 −2
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ void flush_thread(void) 
#ifdef CONFIG_FPU

	if (!FPU_IS_EMU)

		asm volatile (".chip 68k/68881\n\t"

			      "frestore %0@\n\t"

			      ".chip 68k" : : "a" (&zero));

			      "frestore %0\n\t"

			      ".chip 68k" : : "m" (zero));

#endif

}

arch/m68k/kernel/traps.c

+17 −19
Original line number Diff line number Diff line
@@ -552,13 +552,13 @@ static inline void bus_error030 (struct frame *fp) 


#ifdef DEBUG

		asm volatile ("ptestr %3,%2@,#7,%0\n\t"

			      "pmove %%psr,%1@"

			      : "=a&" (desc)

			      : "a" (&temp), "a" (addr), "d" (ssw));

			      "pmove %%psr,%1"

			      : "=a&" (desc), "=m" (temp)

			      : "a" (addr), "d" (ssw));

#else

		asm volatile ("ptestr %2,%1@,#7\n\t"

			      "pmove %%psr,%0@"

			      : : "a" (&temp), "a" (addr), "d" (ssw));

			      "pmove %%psr,%0"

			      : "=m" (temp) : "a" (addr), "d" (ssw));

#endif

		mmusr = temp;
@@ -605,20 +605,18 @@ static inline void bus_error030 (struct frame *fp) 
			       !(ssw & RW) ? "write" : "read", addr,

			       fp->ptregs.pc, ssw);

			asm volatile ("ptestr #1,%1@,#0\n\t"

				      "pmove %%psr,%0@"

				      : /* no outputs */

				      : "a" (&temp), "a" (addr));

				      "pmove %%psr,%0"

				      : "=m" (temp)

				      : "a" (addr));

			mmusr = temp;



			printk ("level 0 mmusr is %#x\n", mmusr);

#if 0

			asm volatile ("pmove %%tt0,%0@"

				      : /* no outputs */

				      : "a" (&tlong));

			asm volatile ("pmove %%tt0,%0"

				      : "=m" (tlong));

			printk("tt0 is %#lx, ", tlong);

			asm volatile ("pmove %%tt1,%0@"

				      : /* no outputs */

				      : "a" (&tlong));

			asm volatile ("pmove %%tt1,%0"

				      : "=m" (tlong));

			printk("tt1 is %#lx\n", tlong);

#endif

#ifdef DEBUG
@@ -668,13 +666,13 @@ static inline void bus_error030 (struct frame *fp) 


#ifdef DEBUG

	asm volatile ("ptestr #1,%2@,#7,%0\n\t"

		      "pmove %%psr,%1@"

		      : "=a&" (desc)

		      : "a" (&temp), "a" (addr));

		      "pmove %%psr,%1"

		      : "=a&" (desc), "=m" (temp)

		      : "a" (addr));

#else

	asm volatile ("ptestr #1,%1@,#7\n\t"

		      "pmove %%psr,%0@"

		      : : "a" (&temp), "a" (addr));

		      "pmove %%psr,%0"

		      : "=m" (temp) : "a" (addr));

#endif

	mmusr = temp;