diff options
Diffstat (limited to 'arch/ia64/sn/kernel/iomv.c')
-rw-r--r-- | arch/ia64/sn/kernel/iomv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c index 4aa4f301d56d..b1a47da118b1 100644 --- a/arch/ia64/sn/kernel/iomv.c +++ b/arch/ia64/sn/kernel/iomv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | 2 | * This file is subject to the terms and conditions of the GNU General Public |
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
@@ -16,7 +16,6 @@ | |||
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> | ||
20 | 19 | ||
21 | #define IS_LEGACY_VGA_IOPORT(p) \ | 20 | #define IS_LEGACY_VGA_IOPORT(p) \ |
22 | (((p) >= 0x3b0 && (p) <= 0x3bb) || ((p) >= 0x3c0 && (p) <= 0x3df)) | 21 | (((p) >= 0x3b0 && (p) <= 0x3bb) || ((p) >= 0x3c0 && (p) <= 0x3df)) |
@@ -26,9 +25,12 @@ | |||
26 | * @port: port to convert | 25 | * @port: port to convert |
27 | * | 26 | * |
28 | * Legacy in/out instructions are converted to ld/st instructions | 27 | * Legacy in/out instructions are converted to ld/st instructions |
29 | * on IA64. This routine will convert a port number into a valid | 28 | * on IA64. This routine will convert a port number into a valid |
30 | * SN i/o address. Used by sn_in*() and sn_out*(). | 29 | * SN i/o address. Used by sn_in*() and sn_out*(). |
31 | */ | 30 | */ |
31 | |||
32 | extern int sn_acpi_base_support(); | ||
33 | |||
32 | void *sn_io_addr(unsigned long port) | 34 | void *sn_io_addr(unsigned long port) |
33 | { | 35 | { |
34 | if (!IS_RUNNING_ON_SIMULATOR()) { | 36 | if (!IS_RUNNING_ON_SIMULATOR()) { |
@@ -37,7 +39,7 @@ void *sn_io_addr(unsigned long port) | |||
37 | /* On sn2, legacy I/O ports don't point at anything */ | 39 | /* On sn2, legacy I/O ports don't point at anything */ |
38 | if (port < (64 * 1024)) | 40 | if (port < (64 * 1024)) |
39 | return NULL; | 41 | return NULL; |
40 | if (SN_ACPI_BASE_SUPPORT()) | 42 | if (sn_acpi_base_support()) |
41 | return (__ia64_mk_io_addr(port)); | 43 | return (__ia64_mk_io_addr(port)); |
42 | else | 44 | else |
43 | return ((void *)(port | __IA64_UNCACHED_OFFSET)); | 45 | return ((void *)(port | __IA64_UNCACHED_OFFSET)); |