Attachment 147353 Details for Bug 193660 – Guard the section

[patch] Guard the section

fix-i586-only-build.patch (text/plain), 1.03 KB, created by holger on 2014-09-15 16:43:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: holger

Created: 2014-09-15 16:43:14 UTC

Size: 1.03 KB

patch

obsolete

>From 19dcdf0ca910503c51c446744534e2d4c08f0c41 Mon Sep 17 00:00:00 2001
>From: Holger Hans Peter Freyther <holger@freyther.de>
>Date: Mon, 15 Sep 2014 16:38:45 +0200
>Subject: [PATCH] Fix compilation without i586 (not boot tested)
>
>While using the nanobsd/pcengines/build.sh script the kernel would
>not link due the call to ppro_reenable_apic which was introduced
>in commit r271408. Guard the section with an i686 check.
>
>I have not boot tested the result on 32bit system.
>---
> sys/x86/x86/local_apic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
>index 50f00d0..049e0cd 100644
>--- a/sys/x86/x86/local_apic.c
>+++ b/sys/x86/x86/local_apic.c
>@@ -1365,7 +1365,7 @@ apic_init(void *dummy __unused)
> 		printf("APIC: Using the %s enumerator.\n",
> 		    best_enum->apic_name);
> 
>-#ifndef __amd64__
>+#if !defined(__amd64__) && defined(I686_CPU)
> 	/*
> 	 * To work around an errata, we disable the local APIC on some
> 	 * CPUs during early startup.  We need to turn the local APIC back
>-- 
>2.1.0
>
>

Flags:

holger: maintainer-approval?

Actions: View | Diff

Attachments on bug 193660: 147353