Re: [PATCHSET linux-2.6-x86:core/percpu] x86: misc clean up and unify x86_32/64 code paths

Ingo Molnar
2009-01-21T10:43:53Z

This one was needed as well.

Ingo

------------------->
>From 61e0178cf01b4acc914e9653b421e925f22be0cd Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 21 Jan 2009 11:30:07 +0100
Subject: [PATCH] x86: uv cleanup, build fix #2

Fix more build-failure fallout from the UV cleanup - the UV drivers
were not updated to include <asm/uv/uv.h>.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
drivers/misc/sgi-gru/grufile.c | 1 +
drivers/misc/sgi-xp/xp_main.c | 2 ++
drivers/misc/sgi-xp/xp_uv.c | 1 +
3 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 6509838..50f6357 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -53,6 +53,7 @@
#define IS_UV() 0
#endif

+#include <asm/uv/uv.h>
#include <asm/uv/uv_hub.h>
#include <asm/uv/uv_mmrs.h>

diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
index 16f8dca..1a553e6 100644
--- a/drivers/misc/sgi-xp/xp_main.c
+++ b/drivers/misc/sgi-xp/xp_main.c
@@ -18,6 +18,8 @@
#include <linux/device.h>
#include "xp.h"

+#include <asm/uv/uv.h>
+
/* define the XP debug device structures to be used with dev_dbg() et al */

struct device_driver xp_dbg_name = {
diff --git a/drivers/misc/sgi-xp/xp_uv.c b/drivers/misc/sgi-xp/xp_uv.c
index d238576..c55cc8a 100644
--- a/drivers/misc/sgi-xp/xp_uv.c
+++ b/drivers/misc/sgi-xp/xp_uv.c
@@ -14,6 +14,7 @@
*/

#include <linux/device.h>
+#include <asm/uv/uv.h>
#include <asm/uv/uv_hub.h>
#if defined CONFIG_X86_64
#include <asm/uv/bios.h>