[Xen-changelog] [xen master] Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen into staging

[patchbot@xxxxxxx]

commit 93218d8a25eb6f492d4a3a43b6bebe0b151b9214
Merge: 2a16fcd5ba0244fef764886211452acc69c0ed00 
d6e8fd32890b663bc449ab4b60e21dafb09bb821
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Nov 22 15:27:19 2013 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Nov 22 15:27:19 2013 +0100

    Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen 
into staging

 xen/common/tmem.c          |  853 ++++++++++++++++++++++----------------------
 xen/common/tmem_xen.c      |  171 +++-------
 xen/include/public/tmem.h  |    3 +-
 xen/include/xen/tmem_xen.h |  251 ++++----------
 4 files changed, 543 insertions(+), 735 deletions(-)

diff --cc xen/include/xen/tmem_xen.h
index 9fb7446,034fd5c..b26c6fa
--- a/xen/include/xen/tmem_xen.h
+++ b/xen/include/xen/tmem_xen.h
@@@ -439,10 -328,10 +328,10 @@@ typedef XEN_GUEST_HANDLE(char) cli_va_t
  typedef XEN_GUEST_HANDLE_PARAM(tmem_op_t) tmem_cli_op_t;
  typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t;
  
- static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t 
uops)
+ static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t 
uops)
  {
  #ifdef CONFIG_COMPAT
 -    if ( is_hvm_vcpu(current) ?
 +    if ( has_hvm_container_vcpu(current) ?
           hvm_guest_x86_mode(current) != 8 :
           is_pv_32on64_vcpu(current) )
      {
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog