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

Commit 906430a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] xen: fix xen_get_eflags.
  [IA64] ia64/pv_ops/pv_cpu_ops: fix _IA64_REG_IP case.
  [IA64] remove duplicate include iommu.h
  [IA64] use mprintk instead of printk, in ia64_mca_modify_original_stack
  [IA64] Rationalize kernel mode alignment checking
parents ba721d31 0090d481

arch/ia64/include/asm/intrinsics.h

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); 
/************************************************/

#define ia64_ssm			IA64_INTRINSIC_MACRO(ssm)

#define ia64_rsm			IA64_INTRINSIC_MACRO(rsm)

#define ia64_getreg			IA64_INTRINSIC_API(getreg)

#define ia64_getreg			IA64_INTRINSIC_MACRO(getreg)

#define ia64_setreg			IA64_INTRINSIC_API(setreg)

#define ia64_set_rr			IA64_INTRINSIC_API(set_rr)

#define ia64_get_rr			IA64_INTRINSIC_API(get_rr)

arch/ia64/include/asm/paravirt_privop.h

+13 −0
Original line number Diff line number Diff line
@@ -78,6 +78,19 @@ extern unsigned long ia64_native_getreg_func(int regnum); 
			ia64_native_rsm(mask);	\

	} while (0)



/* returned ip value should be the one in the caller,

 * not in __paravirt_getreg() */

#define paravirt_getreg(reg)					\

	({							\

		unsigned long res;				\

		BUILD_BUG_ON(!__builtin_constant_p(reg));	\

		if ((reg) == _IA64_REG_IP)			\

			res = ia64_native_getreg(_IA64_REG_IP); \

		else						\

			res = pv_cpu_ops.getreg(reg);		\

		res;						\

	})



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

 * replacement of hand written assembly codes.

 */

arch/ia64/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ GLOBAL_ENTRY(prefetch_stack) 
END(prefetch_stack)



GLOBAL_ENTRY(kernel_execve)

	rum psr.ac

	mov r15=__NR_execve			// put syscall number in place

	break __BREAK_SYSCALL

	br.ret.sptk.many rp

arch/ia64/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ start_ap: 
	 * Switch into virtual mode:

	 */

	movl r16=(IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH|IA64_PSR_BN \

		  |IA64_PSR_DI)

		  |IA64_PSR_DI|IA64_PSR_AC)

	;;

	mov cr.ipsr=r16

	movl r17=1f

arch/ia64/kernel/mca.c

+1 −1
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ ia64_mca_modify_original_stack(struct pt_regs *regs, 
	return previous_current;



no_mod:

	printk(KERN_INFO "cpu %d, %s %s, original stack not modified\n",

	mprintk(KERN_INFO "cpu %d, %s %s, original stack not modified\n",

			smp_processor_id(), type, msg);

	return previous_current;

}