- UV fix compile error on IA64 & eliminate compiler warning
Subsystems (3)
PATCH 1/1 - UV fix compile error on IA64 & eliminate compiler warning
The GRU driver is used on both IA64 & x86.
The 2 architectures have different ways of detecting the platform type, ie. whether the platform is a UV system. Although it is possible to reconcile the 2 methods, only one place currently makes the test.
Also eliminate a warning message in uv.h.
--- arch/x86/include/asm/uv/uv.h | 1 + drivers/misc/sgi-gru/gru.h | 2 -- drivers/misc/sgi-gru/grufile.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/uv/uv.h +1 -0
@@ -2,6 +2,7 @@#define _ASM_X86_UV_UV_Henum uv_system_type {UV_NONE ,UV_LEGACY_APIC ,UV_X2APIC ,UV_NON_UNIQUE_APIC }; +struct mm_struct ;#ifdef CONFIG_X86_UV
drivers/misc/sgi-gru/gru.h +0 -2
@@ -19,8 +19,6 @@#ifndef __GRU_H__#define __GRU_H__ -#include <asm/uv/uv.h> -/* * GRU architectural definitions */
drivers/misc/sgi-gru/grufile.c +1 -0
@@ -46,6 +46,7 @@#if definedCONFIG_X86_64 #include <asm/genapic.h> #include <asm/irq.h> +#include <asm/uv/uv.h> #define IS_UV () is_uv_system()#elif definedCONFIG_IA64 #include <asm/system.h>
Quoted 1 line · Jack Steiner
Also eliminate a warning message in
uv.h.
Which was....?
Harvey
Quoted 23 lines · Jack Steiner
The GRU driver is used on both IA64 & x86.
The 2 architectures have different ways of detecting the platform type, ie. whether the platform is a UV system. Although it is possible to reconcile the 2 methods, only one place currently makes the test.Also eliminate a warning message in
uv.h.Signed-off-by Jack Steiner <[email protected]>--- arch/x86/include/asm/uv/uv.h | 1 + drivers/misc/sgi-gru/gru.h | 2 -- drivers/misc/sgi-gru/grufile.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-)Index:
linux/arch/x86/include/asm/uv/uv.h
===================================================================
arch/x86/include/asm/uv/uv.h line 5
Quoted 4 lines
arch/x86/include/asm/uv/uv.h +1
-0@@ -2,6 +2,7 @@#define _ASM_X86_UV_UV_Henum uv_system_type {UV_NONE ,UV_LEGACY_APIC ,UV_X2APIC ,UV_NON_UNIQUE_APIC }; +struct mm_struct ;
hm, why is this needed?
arch/x86/include/asm/uv/uv.h line 6
Quoted 1 line
arch/x86/include/asm/uv/uv.h +0
-0#define IS_UV () is_uv_system()
btw., why is there an ugly IS_UV() macro. All code should be using is_uv_system() and IS_UV() should be removed.
Ingo
Quoted 28 lines · Ingo Molnar
Quoted 25 lines · Jack Steiner
The GRU driver is used on both IA64 & x86.
The 2 architectures have different ways of detecting the platform type, ie. whether the platform is a UV system. Although it is possible to reconcile the 2 methods, only one place currently makes the test.Also eliminate a warning message in
uv.h.Signed-off-by Jack Steiner <[email protected]>--- arch/x86/include/asm/uv/uv.h | 1 + drivers/misc/sgi-gru/gru.h | 2 -- drivers/misc/sgi-gru/grufile.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-)Index:
linux/arch/x86/include/asm/uv/uv.h
===================================================================arch/x86/include/asm/uv/uv.h +0
-0@@ -2,6 +2,7 @@#define _ASM_X86_UV_UV_H
Quoted 4 lines
arch/x86/include/asm/uv/uv.h line 5
Quoted 2 lines
arch/x86/include/asm/uv/uv.h +1
-0enum uv_system_type {UV_NONE ,UV_LEGACY_APIC ,UV_X2APIC ,UV_NON_UNIQUE_APIC }; +struct mm_struct ;hm, why is this needed?
I don't see the error in your tip tree, but I saw the following earlier this week when compiling in the linux-next tree:
arch/x86/include/asm/uv/uv.h:16: warning: struct mm_struct declared inside parameter list include/asm/uv/uv.h:16: warning: its scope is only this definition or declaration,
which is probably not what you want
Unfortunately my log does not capture the file that produced this error. I believe it was from a non-UV file that indirectly included uv.h. It is possible that subsequent changes have removed the indirect reference.
Quoted 5 lines
arch/x86/include/asm/uv/uv.h line 6
Quoted 2 lines
arch/x86/include/asm/uv/uv.h +0
-0#define IS_UV () is_uv_system()btw., why is there an ugly
IS_UV()macro. All code should be usingis_uv_system()andIS_UV()should be removed.
Agree & I plan to do that. I need to add a arch/ia64/include/asm/uv/uv.h file and hide the uglyness there. IA64 does not used the same method of determining the platform type. IA64 historically uses:
ia64_platform_is("uv")The GRU driver must be supported on both IA64 & x86. I've tried to hide the platform differences but some are difficult (especially regarding irqs & vectors).
--- jack