[PATCH] don't compile SGI XP/GRU on ia64_generic

[PATCH] don't compile SGI XP/GRU on ia64_generic

[KOSAKI Motohiro]

Impact: fix build error

Currently sgi-xp driver depend on "uv.h" header file.
but only x86 have "uv.h" header.

Then, ia64 hit following build error.

  In file included from drivers/misc/sgi-gru/grufile.c:39:
  drivers/misc/sgi-gru/gru.h:22:23: error: asm/uv/uv.h: No such file or directory

Cc: Jack Steiner <steiner@sgi.com>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>

---
 drivers/misc/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/drivers/misc/Kconfig
===================================================================
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -165,7 +165,7 @@ config SGI_XP
 	depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
 	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
 	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
-	select SGI_GRU if (IA64_GENERIC || IA64_SGI_UV || X86_64) && SMP
+	select SGI_GRU if (IA64_SGI_UV || X86_UV) && SMP
 	---help---
 	  An SGI machine can be divided into multiple Single System
 	  Images which act independently of each other and have
@@ -189,7 +189,7 @@ config HP_ILO
 
 config SGI_GRU
 	tristate "SGI GRU driver"
-	depends on (X86_UV || IA64_SGI_UV || IA64_GENERIC) && SMP
+	depends on (X86_UV || IA64_SGI_UV) && SMP
 	default n
 	select MMU_NOTIFIER
 	---help---

[PATCH 2/2] don't compile SGI XP/GRU on ia64_generic

[KOSAKI Motohiro]

Subject: [PATCH] ia64: don't compile SGI-XP on ia64 generic.
Impact: fix build error

Currently sgi-xp driver depend on "uv.h" header file.
but only x86 have "uv.h" header.

Then, ia64 hit following build error.

  In file included from drivers/misc/sgi-xp/xp_main.c:19:
  drivers/misc/sgi-xp/xp.h:18:23: error: asm/uv/uv.h: No such file or directory
  make[3]: *** [drivers/misc/sgi-xp/xp_main.o] Error 1
  make[2]: *** [drivers/misc/sgi-xp] Error 2

Cc: Jack Steiner <steiner@sgi.com>
Cc: Dean Nelson <dcn@sgi.com>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
---
 drivers/misc/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/drivers/misc/Kconfig
===================================================================
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -162,7 +162,7 @@ config ENCLOSURE_SERVICES
 config SGI_XP
 	tristate "Support communication between SGI SSIs"
 	depends on NET
-	depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
+	depends on (IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
 	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
 	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
 	select SGI_GRU if (IA64_SGI_UV || X86_UV) && SMP

Re: [PATCH 2/2] don't compile SGI XP/GRU on ia64_generic

[Robin Holt]

Dean Nelson submitted a patch yesterday to make this work.

Robin


On Tue, Feb 10, 2009 at 09:03:40PM +0900, KOSAKI Motohiro wrote:
> Subject: [PATCH] ia64: don't compile SGI-XP on ia64 generic.
> Impact: fix build error
> 
> Currently sgi-xp driver depend on "uv.h" header file.
> but only x86 have "uv.h" header.
> 
> Then, ia64 hit following build error.
> 
>   In file included from drivers/misc/sgi-xp/xp_main.c:19:
>   drivers/misc/sgi-xp/xp.h:18:23: error: asm/uv/uv.h: No such file or directory
>   make[3]: *** [drivers/misc/sgi-xp/xp_main.o] Error 1
>   make[2]: *** [drivers/misc/sgi-xp] Error 2
> 
> Cc: Jack Steiner <steiner@sgi.com>
> Cc: Dean Nelson <dcn@sgi.com>
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> ---
>  drivers/misc/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: b/drivers/misc/Kconfig
> ===================================================================
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@ -162,7 +162,7 @@ config ENCLOSURE_SERVICES
>  config SGI_XP
>  	tristate "Support communication between SGI SSIs"
>  	depends on NET
> -	depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
> +	depends on (IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
>  	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
>  	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
>  	select SGI_GRU if (IA64_SGI_UV || X86_UV) && SMP
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] don't compile SGI XP/GRU on ia64_generic

[KOSAKI Motohiro]

> Dean Nelson submitted a patch yesterday to make this work.
> 
> Robin

Thanks!
I'm happy a lot.


> 
> 
> On Tue, Feb 10, 2009 at 09:03:40PM +0900, KOSAKI Motohiro wrote:
> > Subject: [PATCH] ia64: don't compile SGI-XP on ia64 generic.
> > Impact: fix build error
> > 
> > Currently sgi-xp driver depend on "uv.h" header file.
> > but only x86 have "uv.h" header.
> > 
> > Then, ia64 hit following build error.

Re: [PATCH] don't compile SGI XP/GRU on ia64_generic

[Dean Nelson]

On Tue, Feb 10, 2009 at 04:35:46PM +0900, KOSAKI Motohiro wrote:
> Impact: fix build error
> 
> Currently sgi-xp driver depend on "uv.h" header file.
> but only x86 have "uv.h" header.

Yesterday I submitted a patch that introduces a 'uv.h' header file for
ia64 and eliminates the ia64 build error. Link to any one of the following
to see the patch.

	http://marc.info/?l=linux-ia64&m=123419673126499&w=2
	http://marc.info/?l=linux-next&m=123419673226503&w=2
	http://marc.info/?l=linux-kernel&m=123419682026636&w=2

That is the preferred solution to this problem.


> Then, ia64 hit following build error.
> 
>   In file included from drivers/misc/sgi-gru/grufile.c:39:
>   drivers/misc/sgi-gru/gru.h:22:23: error: asm/uv/uv.h: No such file or directory
> 
> Cc: Jack Steiner <steiner@sgi.com>
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> 
> ---
>  drivers/misc/Kconfig |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: b/drivers/misc/Kconfig
> ===================================================================
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@ -165,7 +165,7 @@ config SGI_XP
>  	depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
>  	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
>  	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
> -	select SGI_GRU if (IA64_GENERIC || IA64_SGI_UV || X86_64) && SMP
> +	select SGI_GRU if (IA64_SGI_UV || X86_UV) && SMP
>  	---help---
>  	  An SGI machine can be divided into multiple Single System
>  	  Images which act independently of each other and have
> @@ -189,7 +189,7 @@ config HP_ILO
>  
>  config SGI_GRU
>  	tristate "SGI GRU driver"
> -	depends on (X86_UV || IA64_SGI_UV || IA64_GENERIC) && SMP
> +	depends on (X86_UV || IA64_SGI_UV) && SMP
>  	default n
>  	select MMU_NOTIFIER
>  	---help---
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html