diff options
author | Matthew Wilcox <matthew@wil.cx> | 2009-05-22 16:49:49 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:33:49 -0400 |
commit | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (patch) | |
tree | 07b012952bbbaccfe4ef3bb44b1ea0a3a3bb3868 /arch/ia64/kernel/pci-dma.c | |
parent | e56e2dcd381d9ec35379328f332221581eda4787 (diff) |
[IA64] Convert ia64 to use int-ll64.h
It is generally agreed that it would be beneficial for u64 to be an
unsigned long long on all architectures. ia64 (in common with several
other 64-bit architectures) currently uses unsigned long. Migrating
piecemeal is too painful; this giant patch fixes all compilation warnings
and errors that come as a result of switching to use int-ll64.h.
Note that userspace will still see __u64 defined as unsigned long. This
is important as it affects C++ name mangling.
[Updated by Tony Luck to change efi.h:efi_freemem_callback_t to use
u64 for start/end rather than unsigned long]
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/pci-dma.c')
-rw-r--r-- | arch/ia64/kernel/pci-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index eb987386f691..1376da45fd08 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c | |||
@@ -91,7 +91,7 @@ int iommu_dma_supported(struct device *dev, u64 mask) | |||
91 | type. Normally this doesn't make any difference, but gives | 91 | type. Normally this doesn't make any difference, but gives |
92 | more gentle handling of IOMMU overflow. */ | 92 | more gentle handling of IOMMU overflow. */ |
93 | if (iommu_sac_force && (mask >= DMA_BIT_MASK(40))) { | 93 | if (iommu_sac_force && (mask >= DMA_BIT_MASK(40))) { |
94 | dev_info(dev, "Force SAC with mask %lx\n", mask); | 94 | dev_info(dev, "Force SAC with mask %llx\n", mask); |
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |
97 | 97 | ||