SGI IA64 UV: fix ia64 build error in the linux-next tree
Fix the ia64 build error that occurs in the linux-next tree by introducing an ia64 version of uv.h. Additionally, clean up the usage of is_uv_system(). Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Jack Steiner <steiner@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Родитель
9c8bb6b534
Коммит
1c0040047d
|
@ -0,0 +1,13 @@
|
|||
#ifndef _ASM_IA64_UV_UV_H
|
||||
#define _ASM_IA64_UV_UV_H
|
||||
|
||||
#include <asm/system.h>
|
||||
#include <asm/sn/simulator.h>
|
||||
|
||||
static inline int is_uv_system(void)
|
||||
{
|
||||
/* temporary support for running on hardware simulator */
|
||||
return IS_MEDUSA() || ia64_platform_is("uv");
|
||||
}
|
||||
|
||||
#endif /* _ASM_IA64_UV_UV_H */
|
|
@ -19,8 +19,6 @@
|
|||
#ifndef __GRU_H__
|
||||
#define __GRU_H__
|
||||
|
||||
#include <asm/uv/uv.h>
|
||||
|
||||
/*
|
||||
* GRU architectural definitions
|
||||
*/
|
||||
|
|
|
@ -36,23 +36,11 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <asm/uv/uv.h>
|
||||
#include "gru.h"
|
||||
#include "grulib.h"
|
||||
#include "grutables.h"
|
||||
|
||||
#if defined CONFIG_X86_64
|
||||
#include <asm/genapic.h>
|
||||
#include <asm/irq.h>
|
||||
#define IS_UV() is_uv_system()
|
||||
#elif defined CONFIG_IA64
|
||||
#include <asm/system.h>
|
||||
#include <asm/sn/simulator.h>
|
||||
/* temp support for running on hardware simulator */
|
||||
#define IS_UV() IS_MEDUSA() || ia64_platform_is("uv")
|
||||
#else
|
||||
#define IS_UV() 0
|
||||
#endif
|
||||
|
||||
#include <asm/uv/uv_hub.h>
|
||||
#include <asm/uv/uv_mmrs.h>
|
||||
|
||||
|
@ -381,7 +369,7 @@ static int __init gru_init(void)
|
|||
char id[10];
|
||||
void *gru_start_vaddr;
|
||||
|
||||
if (!IS_UV())
|
||||
if (!is_uv_system())
|
||||
return 0;
|
||||
|
||||
#if defined CONFIG_IA64
|
||||
|
@ -451,7 +439,7 @@ static void __exit gru_exit(void)
|
|||
int order = get_order(sizeof(struct gru_state) *
|
||||
GRU_CHIPLETS_PER_BLADE);
|
||||
|
||||
if (!IS_UV())
|
||||
if (!is_uv_system())
|
||||
return;
|
||||
|
||||
for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
|
||||
|
|
|
@ -15,21 +15,19 @@
|
|||
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#if defined CONFIG_X86_UV || defined CONFIG_IA64_SGI_UV
|
||||
#include <asm/uv/uv.h>
|
||||
#define is_uv() is_uv_system()
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_IA64
|
||||
#ifndef is_uv
|
||||
#define is_uv() 0
|
||||
#endif
|
||||
|
||||
#if defined CONFIG_IA64
|
||||
#include <asm/system.h>
|
||||
#include <asm/sn/arch.h> /* defines is_shub1() and is_shub2() */
|
||||
#define is_shub() ia64_platform_is("sn2")
|
||||
#ifdef CONFIG_IA64_SGI_UV
|
||||
#define is_uv() ia64_platform_is("uv")
|
||||
#else
|
||||
#define is_uv() 0
|
||||
#endif
|
||||
#endif
|
||||
#ifdef CONFIG_X86_64
|
||||
#include <asm/genapic.h>
|
||||
#define is_uv() is_uv_system()
|
||||
#endif
|
||||
|
||||
#ifndef is_shub1
|
||||
|
@ -44,10 +42,6 @@
|
|||
#define is_shub() 0
|
||||
#endif
|
||||
|
||||
#ifndef is_uv
|
||||
#define is_uv() 0
|
||||
#endif
|
||||
|
||||
#ifdef USE_DBUG_ON
|
||||
#define DBUG_ON(condition) BUG_ON(condition)
|
||||
#else
|
||||
|
|
Загрузка…
Ссылка в новой задаче