Received: from list by lists.gnu.org with archive (Exim 4.71) id 1h7RvE-0005pg-JC for mharc-grub-devel@gnu.org; Fri, 22 Mar 2019 17:41:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7RvC-0005g1-MI for grub-devel@gnu.org; Fri, 22 Mar 2019 17:41:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7Rn1-0005Sb-PD for grub-devel@gnu.org; Fri, 22 Mar 2019 17:33:28 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:40384) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h7Rmj-00056V-E8 for grub-devel@gnu.org; Fri, 22 Mar 2019 17:33:18 -0400 Received: by mail-wm1-x341.google.com with SMTP id z24so184639wmi.5 for ; Fri, 22 Mar 2019 14:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FgoCXmCgtsrIeB+cTmB9g8jncMmhMAcfPVqMAW1Zq+0=; b=loRaeKDq7wdMPvXZexP+8fwi/GUDAuYRxK9FLjWiz4R4SWJ17Yu2Gj8+vN9t18dE4U j58nXavYPJ49tVyE9vkZ1O4daHgr41hOmWa+p6yhzfRBHypH9Mv9WwuuN4SBikxXByHK z/2HIw44Q7ewymu4dt85pcKabVGf7ffWxyZscoUZEgylUtrz42D9RMvpwIHP174zbC6N DdVQc3PrY2GzVY0ak+ayvlDujnamjDEVRtHk5BgsyUqOGV3ooay3zDFN7XcZIUh9CDeV l4XqtOb3SqEfUneenr/nD3Vh8UbrhULnHhwsMirlutqJ+BpRNd3gHVOwWMb1XVOHMjMb IGMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FgoCXmCgtsrIeB+cTmB9g8jncMmhMAcfPVqMAW1Zq+0=; b=NnDjG2zL+rPjx2JNrBBX4J+7l8smUZsApA6RhhshZKEoOx5MeLGAnOFTZ7SZT9/Ihk nXSZgP4ojtOozqQxCQuXk1+ollvSza3K5fd8PP3QXQnVICxMIevhWznZH4EGsW3NoIh0 8L+aAxqvo9R36BD34CmrmevOXOJguGedZryyH3Z47VbfjratfcT/7e/pXmgiH2koFVYW fIw3JyKj9WPaCr1qHR5sAP6OWzpTcdOKDnqxSE4bL4XILTcG5s8/f5CebAizUbuCam2v 7Np5VTDG5E/Y7zkTTmqKEr0C96V1PGrOCWzKF7ZTQPjG2k5aK1d+Nb88t0pewhI6NCDo Pmjg== X-Gm-Message-State: APjAAAXVJLUYuJLwHs4k/inqH0T62JWFR6vAlvE8Ut88NkalxKh46DL/ cnYiSOs0qgTvj1bCHHuli/YBb7PN X-Google-Smtp-Source: APXvYqxp9TJ9r2mP3YaFVIg9tIaXJKd2UyVyhfnLxGl+eptjrTz4H50BJH2xHkf3MdigwM5MaqOxuw== X-Received: by 2002:a1c:9691:: with SMTP id y139mr3953121wmd.64.1553290022387; Fri, 22 Mar 2019 14:27:02 -0700 (PDT) Received: from izanagi.home.vikt0ry.com (112.red-81-47-147.staticip.rima-tde.net. [81.47.147.112]) by smtp.gmail.com with ESMTPSA id c20sm5890599wre.28.2019.03.22.14.27.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 14:27:01 -0700 (PDT) From: =?UTF-8?q?Jes=C3=BAs=20Di=C3=A9guez=20Fern=C3=A1ndez?= To: grub-devel@gnu.org Cc: =?UTF-8?q?Jes=C3=BAs=20Di=C3=A9guez=20Fern=C3=A1ndez?= Subject: [PATCH] msr: Add missing prototypes. Date: Fri, 22 Mar 2019 22:26:44 +0100 Message-Id: <20190322212644.24162-1-jesusdf@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 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, 22 Mar 2019 21:41:51 -0000 Add the missing prototypes to rdmsr.h and wrmsr.h. Rearrange return values in the function declaration. Signed-off-by: Jesús Diéguez Fernández --- include/grub/i386/rdmsr.h | 5 ++++- include/grub/i386/wrmsr.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/grub/i386/rdmsr.h b/include/grub/i386/rdmsr.h index bddb7bbbb..813e808f5 100644 --- a/include/grub/i386/rdmsr.h +++ b/include/grub/i386/rdmsr.h @@ -19,12 +19,15 @@ #ifndef GRUB_RDMSR_H #define GRUB_RDMSR_H 1 +inline grub_uint64_t grub_msr_read (grub_uint32_t msr_id); + /* * TODO: Add a general protection exception handler. * Accessing a reserved or unimplemented MSR address results in a GP#. */ -extern inline grub_uint64_t grub_msr_read (grub_uint32_t msr_id) +inline grub_uint64_t +grub_msr_read (grub_uint32_t msr_id) { grub_uint32_t low, high; diff --git a/include/grub/i386/wrmsr.h b/include/grub/i386/wrmsr.h index e14d7807f..3425652a3 100644 --- a/include/grub/i386/wrmsr.h +++ b/include/grub/i386/wrmsr.h @@ -19,12 +19,15 @@ #ifndef GRUB_WRMSR_H #define GRUB_WRMSR_H 1 +inline void grub_msr_write (grub_uint32_t msr_id, grub_uint64_t msr_value); + /* * TODO: Add a general protection exception handler. * Accessing a reserved or unimplemented MSR address results in a GP#. */ -extern inline void grub_msr_write(grub_uint32_t msr_id, grub_uint64_t msr_value) +inline void +grub_msr_write (grub_uint32_t msr_id, grub_uint64_t msr_value) { grub_uint32_t low = msr_value, high = msr_value >> 32; -- 2.17.1