[tip:x86/apic] x86: fix function definitions after: x86: apic - introduce imcr_ helpers

From: tip-bot for Alexander van Heukelum
Date: Mon Apr 13 2009 - 17:01:34 EST


Commit-ID: 5cda395f4a262788d8ed79ac8a26a2b821e5f751
Gitweb: http://git.kernel.org/tip/5cda395f4a262788d8ed79ac8a26a2b821e5f751
Author: Alexander van Heukelum <heukelum@xxxxxxxxxxxxx>
AuthorDate: Mon, 13 Apr 2009 17:39:24 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Mon, 13 Apr 2009 22:57:44 +0200

x86: fix function definitions after: x86: apic - introduce imcr_ helpers

The patch "introduce imcr_ helpers" introduced good comments, but
also a few new compile warnings. This fixes the function definitions
to have a 'void' return type.

Signed-off-by: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
Acked-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
LKML-Reference: <20090413153924.GA20287@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
arch/x86/kernel/apic/apic.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 9b849d4..4b48ff9 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -106,7 +106,7 @@ static int enabled_via_apicbase;
* the BIOS or the operating system must switch out of
* PIC Mode by changing the IMCR.
*/
-static inline imcr_pic_to_apic(void)
+static inline void imcr_pic_to_apic(void)
{
/* select IMCR register */
outb(0x70, 0x22);
@@ -114,7 +114,7 @@ static inline imcr_pic_to_apic(void)
outb(0x01, 0x23);
}

-static inline imcr_apic_to_pic(void)
+static inline void imcr_apic_to_pic(void)
{
/* select IMCR register */
outb(0x70, 0x22);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/