From: Tony Luck <tony.luck@intel.com>
Date: Thu, 17 Apr 2008 17:13:57 +0000 (-0700)
Subject: Pull nptcg into release branch
X-Git-Tag: kvm-67rc1~2^2~9^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f4df39cbdd9e9ab615e80148cc271db22a8508ad;p=users%2Fdwmw2%2Flinux.git

Pull nptcg into release branch

Conflicts:

	arch/ia64/mm/tlb.c
---

f4df39cbdd9e9ab615e80148cc271db22a8508ad
diff --cc arch/ia64/mm/tlb.c
index 3d8903f936a58,1a8948fd00290..d52ec4e834091
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@@ -26,8 -29,7 +29,9 @@@
  #include <asm/pal.h>
  #include <asm/tlbflush.h>
  #include <asm/dma.h>
 +#include <asm/processor.h>
+ #include <asm/sal.h>
 +#include <asm/tlb.h>
  
  static struct {
  	unsigned long mask;	/* mask of supported purge page-sizes */