Subject: [PATCH] Fix warnings after: x86: apic - introduce imcr_ helpers

Impact: fix compiler warnings

The patch "introduce imcr_ helpers" introduced good comments, but
also a few compile warnings. This fixes it.

Signed-off-by: Alexander van Heukelum <[email protected]>
Acked-by: Cyrill Gorcunov <[email protected]>

---

Hi Ingo,

Cyrill forgot to refresh the patches :).

Greetings,
Alexander

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 054f604..c3c57b2 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -107,7 +107,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);
@@ -115,7 +115,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);


2009-04-13 16:13:47

by Cyrill Gorcunov

[permalink] [raw]
Subject: Re: [PATCH] Fix warnings after: x86: apic - introduce imcr_ helpers

[Alexander van Heukelum - Mon, Apr 13, 2009 at 05:39:24PM +0200]
| Impact: fix compiler warnings
|
| The patch "introduce imcr_ helpers" introduced good comments, but
| also a few compile warnings. This fixes it.
|
| Signed-off-by: Alexander van Heukelum <[email protected]>
| Acked-by: Cyrill Gorcunov <[email protected]>
|
| ---
|
| Hi Ingo,
|
| Cyrill forgot to refresh the patches :).

The patch, not patches :) I've just updated it
but then poped without refresh (doh!).

|
| Greetings,
| Alexander
|
...

Thanks a lot, Alexander! Ingo, apply it please.

Cyrill

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

Commit-ID: 5cda395f4a262788d8ed79ac8a26a2b821e5f751
Gitweb: http://git.kernel.org/tip/5cda395f4a262788d8ed79ac8a26a2b821e5f751
Author: Alexander van Heukelum <[email protected]>
AuthorDate: Mon, 13 Apr 2009 17:39:24 +0200
Committer: Ingo Molnar <[email protected]>
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 <[email protected]>
Acked-by: Cyrill Gorcunov <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
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);