2010-02-13 01:40:56

by Jacob Pan

Subject: [PATCH 3/8] x86/mrst: add dummy legacy pic to platform setup

>From 91c30c1822db4dfa3f4644fbc284e5322ff59d70 Mon Sep 17 00:00:00 2001
From: Jacob Pan <[email protected]>
Date: Fri, 12 Feb 2010 02:29:11 -0800
Subject: [PATCH 3/8] x86/mrst: add dummy legacy pic to platform setup

Signed-off-by: Jacob Pan <[email protected]>

Signed-off-by: Jacob Pan <[email protected]>
---
arch/x86/kernel/mrst.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/mrst.c b/arch/x86/kernel/mrst.c
index 3b7078a..bdf9b17 100644
--- a/arch/x86/kernel/mrst.c
+++ b/arch/x86/kernel/mrst.c
@@ -12,6 +12,9 @@
#include <linux/init.h>

#include <asm/setup.h>
+#include <asm/mrst.h>
+#include <asm/io.h>
+#include <asm/i8259.h>

/*
* Moorestown specific x86_init function overrides and early setup
@@ -21,4 +24,6 @@ void __init x86_mrst_early_setup(void)
{
x86_init.resources.probe_roms = x86_init_noop;
x86_init.resources.reserve_resources = x86_init_noop;
+
+ legacy_pic = &null_legacy_pic;
}
--
1.6.5.3

2010-02-24 08:08:25

by Jacob Pan

Subject: [tip:x86/mrst] x86, mrst: Add dummy legacy pic to platform setup

Commit-ID: 5b78b6724a405d4b649db53f7aac28c930c89640
Gitweb: http://git.kernel.org/tip/5b78b6724a405d4b649db53f7aac28c930c89640
Author: Jacob Pan <[email protected]>
AuthorDate: Fri, 12 Feb 2010 02:29:11 -0800
Committer: H. Peter Anvin <[email protected]>
CommitDate: Tue, 23 Feb 2010 23:15:19 -0800

x86, mrst: Add dummy legacy pic to platform setup

Moorestown has no legacy PIC; point it to the null legacy PIC.

Signed-off-by: Jacob Pan <[email protected]>
LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D09@orsmsx508.amr.corp.intel.com>
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/kernel/mrst.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/mrst.c b/arch/x86/kernel/mrst.c
index 3b7078a..bdf9b17 100644
--- a/arch/x86/kernel/mrst.c
+++ b/arch/x86/kernel/mrst.c
@@ -12,6 +12,9 @@
#include <linux/init.h>

#include <asm/setup.h>
+#include <asm/mrst.h>
+#include <asm/io.h>
+#include <asm/i8259.h>

/*
* Moorestown specific x86_init function overrides and early setup
@@ -21,4 +24,6 @@ void __init x86_mrst_early_setup(void)
{
x86_init.resources.probe_roms = x86_init_noop;
x86_init.resources.reserve_resources = x86_init_noop;
+
+ legacy_pic = &null_legacy_pic;
}