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

Ingo Molnar
2009-01-21T11:03:19Z

* Ingo Molnar <mingo@elte.hu> wrote:

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

i went for this solution instead - it covers more .c files and is the
right thing to do as well.

Ingo

----------------->
>From 5b221278d61e3907a5e4104a844b63bc8bb3d43a 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/gru.h | 2 ++
drivers/misc/sgi-xp/xp.h | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/misc/sgi-gru/gru.h b/drivers/misc/sgi-gru/gru.h
index f93f03a..1b5f579 100644
--- a/drivers/misc/sgi-gru/gru.h
+++ b/drivers/misc/sgi-gru/gru.h
@@ -19,6 +19,8 @@
#ifndef __GRU_H__
#define __GRU_H__

+#include <asm/uv/uv.h>
+
/*
* GRU architectural definitions
*/
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 7b4cbd5..069ad3a 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -15,6 +15,8 @@

#include <linux/mutex.h>

+#include <asm/uv/uv.h>
+
#ifdef CONFIG_IA64
#include <asm/system.h>
#include <asm/sn/arch.h> /* defines is_shub1() and is_shub2() */