Merge branch 'arch-frv' into no-rebases

This commit is contained in:
Al Viro
2012-11-16 22:27:58 -05:00
1103 changed files with 15138 additions and 12127 deletions

View File

@@ -1,3 +1,4 @@
generic-y += clkdev.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