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

Commit 8b53ef33 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: (29 commits)
  [IA64] BUG to BUG_ON changes
  [IA64] Fix typo/thinko in arch/ia64/sn/kernel/sn2/sn2_smp.c
  ia64: remove some warnings.
  ia64/xen: fix the link error.
  ia64/pv_ops/bp/xen: implemented binary patchable pv_cpu_ops.
  ia64/pv_ops/binary patch: define paravirt_dv_serialize_data() and suppress false positive warning.
  ia64/pv_ops/bp/module: support binary patching for kernel module.
  ia64/pv_ops: implement binary patching optimization for native.
  ia64/pv_op/binarypatch: add helper functions to support binary patching for paravirt_ops.
  ia64/pv_ops/xen/gate.S: xen gate page paravirtualization
  ia64/pv_ops: paravirtualize gate.S.
  ia64/pv_ops: move down __kernel_syscall_via_epc.
  ia64/pv_ops/xen: define xen specific gate page.
  ia64/pv_ops: gate page paravirtualization.
  ia64/pv_ops/xen/pv_time_ops: implement sched_clock.
  ia64/pv_ops/pv_time_ops: add sched_clock hook.
  ia64/pv_ops/xen: paravirtualize read/write ar.itc and ar.itm
  ia64/pv_ops: paravirtualize mov = ar.itc.
  ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization
  ia64/pv_ops: paravirtualize fsys.S.
  ...
parents ef5ddd3d 80a03e29

arch/ia64/include/asm/intrinsics.h

+5 −1
Original line number Diff line number Diff line
@@ -202,7 +202,11 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); 


#ifndef __ASSEMBLY__

#if defined(CONFIG_PARAVIRT) && defined(__KERNEL__)

#ifdef ASM_SUPPORTED

# define IA64_INTRINSIC_API(name)	paravirt_ ## name

#else

# define IA64_INTRINSIC_API(name)	pv_cpu_ops.name

#endif

#define IA64_INTRINSIC_MACRO(name)	paravirt_ ## name

#else

#define IA64_INTRINSIC_API(name)	ia64_native_ ## name

arch/ia64/include/asm/mmu_context.h

+3 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ get_mmu_context (struct mm_struct *mm) 
	/* re-check, now that we've got the lock: */

	context = mm->context;

	if (context == 0) {

		cpus_clear(mm->cpu_vm_mask);

		cpumask_clear(mm_cpumask(mm));

		if (ia64_ctx.next >= ia64_ctx.limit) {

			ia64_ctx.next = find_next_zero_bit(ia64_ctx.bitmap,

					ia64_ctx.max_ctx, ia64_ctx.next);
@@ -166,8 +166,8 @@ activate_context (struct mm_struct *mm) 


	do {

		context = get_mmu_context(mm);

		if (!cpu_isset(smp_processor_id(), mm->cpu_vm_mask))

			cpu_set(smp_processor_id(), mm->cpu_vm_mask);

		if (!cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm)))

			cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));

		reload_context(context);

		/*

		 * in the unlikely event of a TLB-flush by another thread,

arch/ia64/include/asm/module.h

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ struct mod_arch_specific { 
	struct elf64_shdr *got;		/* global offset table */

	struct elf64_shdr *opd;		/* official procedure descriptors */

	struct elf64_shdr *unwind;	/* unwind-table section */

#ifdef CONFIG_PARAVIRT

	struct elf64_shdr *paravirt_bundles;

					/* paravirt_alt_bundle_patch table */

	struct elf64_shdr *paravirt_insts;

					/* paravirt_alt_inst_patch table */

#endif

	unsigned long gp;		/* global-pointer for module */



	void *core_unw_table;		/* core unwind-table cookie returned by unwinder */

arch/ia64/include/asm/native/inst.h

+13 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
#define __paravirt_work_processed_syscall_target \

						ia64_work_processed_syscall



#define paravirt_fsyscall_table			ia64_native_fsyscall_table

#define paravirt_fsys_bubble_down		ia64_native_fsys_bubble_down



#ifdef CONFIG_PARAVIRT_GUEST_ASM_CLOBBER_CHECK

# define PARAVIRT_POISON	0xdeadbeefbaadf00d

# define CLOBBER(clob)				\
@@ -74,6 +77,11 @@ 
(pred)	mov reg = psr			\

	CLOBBER(clob)



#define MOV_FROM_ITC(pred, pred_clob, reg, clob)	\

(pred)	mov reg = ar.itc				\

	CLOBBER(clob)					\

	CLOBBER_PRED(pred_clob)



#define MOV_TO_IFA(reg, clob)	\

	mov cr.ifa = reg	\

	CLOBBER(clob)
@@ -158,6 +166,11 @@ 
#define RSM_PSR_DT		\

	rsm psr.dt



#define RSM_PSR_BE_I(clob0, clob1)	\

	rsm psr.be | psr.i		\

	CLOBBER(clob0)			\

	CLOBBER(clob1)



#define SSM_PSR_DT_AND_SRLZ_I	\

	ssm psr.dt		\

	;;			\

arch/ia64/include/asm/native/patchlist.h

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/******************************************************************************

 * arch/ia64/include/asm/native/inst.h

 *

 * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>

 *                    VA Linux Systems Japan K.K.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 */



#define __paravirt_start_gate_fsyscall_patchlist		\

	__ia64_native_start_gate_fsyscall_patchlist

#define __paravirt_end_gate_fsyscall_patchlist			\

	__ia64_native_end_gate_fsyscall_patchlist

#define __paravirt_start_gate_brl_fsys_bubble_down_patchlist	\

	__ia64_native_start_gate_brl_fsys_bubble_down_patchlist

#define __paravirt_end_gate_brl_fsys_bubble_down_patchlist	\

	__ia64_native_end_gate_brl_fsys_bubble_down_patchlist

#define __paravirt_start_gate_vtop_patchlist			\

	__ia64_native_start_gate_vtop_patchlist

#define __paravirt_end_gate_vtop_patchlist			\

	__ia64_native_end_gate_vtop_patchlist

#define __paravirt_start_gate_mckinley_e9_patchlist		\

	__ia64_native_start_gate_mckinley_e9_patchlist

#define __paravirt_end_gate_mckinley_e9_patchlist		\

	__ia64_native_end_gate_mckinley_e9_patchlist