From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 17 Jul 2007 18:50:26 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
X-Git-Tag: v2.6.23-rc1~520
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=49c13b51a15f1ba9f6d47e26e4a3886c4f3931e2

Merge branch 'for-linus' of git://git./linux/kernel/git/avi/kvm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (80 commits)
  KVM: Use CPU_DYING for disabling virtualization
  KVM: Tune hotplug/suspend IPIs
  KVM: Keep track of which cpus have virtualization enabled
  SMP: Allow smp_call_function_single() to current cpu
  i386: Allow smp_call_function_single() to current cpu
  x86_64: Allow smp_call_function_single() to current cpu
  HOTPLUG: Adapt thermal throttle to CPU_DYING
  HOTPLUG: Adapt cpuset hotplug callback to CPU_DYING
  HOTPLUG: Add CPU_DYING notifier
  KVM: Clean up #includes
  KVM: Remove kvmfs in favor of the anonymous inodes source
  KVM: SVM: Reliably detect if SVM was disabled by BIOS
  KVM: VMX: Remove unnecessary code in vmx_tlb_flush()
  KVM: MMU: Fix Wrong tlb flush order
  KVM: VMX: Reinitialize the real-mode tss when entering real mode
  KVM: Avoid useless memory write when possible
  KVM: Fix x86 emulator writeback
  KVM: Add support for in-kernel pio handlers
  KVM: VMX: Fix interrupt checking on lightweight exit
  KVM: Adds support for in-kernel mmio handlers
  ...
---

49c13b51a15f1ba9f6d47e26e4a3886c4f3931e2
diff --cc fs/anon_inodes.c
index a260198306c2,edc67486238f..b4a75880f6fd
--- a/fs/anon_inodes.c
+++ b/fs/anon_inodes.c
@@@ -139,11 -139,12 +139,12 @@@ err_put_filp
  	put_filp(file);
  	return error;
  }
+ EXPORT_SYMBOL_GPL(anon_inode_getfd);
  
  /*
 - * A single inode exist for all anon_inode files. Contrary to pipes,
 - * anon_inode inodes has no per-instance data associated, so we can avoid
 - * the allocation of multiple of them.
 + * A single inode exists for all anon_inode files. Contrary to pipes,
 + * anon_inode inodes have no associated per-instance data, so we need
 + * only allocate one of them.
   */
  static struct inode *anon_inode_mkinode(void)
  {