From b85af921163639dd720258ea2dced14262880c71 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 26 Mar 2009 15:24:54 +0100 Subject: [PATCH] --- yaml --- r: 135657 b: refs/heads/master c: 2ac3307f275c2a91af0417e16d2cfb95ae478661 h: refs/heads/master i: 135655: 7734e3879ce02e5e6fd8889dd6cfc6e2b90f3af6 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/setup.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e24ed6984fb9..0b52e90dbd07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0d3cdf4c27fa4ce241616da08138954e02890f7 +refs/heads/master: 2ac3307f275c2a91af0417e16d2cfb95ae478661 diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c index 580abb53ce83..18222ac4078f 100644 --- a/trunk/arch/s390/kernel/setup.c +++ b/trunk/arch/s390/kernel/setup.c @@ -713,13 +713,15 @@ static void __init setup_hwcaps(void) * How many facility words are stored depends on the number of * doublewords passed to the instruction. The additional facilites * are: - * Bit 43: decimal floating point facility is installed + * Bit 42: decimal floating point facility is installed + * Bit 44: perform floating point operation facility is installed * translated to: * HWCAP_S390_DFP bit 6. */ if ((elf_hwcap & (1UL << 2)) && __stfle(&facility_list_extended, 1) > 0) { - if (facility_list_extended & (1ULL << (64 - 43))) + if ((facility_list_extended & (1ULL << (63 - 42))) + && (facility_list_extended & (1ULL << (63 - 44)))) elf_hwcap |= 1UL << 6; }