From 27f02e285fb432b8eed20e151f92587cb1160163 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 14 Oct 2003 02:52:05 -0700 Subject: [PATCH] [PATCH] ia64: SN2 module fix Because we're the only platform with seperate in, out, and read routines, we have to include the file that defines them in our machvec header so that users of the functions will get the right defines and not use the non-inline function variants (which are only necessary for generic kernels). --- arch/ia64/sn/kernel/sn2/io.c | 4 ++++ include/asm-ia64/machvec_sn2.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/arch/ia64/sn/kernel/sn2/io.c b/arch/ia64/sn/kernel/sn2/io.c index 92764186fd06b..f1f96bd651a47 100644 --- a/arch/ia64/sn/kernel/sn2/io.c +++ b/arch/ia64/sn/kernel/sn2/io.c @@ -11,6 +11,8 @@ #include +#ifdef CONFIG_IA64_GENERIC + #undef __sn_inb #undef __sn_inw #undef __sn_inl @@ -81,3 +83,5 @@ __sn_readq (void *addr) { return ___sn_readq (addr); } + +#endif diff --git a/include/asm-ia64/machvec_sn2.h b/include/asm-ia64/machvec_sn2.h index 9146e1cff4e6c..37c8682057510 100644 --- a/include/asm-ia64/machvec_sn2.h +++ b/include/asm-ia64/machvec_sn2.h @@ -99,4 +99,6 @@ extern ia64_mv_dma_supported sn_dma_supported; #define platform_dma_sync_sg sn_dma_sync_sg #define platform_dma_supported sn_dma_supported +#include + #endif /* _ASM_IA64_MACHVEC_SN2_H */ -- 2.53.0