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 /drivers/char | |
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 'drivers/char')
-rw-r--r-- | drivers/char/agp/hp-agp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 183ac3fe44fb..9c7e2343c399 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c | |||
@@ -518,8 +518,9 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret) | |||
518 | if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa)) | 518 | if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa)) |
519 | return AE_OK; | 519 | return AE_OK; |
520 | 520 | ||
521 | printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset (ioc=%lx, lba=%lx)\n", | 521 | printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset " |
522 | (char *) context, sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa); | 522 | "(ioc=%llx, lba=%llx)\n", (char *)context, |
523 | sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa); | ||
523 | 524 | ||
524 | hp_zx1_gart_found = 1; | 525 | hp_zx1_gart_found = 1; |
525 | return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */ | 526 | return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */ |