Fix from dhowells for UAPI fallout

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJQhwxKAAoJEKurIx+X31iBBmIQAKd99kLz357GfZtNsuGAj9Ir
 AO3uIadHKZqZ1zA0DGpgjwNX9nTXzkHHWPzzZTQVA1cdjIqbZam279cEUWVAFGLX
 ns6HsKvlqu+lHT5ULzKm2lVlOHsBFwuD9aeqKrJh08IqBV8ty05VNURoriAZplzk
 sn0XfBTQ0kRUTkHv02ILQcGI8NLjO6cvVfcahcYFBSiQwM2pknEeU1iC6dlWXIsg
 90nowjq0EOR02CguLkroGHUAmZGOIx+H7P2vcuf6oWOPM8i0bHY2es2OboD11Q39
 o/v8xrsVDC/5ooDt+TqPEcGKyzpcdR32Y3Kg/fPlEoPyCLQOYGGngdbmCi/gXq+f
 7TiFNU758LkgxBJxEJ+JxHZD00dJ76pXBDNxX7I0W36jArFYhSFX8ctBjxi8KGJ0
 K6h6hAJh6RlTX70SEyVbGkDi46gUph6ChI5fBYd0jnzU+hxviYJAhKDowAxEc5HW
 ORlo9umlRNmw/hG5PiQamquFWDB22MvrFhB3t+JpPV+s5GwM+/TY8eAGRLeSpfrw
 RDgeFgxMK1H93UOOEXqNmfsyTAPgOdFq3eNvbI6Qg9+1v+FLdRJdx8OMaSo5RyHA
 Yis46V/25bfoKqBKigxOjS9YAw4QzdnpFMLs/ddNQ4m5s3Z7NjcRWHu4KN1GTg/g
 Soq0DM/BPTK99L0ld9Ho
 =V+mj
 -----END PGP SIGNATURE-----

Merge tag 'please-pull-uapi-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 fix from Tony Luck:
 "Fix from dhowells for UAPI fallout"

* tag 'please-pull-uapi-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  UAPI: Make arch/ia64/include/asm/kvm_para.h generic
This commit is contained in:
Linus Torvalds 2012-10-24 04:03:21 +03:00
commit 62472efed9
2 changed files with 1 additions and 34 deletions

View File

@ -1,3 +1,4 @@
generic-y += clkdev.h generic-y += clkdev.h
generic-y += exec.h generic-y += exec.h
generic-y += kvm_para.h

View File

@ -1,34 +0,0 @@
/*
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place - Suite 330, Boston, MA 02111-1307 USA.
*
*/
#ifndef __IA64_KVM_PARA_H
#define __IA64_KVM_PARA_H
#include <uapi/asm/kvm_para.h>
static inline unsigned int kvm_arch_para_features(void)
{
return 0;
}
static inline bool kvm_check_and_clear_guest_paused(void)
{
return false;
}
#endif