]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Pull pvops into release branch
authorTony Luck <aegl@agluck-desktop.(none)>
Tue, 31 Mar 2009 21:25:08 +0000 (14:25 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 31 Mar 2009 21:25:08 +0000 (14:25 -0700)
1  2 
arch/ia64/include/asm/intrinsics.h
arch/ia64/kernel/Makefile
arch/ia64/kernel/setup.c
arch/ia64/kernel/vmlinux.lds.S
arch/ia64/kvm/kvm-ia64.c
arch/ia64/kvm/vcpu.c
arch/ia64/kvm/vtlb.c

Simple merge
index f2778f2c4fd9307f75c989fc8553364efe1b9253,dbc19e4d5ef7f32d176c9ce51b0dc0e19d517299..5628e9a990a61225196c5de205ebdceeaf800aee
@@@ -5,9 -5,9 +5,9 @@@
  extra-y       := head.o init_task.o vmlinux.lds
  
  obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o     \
-        irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o          \
+        irq_lsapic.o ivt.o machvec.o pal.o paravirt_patchlist.o patch.o process.o perfmon.o ptrace.o sal.o             \
         salinfo.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \
 -       unwind.o mca.o mca_asm.o topology.o
 +       unwind.o mca.o mca_asm.o topology.o dma-mapping.o
  
  obj-$(CONFIG_IA64_BRL_EMU)    += brl_emu.o
  obj-$(CONFIG_IA64_GENERIC)    += acpi-ext.o
@@@ -43,13 -44,10 +44,8 @@@ ifneq ($(CONFIG_IA64_ESI),
  obj-y                         += esi_stub.o   # must be in kernel proper
  endif
  obj-$(CONFIG_DMAR)            += pci-dma.o
 -ifeq ($(CONFIG_DMAR), y)
  obj-$(CONFIG_SWIOTLB)         += pci-swiotlb.o
 -endif
  
- # The gate DSO image is built using a special linker script.
- targets += gate.so gate-syms.o
- extra-y += gate.so gate-syms.o gate.lds gate.o
  # fp_emulate() expects f2-f5,f16-f31 to contain the user-level state.
  CFLAGS_traps.o  += -mfixed-range=f2-f5,f16-f31
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge