From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764329AbYD2OTU (ORCPT ); Tue, 29 Apr 2008 10:19:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757947AbYD2OQJ (ORCPT ); Tue, 29 Apr 2008 10:16:09 -0400 Received: from mtagate3.de.ibm.com ([195.212.29.152]:33864 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755245AbYD2OP4 (ORCPT ); Tue, 29 Apr 2008 10:15:56 -0400 Message-Id: <20080429140251.242590024@de.ibm.com> References: <20080429140117.631962807@de.ibm.com> User-Agent: quilt/0.46-1 Date: Tue, 29 Apr 2008 16:01:28 +0200 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Heiko Carstens , Martin Schwidefsky Subject: [patch 11/15] Move stfl to system.h and delete duplicated version. Content-Disposition: inline; filename=011-stfl.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heiko Carstens Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- arch/s390/kernel/setup.c | 9 --------- arch/s390/kvm/priv.c | 11 +---------- include/asm-s390/system.h | 10 ++++++++++ 3 files changed, 11 insertions(+), 19 deletions(-) Index: quilt-2.6/arch/s390/kernel/setup.c =================================================================== --- quilt-2.6.orig/arch/s390/kernel/setup.c +++ quilt-2.6/arch/s390/kernel/setup.c @@ -683,15 +683,6 @@ setup_memory(void) #endif } -static __init unsigned int stfl(void) -{ - asm volatile( - " .insn s,0xb2b10000,0(0)\n" /* stfl */ - "0:\n" - EX_TABLE(0b,0b)); - return S390_lowcore.stfl_fac_list; -} - static int __init __stfle(unsigned long long *list, int doublewords) { typedef struct { unsigned long long _[doublewords]; } addrtype; Index: quilt-2.6/arch/s390/kvm/priv.c =================================================================== --- quilt-2.6.orig/arch/s390/kvm/priv.c +++ quilt-2.6/arch/s390/kvm/priv.c @@ -151,18 +151,9 @@ static int handle_chsc(struct kvm_vcpu * return 0; } -static unsigned int kvm_stfl(void) -{ - asm volatile( - " .insn s,0xb2b10000,0(0)\n" /* stfl */ - "0:\n" - EX_TABLE(0b, 0b)); - return S390_lowcore.stfl_fac_list; -} - static int handle_stfl(struct kvm_vcpu *vcpu) { - unsigned int facility_list = kvm_stfl(); + unsigned int facility_list = stfl(); int rc; vcpu->stat.instruction_stfl++; Index: quilt-2.6/include/asm-s390/system.h =================================================================== --- quilt-2.6.orig/include/asm-s390/system.h +++ quilt-2.6/include/asm-s390/system.h @@ -16,6 +16,7 @@ #include #include #include +#include #ifdef __KERNEL__ @@ -422,6 +423,15 @@ extern void smp_ctl_clear_bit(int cr, in #endif /* CONFIG_SMP */ +static inline unsigned int stfl(void) +{ + asm volatile( + " .insn s,0xb2b10000,0(0)\n" /* stfl */ + "0:\n" + EX_TABLE(0b,0b)); + return S390_lowcore.stfl_fac_list; +} + extern void (*_machine_restart)(char *command); extern void (*_machine_halt)(void); extern void (*_machine_power_off)(void); -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.