Received: from list by lists.gnu.org with archive (Exim 4.71) id 1hEut9-0006zi-GT for mharc-grub-devel@gnu.org; Fri, 12 Apr 2019 08:02:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEut7-0006zD-6F for grub-devel@gnu.org; Fri, 12 Apr 2019 08:02:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEut4-0004x3-WC for grub-devel@gnu.org; Fri, 12 Apr 2019 08:02:32 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:44738) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEut4-0004uh-LD for grub-devel@gnu.org; Fri, 12 Apr 2019 08:02:30 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3CBx9Hi088479; Fri, 12 Apr 2019 12:02:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=sexxh4fOza3p1aaCrIjIpV6UkHKaUn3kToXj9UyDN2E=; b=zatCsfAZAZS++6xYAgsMSC+yUNyEG29R7i1Eu3woi/2PMX4x84EgVBqXf3g2DCty511E l0LJteVbMeGHNcIfLOM39h5fk+XDFrkRQFTUUBMorK4/Qp1PNL7++Md3qqTAOKBzJTUm dAslbMVd06ZcKg8dyaZB/soGfjXDHhVuhG6CWVPt8ydpwj9e4OljMg1RMEVS5Sti5cyr phgo48bHRhtEOLPKAnkrJ99VIXJ9vSI9zAM2nMfy6UP5w0Bh3HHUE+MIK2cT0kSi5Yo2 HpIAhpwVceUEBxnHVJNqcy7bHJ6YBi45PW7xcsOQbRdjVO7AUZE+Dk5aUP8wpQ7iWSgf 7w== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2120.oracle.com with ESMTP id 2rpmrqp0p9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Apr 2019 12:02:20 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3CBxkaW065312; Fri, 12 Apr 2019 12:00:20 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3020.oracle.com with ESMTP id 2rpytd94rc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Apr 2019 12:00:20 +0000 Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x3CC0H5D025869; Fri, 12 Apr 2019 12:00:17 GMT Received: from tomti.i.net-space.pl (/10.175.164.5) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 12 Apr 2019 05:00:17 -0700 From: Daniel Kiper To: grub-devel@gnu.org Cc: adrian15sgd@gmail.com, eric.snowberg@oracle.com, glaubitz@physik.fu-berlin.de, jesusdf@gmail.com, list@eworm.de, phcoder@gmail.com Subject: [PATCH] x86/msr: Fix build with older GCC versions Date: Fri, 12 Apr 2019 13:59:59 +0200 Message-Id: <20190412115959.18097-1-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9224 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904120079 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9224 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904120079 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by userp2120.oracle.com id x3CBx9Hi088479 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 12:02:34 -0000 Some older GCC versions produce following error when x86 MSR modules are = build: In file included from commands/i386/rdmsr.c:29:0: ../include/grub/i386/rdmsr.h:27:29: error: no previous prototype for =E2= =80=98grub_msr_read=E2=80=99 [-Werror=3Dmissing-prototypes] extern inline grub_uint64_t grub_msr_read (grub_uint32_t msr_id) ^ cc1: all warnings being treated as errors This is due to incorrect use of extern keyword. So, replace it with static keyword. Additionally, fix incorrect coding style. Reported-by: Eric Snowberg Reported-by: adrian15 Signed-off-by: Daniel Kiper --- include/grub/i386/rdmsr.h | 3 ++- include/grub/i386/wrmsr.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/grub/i386/rdmsr.h b/include/grub/i386/rdmsr.h index bddb7bbbb..c0a0c717a 100644 --- a/include/grub/i386/rdmsr.h +++ b/include/grub/i386/rdmsr.h @@ -24,7 +24,8 @@ * Accessing a reserved or unimplemented MSR address results in a = GP#. */ =20 -extern inline grub_uint64_t grub_msr_read (grub_uint32_t msr_id) +static inline grub_uint64_t +grub_msr_read (grub_uint32_t msr_id) { grub_uint32_t low, high; =20 diff --git a/include/grub/i386/wrmsr.h b/include/grub/i386/wrmsr.h index e14d7807f..dea60aed1 100644 --- a/include/grub/i386/wrmsr.h +++ b/include/grub/i386/wrmsr.h @@ -24,7 +24,8 @@ * Accessing a reserved or unimplemented MSR address results in a = GP#. */ =20 -extern inline void grub_msr_write(grub_uint32_t msr_id, grub_uint64_t ms= r_value) +static inline void +grub_msr_write(grub_uint32_t msr_id, grub_uint64_t msr_value) { grub_uint32_t low =3D msr_value, high =3D msr_value >> 32; =20 --=20 2.11.0