From 88a346688ec3ddb64b4ac8a8f3d1dadecd296308 Mon Sep 17 00:00:00 2001 From: Alexander van Heukelum Date: Mon, 13 Apr 2009 17:39:24 +0200 Subject: [PATCH] --- yaml --- r: 145604 b: refs/heads/master c: 5cda395f4a262788d8ed79ac8a26a2b821e5f751 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/apic.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9948009bb8f4..a709f983d7c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9b34f24b23ba9e79e07c0980e7fff16af2a67d1 +refs/heads/master: 5cda395f4a262788d8ed79ac8a26a2b821e5f751 diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c index 9b849d4957dc..4b48ff9163ca 100644 --- a/trunk/arch/x86/kernel/apic/apic.c +++ b/trunk/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);