From: Tony Luck <aegl@agluck-desktop.(none)>
Date: Tue, 31 Mar 2009 21:25:08 +0000 (-0700)
Subject: Pull pvops into release branch
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c66b31f3926165bc1d4128adc97a064dcbab421a;p=linux-2.6-omap-h63xx.git

Pull pvops into release branch
---

c66b31f3926165bc1d4128adc97a064dcbab421a
diff --cc arch/ia64/kernel/Makefile
index f2778f2c4fd,dbc19e4d5ef..5628e9a990a
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@@ -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