aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/sn/kernel/iomv.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/sn/kernel/iomv.c')
-rw-r--r--arch/ia64/sn/kernel/iomv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c
index b1a47da118b1..ab7e2fd40798 100644
--- a/arch/ia64/sn/kernel/iomv.c
+++ b/arch/ia64/sn/kernel/iomv.c
@@ -16,6 +16,7 @@
16#include <asm/sn/pda.h> 16#include <asm/sn/pda.h>
17#include <asm/sn/sn_cpuid.h> 17#include <asm/sn/sn_cpuid.h>
18#include <asm/sn/shub_mmr.h> 18#include <asm/sn/shub_mmr.h>
19#include <asm/sn/acpi.h>
19 20
20#define IS_LEGACY_VGA_IOPORT(p) \ 21#define IS_LEGACY_VGA_IOPORT(p) \
21 (((p) >= 0x3b0 && (p) <= 0x3bb) || ((p) >= 0x3c0 && (p) <= 0x3df)) 22 (((p) >= 0x3b0 && (p) <= 0x3bb) || ((p) >= 0x3c0 && (p) <= 0x3df))
@@ -29,8 +30,6 @@
29 * SN i/o address. Used by sn_in*() and sn_out*(). 30 * SN i/o address. Used by sn_in*() and sn_out*().
30 */ 31 */
31 32
32extern int sn_acpi_base_support();
33
34void *sn_io_addr(unsigned long port) 33void *sn_io_addr(unsigned long port)
35{ 34{
36 if (!IS_RUNNING_ON_SIMULATOR()) { 35 if (!IS_RUNNING_ON_SIMULATOR()) {
@@ -39,7 +38,7 @@ void *sn_io_addr(unsigned long port)
39 /* On sn2, legacy I/O ports don't point at anything */ 38 /* On sn2, legacy I/O ports don't point at anything */
40 if (port < (64 * 1024)) 39 if (port < (64 * 1024))
41 return NULL; 40 return NULL;
42 if (sn_acpi_base_support()) 41 if (SN_ACPI_BASE_SUPPORT())
43 return (__ia64_mk_io_addr(port)); 42 return (__ia64_mk_io_addr(port));
44 else 43 else
45 return ((void *)(port | __IA64_UNCACHED_OFFSET)); 44 return ((void *)(port | __IA64_UNCACHED_OFFSET));