fix compilation warnings
Subsystems (8)
The following changes since commit 5765fcf36081bafa06b9553376bd99ceb629beb8:
Ingo Molnar (1):
Merge branch 'linus'
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean.git master
Jaswinder Singh Rajput (5):
x86: mm/init_32.c fix compilation warning
x86: kernel/mpparse.c fix compilation warnings drm_proc.c fix compilation warning falcon fix compilation warnings iscsi_ibft.c fix compilation warning
arch/x86/kernel/mpparse.c | 6 +++--- arch/x86/mm/init_32.c | 2 +- drivers/firmware/iscsi_ibft.c | 4 ++-- drivers/gpu/drm/drm_proc.c | 4 ++-- drivers/net/sfc/falcon.c | 24 ++++++++++++------------ 5 files changed, 20 insertions(+), 20 deletions(-)
Complete diff:
arch/x86/kernel/mpparse.c +3 -3
@@ -692,8 +692,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,#endif mpf_found = mpf; -printk (KERN_INFO "found SMP MP-table at [%p] %08lx\n" , - mpf,virt_to_phys (mpf)); +printk (KERN_INFO "found SMP MP-table at [%p] %llx\n" , + mpf, (u64 )virt_to_phys (mpf));if (!reserve)return 1 ;
@@ -1011,7 +1011,7 @@ static int __init update_mp_table(void)if (!smp_check_mpc (mpc, oem, str))return 0 ; -printk (KERN_INFO "mpf: %lx\n" ,virt_to_phys (mpf)); +printk (KERN_INFO "mpf: %llx\n" , (u64 )virt_to_phys (mpf));printk (KERN_INFO "physptr: %x\n" , mpf->physptr);if (mpc_new_phys && mpc->length > mpc_new_length) {
arch/x86/mm/init_32.c +1 -1
@@ -691,7 +691,7 @@ void __init find_low_pfn_range(void) max_pfn =MAXMEM_PFN + highmem_pages;if (highmem_pages +MAXMEM_PFN > max_pfn) {printk (KERN_WARNING "only %luMB highmem pages " -"available, ignoring highmem size of %uMB.\n" , +"available, ignoring highmem size of %luMB.\n" ,pages_to_mb (max_pfn -MAXMEM_PFN ),pages_to_mb (highmem_pages)); highmem_pages =0 ;
drivers/firmware/iscsi_ibft.c +2 -2
@@ -938,8 +938,8 @@ static int __init ibft_init(void)return -ENOMEM ;if (ibft_addr) { -printk (KERN_INFO "iBFT detected at 0x%lx.\n" , -virt_to_phys ((void *)ibft_addr)); +printk (KERN_INFO "iBFT detected at 0x%llx.\n" , + (u64 )virt_to_phys ((void *)ibft_addr)); rc =ibft_check_device ();if (rc)
drivers/gpu/drm/drm_proc.c +2 -2
@@ -678,9 +678,9 @@ static int drm__vma_info(char *buf, char **start, off_t offset, int request, *start = &buf[offset]; *eof =0 ; -DRM_PROC_PRINT ("vma use count: %d, high_memory = %p, 0x%08lx\n" , +DRM_PROC_PRINT ("vma use count: %d, high_memory = %p, 0x%llx\n" ,atomic_read (&dev->vma_count), - high_memory,virt_to_phys (high_memory)); + high_memory, (u64 )virt_to_phys (high_memory));list_for_each_entry (pt, &dev->vmalist, head) {if (!(vma = pt->vma))continue ;
drivers/net/sfc/falcon.c +12 -12
@@ -338,10 +338,10 @@ static int falcon_alloc_special_buffer(struct efx_nic *efx, nic_data->next_buffer_table += buffer->entries;EFX_LOG (efx,"allocating special buffers %d-%d at %llx+%x " -"(virt %p phys %lx)\n" , buffer->index, +"(virt %p phys %llx)\n" , buffer->index, buffer->index + buffer->entries -1 , - (unsigned long long )buffer->dma_addr, len, - buffer->addr,virt_to_phys (buffer->addr)); + (u64 )buffer->dma_addr, len, + buffer->addr, (u64 )virt_to_phys (buffer->addr));return 0 ; }
@@ -353,10 +353,10 @@ static void falcon_free_special_buffer(struct efx_nic *efx,return ;EFX_LOG (efx,"deallocating special buffers %d-%d at %llx+%x " -"(virt %p phys %lx)\n" , buffer->index, +"(virt %p phys %llx)\n" , buffer->index, buffer->index + buffer->entries -1 , - (unsigned long long )buffer->dma_addr, buffer->len, - buffer->addr,virt_to_phys (buffer->addr)); + (u64 )buffer->dma_addr, buffer->len, + buffer->addr, (u64 )virt_to_phys (buffer->addr));pci_free_consistent (efx->pci_dev, buffer->len, buffer->addr, buffer->dma_addr);
@@ -2343,10 +2343,10 @@ int falcon_probe_port(struct efx_nic *efx) FALCON_MAC_STATS_SIZE);if (rc)return rc; -EFX_LOG (efx,"stats buffer at %llx (virt %p phys %lx)\n" , - (unsigned long long )efx->stats_buffer.dma_addr, +EFX_LOG (efx,"stats buffer at %llx (virt %p phys %llx)\n" , + (u64 )efx->stats_buffer.dma_addr, efx->stats_buffer.addr, -virt_to_phys (efx->stats_buffer.addr)); + (u64 )virt_to_phys (efx->stats_buffer.addr));return 0 ; }
@@ -2921,9 +2921,9 @@ int falcon_probe_nic(struct efx_nic *efx) goto fail4;BUG_ON (efx->irq_status.dma_addr &0x0f ); -EFX_LOG (efx,"INT_KER at %llx (virt %p phys %lx)\n" , - (unsigned long long )efx->irq_status.dma_addr, - efx->irq_status.addr,virt_to_phys (efx->irq_status.addr)); +EFX_LOG (efx,"INT_KER at %llx (virt %p phys %llx)\n" , + (u64 )efx->irq_status.dma_addr, + efx->irq_status.addr, (u64 )virt_to_phys (efx->irq_status.addr));falcon_probe_spi_devices (efx);
PATCH v2 1/1 fix compilation warnings
The following changes since commit 5765fcf36081bafa06b9553376bd99ceb629beb8:
Ingo Molnar (1):
Merge branch 'linus'
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean.git master
Jaswinder Singh Rajput (7):
x86: mm/init_32.c fix compilation warning
x86: kernel/mpparse.c fix compilation warnings drm_proc.c fix compilation warning
falcon fix compilation warnings
iscsi_ibft.c fix compilation warning ne3210.c fix compilation warning for phys_addr_t arlan-main.c fix compilation warnings for phys_addr_t
arch/x86/kernel/mpparse.c | 6 +++--- arch/x86/mm/init_32.c | 2 +- drivers/firmware/iscsi_ibft.c | 4 ++-- drivers/gpu/drm/drm_proc.c | 4 ++-- drivers/net/ne3210.c | 3 ++- drivers/net/sfc/falcon.c | 24 ++++++++++++------------ drivers/net/wireless/arlan-main.c | 4 ++-- 7 files changed, 24 insertions(+), 23 deletions(-)
Complete Diff:
arch/x86/kernel/mpparse.c +3 -3
@@ -692,8 +692,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,#endif mpf_found = mpf; -printk (KERN_INFO "found SMP MP-table at [%p] %08lx\n" , - mpf,virt_to_phys (mpf)); +printk (KERN_INFO "found SMP MP-table at [%p] %llx\n" , + mpf, (u64 )virt_to_phys (mpf));if (!reserve)return 1 ;
@@ -1011,7 +1011,7 @@ static int __init update_mp_table(void)if (!smp_check_mpc (mpc, oem, str))return 0 ; -printk (KERN_INFO "mpf: %lx\n" ,virt_to_phys (mpf)); +printk (KERN_INFO "mpf: %llx\n" , (u64 )virt_to_phys (mpf));printk (KERN_INFO "physptr: %x\n" , mpf->physptr);if (mpc_new_phys && mpc->length > mpc_new_length) {
arch/x86/mm/init_32.c +1 -1
@@ -691,7 +691,7 @@ void __init find_low_pfn_range(void) max_pfn =MAXMEM_PFN + highmem_pages;if (highmem_pages +MAXMEM_PFN > max_pfn) {printk (KERN_WARNING "only %luMB highmem pages " -"available, ignoring highmem size of %uMB.\n" , +"available, ignoring highmem size of %luMB.\n" ,pages_to_mb (max_pfn -MAXMEM_PFN ),pages_to_mb (highmem_pages)); highmem_pages =0 ;
drivers/firmware/iscsi_ibft.c +2 -2
@@ -938,8 +938,8 @@ static int __init ibft_init(void)return -ENOMEM ;if (ibft_addr) { -printk (KERN_INFO "iBFT detected at 0x%lx.\n" , -virt_to_phys ((void *)ibft_addr)); +printk (KERN_INFO "iBFT detected at 0x%llx.\n" , + (u64 )virt_to_phys ((void *)ibft_addr)); rc =ibft_check_device ();if (rc)
drivers/gpu/drm/drm_proc.c +2 -2
@@ -678,9 +678,9 @@ static int drm__vma_info(char *buf, char **start, off_t offset, int request, *start = &buf[offset]; *eof =0 ; -DRM_PROC_PRINT ("vma use count: %d, high_memory = %p, 0x%08lx\n" , +DRM_PROC_PRINT ("vma use count: %d, high_memory = %p, 0x%llx\n" ,atomic_read (&dev->vma_count), - high_memory,virt_to_phys (high_memory)); + high_memory, (u64 )virt_to_phys (high_memory));list_for_each_entry (pt, &dev->vmalist, head) {if (!(vma = pt->vma))continue ;
drivers/net/ne3210.c +2 -1
@@ -150,7 +150,8 @@ static int __init ne3210_eisa_probe (struct device *device)if (phys_mem <virt_to_phys (high_memory)) {printk (KERN_CRIT "ne3210.c: Card RAM overlaps with normal memory!!!\n" );printk (KERN_CRIT "ne3210.c: Use EISA SCU to set card memory below 1MB,\n" ); -printk (KERN_CRIT "ne3210.c: or to an address above 0x%lx.\n" ,virt_to_phys (high_memory)); +printk (KERN_CRIT "ne3210.c: or to an address above 0x%llx.\n" , + (u64 )virt_to_phys (high_memory));printk (KERN_CRIT "ne3210.c: Driver NOT installed.\n" ); retval = -EINVAL ; goto out3;
drivers/net/sfc/falcon.c +12 -12
@@ -338,10 +338,10 @@ static int falcon_alloc_special_buffer(struct efx_nic *efx, nic_data->next_buffer_table += buffer->entries;EFX_LOG (efx,"allocating special buffers %d-%d at %llx+%x " -"(virt %p phys %lx)\n" , buffer->index, +"(virt %p phys %llx)\n" , buffer->index, buffer->index + buffer->entries -1 , - (unsigned long long )buffer->dma_addr, len, - buffer->addr,virt_to_phys (buffer->addr)); + (u64 )buffer->dma_addr, len, + buffer->addr, (u64 )virt_to_phys (buffer->addr));return 0 ; }
@@ -353,10 +353,10 @@ static void falcon_free_special_buffer(struct efx_nic *efx,return ;EFX_LOG (efx,"deallocating special buffers %d-%d at %llx+%x " -"(virt %p phys %lx)\n" , buffer->index, +"(virt %p phys %llx)\n" , buffer->index, buffer->index + buffer->entries -1 , - (unsigned long long )buffer->dma_addr, buffer->len, - buffer->addr,virt_to_phys (buffer->addr)); + (u64 )buffer->dma_addr, buffer->len, + buffer->addr, (u64 )virt_to_phys (buffer->addr));pci_free_consistent (efx->pci_dev, buffer->len, buffer->addr, buffer->dma_addr);
@@ -2343,10 +2343,10 @@ int falcon_probe_port(struct efx_nic *efx) FALCON_MAC_STATS_SIZE);if (rc)return rc; -EFX_LOG (efx,"stats buffer at %llx (virt %p phys %lx)\n" , - (unsigned long long )efx->stats_buffer.dma_addr, +EFX_LOG (efx,"stats buffer at %llx (virt %p phys %llx)\n" , + (u64 )efx->stats_buffer.dma_addr, efx->stats_buffer.addr, -virt_to_phys (efx->stats_buffer.addr)); + (u64 )virt_to_phys (efx->stats_buffer.addr));return 0 ; }
@@ -2921,9 +2921,9 @@ int falcon_probe_nic(struct efx_nic *efx) goto fail4;BUG_ON (efx->irq_status.dma_addr &0x0f ); -EFX_LOG (efx,"INT_KER at %llx (virt %p phys %lx)\n" , - (unsigned long long )efx->irq_status.dma_addr, - efx->irq_status.addr,virt_to_phys (efx->irq_status.addr)); +EFX_LOG (efx,"INT_KER at %llx (virt %p phys %llx)\n" , + (u64 )efx->irq_status.dma_addr, + efx->irq_status.addr, (u64 )virt_to_phys (efx->irq_status.addr));falcon_probe_spi_devices (efx);
drivers/net/wireless/arlan-main.c +2 -2
@@ -1082,8 +1082,8 @@ static int __init arlan_probe_here(struct net_device *dev,if (arlan_check_fingerprint (memaddr))return -ENODEV ; -printk (KERN_NOTICE "%s: Arlan found at %x, \n " , dev->name, - (int )virt_to_phys ((void *)memaddr)); +printk (KERN_NOTICE "%s: Arlan found at %llx, \n " , dev->name, + (u64 )virt_to_phys ((void *)memaddr)); ap->card = (void *) memaddr; dev->mem_start = memaddr;
Quoted 17 lines · Jaswinder Singh Rajput
The following changes since commit
5765fcf36081bafa06b9553376bd99ceb629beb8:
Ingo Molnar (1):
Merge branch 'linus'are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean.gitmasterJaswinder Singh Rajput (7):
x86:mm/init_32.cfix compilation warning
x86:kernel/mpparse.cfix compilation warningsdrm_proc.cfix compilation warning
falcon fix compilation warnings
iscsi_ibft.cfix compilation warningne3210.cfix compilation warning forphys_addr_tarlan-main.cfix compilation warnings forphys_addr_t
Quoted 8 lines
arch/x86/kernel/mpparse.c | 6 +++--- arch/x86/mm/init_32.c | 2 +- drivers/firmware/iscsi_ibft.c | 4 ++-- drivers/gpu/drm/drm_proc.c | 4 ++-- drivers/net/ne3210.c | 3 ++- drivers/net/sfc/falcon.c | 24 ++++++++++++------------ drivers/net/wireless/arlan-main.c | 4 ++-- 7 files changed, 24 insertions(+), 23 deletions(-)
Pulled, thanks Jaswinder.
For those wondering about how these files can be affected by the x86 tree, it's fallout of:
976e8f6: x86: asm/io.h: unify virt_to_phys/phys_to_virt
Which standardized the return type of virt_to_phys() to phys_addr_t, and caused these build warnings.
Ingo