Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e3cdf24 authored by David Howells's avatar David Howells Committed by Tony Luck
Browse files

UAPI: Make arch/ia64/include/asm/kvm_para.h generic 



Make arch/ia64/include/asm/kvm_para.h generic since it's the same as the
asm-generic version.  This deals with the problem when ia64 is compiled with
allmodconfig you get:

In file included from include/uapi/linux/kvm_para.h:26:0,
                 from include/linux/kvm_para.h:4,
                 from kernel/watchdog.c:28:
arch/ia64/include/asm/kvm_para.h:24:28: error: redefinition of 'kvm_arch_para_features'
include/asm-generic/kvm_para.h:16:28: note: previous definition of 'kvm_arch_para_features' was here
arch/ia64/include/asm/kvm_para.h:29:20: error: redefinition of 'kvm_check_and_clear_guest_paused'
include/asm-generic/kvm_para.h:11:20: note: previous definition of 'kvm_check_and_clear_guest_paused' was here

This does not happen for ia64 defconfig.

Reported-by: default avatarYuanhan Liu <yuanhan.liu@intel.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Yuanhan Liu <yuanhan.liu@intel.com>
cc: fengguang.wu@intel.com
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent c9623de4

arch/ia64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 


generic-y += clkdev.h

generic-y += exec.h

generic-y += kvm_para.h

arch/ia64/include/asm/kvm_para.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * 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