Commit 803bf599 authored by Peter Chubb's avatar Peter Chubb Committed by David Mosberger

[PATCH] ia64: Define ia64_max_iommu_merge_mask unconditionally

Define ia64_max_iommu_merge_mask even without CONFIG_PCI,
so that the simulator can link.
parent 204ad05b
...@@ -67,7 +67,6 @@ unsigned int num_io_spaces; ...@@ -67,7 +67,6 @@ unsigned int num_io_spaces;
unsigned char aux_device_present = 0xaa; /* XXX remove this when legacy I/O is gone */ unsigned char aux_device_present = 0xaa; /* XXX remove this when legacy I/O is gone */
#ifdef CONFIG_PCI
/* /*
* The merge_mask variable needs to be set to (max(iommu_page_size(iommu)) - 1). This * The merge_mask variable needs to be set to (max(iommu_page_size(iommu)) - 1). This
* mask specifies a mask of address bits that must be 0 in order for two buffers to be * mask specifies a mask of address bits that must be 0 in order for two buffers to be
...@@ -78,7 +77,6 @@ unsigned char aux_device_present = 0xaa; /* XXX remove this when legacy I ...@@ -78,7 +77,6 @@ unsigned char aux_device_present = 0xaa; /* XXX remove this when legacy I
* page-size of 2^64. * page-size of 2^64.
*/ */
unsigned long ia64_max_iommu_merge_mask = ~0UL; unsigned long ia64_max_iommu_merge_mask = ~0UL;
#endif
#define COMMAND_LINE_SIZE 512 #define COMMAND_LINE_SIZE 512
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment