linux-next: Tree for March 26
Subsystems (4)
Hi all,
Changes since 20090325:
The tracing tree gained a build failure so I used the version from next-20090325.
The pci tree lost its build failure.
The net tree gained a conflict against the infiniband tree.
The rr tree lost a conflict.
The proc tree lost its build failure.
The dwmw2-iommu tree gained a conflict against the iommu tree.
The drivers-core tree gained a build failure due to updates in the pci tree. I applied a merge fixup patch.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below).
You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 133 trees (counting Linus' and 18 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
Signature · 211 lines
Cheers, Stephen Rothwell [email protected] $ git checkout master $ git reset --hard stable Merging origin/master Merging arm-current/master Merging m68k-current/for-linus Merging powerpc-merge/merge Merging sparc-current/master Merging scsi-rc-fixes/master Merging net-current/master Merging sound-current/for-linus Merging pci-current/for-linus Merging wireless-current/master Merging kbuild-current/master Merging quilt/driver-core.current Merging quilt/usb.current Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-linus Merging audit-current/for-linus Merging crypto-current/master Merging dwmw2/master Merging arm/devel CONFLICT (content): Merge conflict in arch/arm/include/asm/elf.h CONFLICT (content): Merge conflict in arch/arm/kernel/module.c CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging mips/mips-for-linux-next Merging parisc/master Merging powerpc/next Merging 4xx/next Merging galak/next Merging pxa/for-next Merging s390/features Merging sh/master Merging sparc/master Merging x86/auto-x86-next CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h Merging xtensa/master Merging tip-core/auto-core-next CONFLICT (content): Merge conflict in arch/x86/kernel/pci-nommu.c CONFLICT (content): Merge conflict in lib/Kconfig.debug Merging cpus4096/auto-cpus4096-next CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel_cacheinfo.c $ git reset --hard HEAD^ Merging next-20090325/tracing Merging genirq/auto-genirq-next CONFLICT (content): Merge conflict in kernel/irq/handle.c Merging safe-poison-pointers/auto-safe-poison-pointers-next Merging sched/auto-sched-next CONFLICT (content): Merge conflict in lib/Makefile Merging stackprotector/auto-stackprotector-next Merging timers/auto-timers-next Merging pci/linux-next CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging quilt/device-mapper Merging hid/for-next Merging quilt/i2c CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Merging v4l-dvb/master Merging quota/for_next Merging jfs/next Merging kbuild/master Merging quilt/ide CONFLICT (content): Merge conflict in drivers/ide/ide-dma.c CONFLICT (content): Merge conflict in drivers/ide/ide-floppy.c CONFLICT (content): Merge conflict in include/linux/ide.h Merging libata/NEXT Merging nfs/linux-next Merging xfs/master Merging infiniband/for-next Merging acpi/test Merging nfsd/nfsd-next Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/master Merging dlm/next Merging scsi/master Merging ocfs2/linux-next Merging ext4/next CONFLICT (content): Merge conflict in fs/ext4/inode.c Merging async_tx/next Merging udf/for_next Merging net/master CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb3/cxio_hal.h CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_nic.c CONFLICT (content): Merge conflict in include/linux/netfilter/xt_limit.h CONFLICT (content): Merge conflict in include/linux/netfilter/xt_statistic.h Applying: net: tracing interface fixup Merging wireless/master Merging mtd/master CONFLICT (content): Merge conflict in drivers/mtd/maps/Makefile Merging crypto/master Merging vfs/for-next Merging sound/for-next Merging cpufreq/next CONFLICT (content): Merge conflict in arch/x86/include/asm/timer.h Merging v9fs/for-next CONFLICT (content): Merge conflict in net/9p/protocol.c Merging quilt/rr CONFLICT (content): Merge conflict in arch/powerpc/kernel/irq.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/sysfs.c CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-ich.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-lib.c CONFLICT (content): Merge conflict in arch/x86/lguest/boot.c CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-default/setup.c left in tree. CONFLICT (delete/modify): arch/x86/mach-voyager/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-voyager/setup.c left in tree. CONFLICT (content): Merge conflict in drivers/firmware/dcdbas.c CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h CONFLICT (content): Merge conflict in drivers/net/virtio_net.c CONFLICT (content): Merge conflict in kernel/module.c $ git rm -f arch/x86/mach-default/setup.c $ git rm -f arch/x86/mach-voyager/setup.c Applying: rr: x86 irqaction merge fixup Merging cifs/master Merging mmc/next Merging gfs2/master Merging input/next Merging bkl-removal/bkl-removal Merging ubifs/linux-next Merging lsm/for-next Merging block/for-next Merging embedded/master Merging firmware/master CONFLICT (content): Merge conflict in firmware/Makefile CONFLICT (content): Merge conflict in firmware/WHENCE CONFLICT (content): Merge conflict in sound/isa/Kconfig Merging pcmcia/master Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging kgdb/kgdb-next Merging slab/for-next CONFLICT (content): Merge conflict in include/linux/rcupdate.h CONFLICT (content): Merge conflict in include/linux/slub_def.h CONFLICT (content): Merge conflict in mm/slob.c CONFLICT (content): Merge conflict in mm/slub.c Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_proc.c Merging voltage/for-next Merging security-testing/next Merging lblnet/master CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging quilt/ttydev Merging agp/agp-next Merging generic-ipi/auto-generic-ipi-next Merging oprofile/auto-oprofile-next Merging fastboot/auto-fastboot-next Merging sparseirq/auto-sparseirq-next Merging iommu/auto-iommu-next CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in lib/Makefile Merging uwb/for-upstream Merging watchdog/master Merging proc/proc CONFLICT (content): Merge conflict in security/selinux/hooks.c Merging bdev/master Merging dwmw2-iommu/master CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Merging cputime/cputime Merging osd/linux-next Merging fatfs/master Merging fuse/for-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next Merging audit/for-next Merging squashfs/master Merging omap/for-next Merging quilt/aoe Merging kmemleak/kmemleak CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in include/linux/percpu.h CONFLICT (content): Merge conflict in init/main.c CONFLICT (content): Merge conflict in kernel/module.c CONFLICT (content): Merge conflict in lib/Kconfig.debug CONFLICT (content): Merge conflict in mm/slob.c CONFLICT (content): Merge conflict in mm/vmalloc.c Merging suspend/linux-next CONFLICT (content): Merge conflict in drivers/xen/manage.c Merging quilt/driver-core CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c Applying: acpi: update thermal for bus_id removal Applying: pci: update fakephp for bus_id removal Merging quilt/usb Merging quilt/staging Merging scsi-post-merge/master
Next March 26: s390 allnoconfig build failure still exists
I still see the following s390 allnoconfig build failure with today's next (and previous trees as well ).
arch/s390/include/asm/smp.h:96: error: redefinition of smp_send_stop include/linux/smp.h:125: error: previous definition of smp_send_stop was here
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Re: Next March 26: s390 allnoconfig build failure still exists
Quoted 5 lines · On Thu, 26 Mar 2009 15:26:53 +0530 Sachin Sant <[email protected]> wrote:
I still see the following s390 allnoconfig build failure with today's next (and previous trees as well ).
arch/s390/include/asm/smp.h:96: error: redefinition ofsmp_send_stopinclude/linux/smp.h:125: error: previous definition ofsmp_send_stopwas here
In theory it should have been fixed, since I sent a patch and Ingo applied it:
http://lkml.org/lkml/2009/3/20/74
For some reason it doesn't show up in linux-next.
Re: Next March 26: s390 allnoconfig build failure still exists
In reply to Sachin SantHi Sachin,
Quoted 6 lines · On Thu, 26 Mar 2009 15:26:53 +0530 Sachin Sant <[email protected]> wrote:
I still see the following s390 allnoconfig build failure with today's next (and previous trees as well ).
arch/s390/include/asm/smp.h:96: error: redefinition ofsmp_send_stopinclude/linux/smp.h:125: error: previous definition ofsmp_send_stopwas here
There will be a fix for this in today's linux-next.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: linux-next: Tree for March 26 (benet)
In reply to Stephen RothwellQuoted 3 lines · Stephen Rothwell
Hi all,
Changes since 20090325:
on i386 build:
drivers/built-in.o: In function `be_worker':
be_main.c:(.text+0x827c7): undefined reference to __udivdi3' be_main.c:(.text+0x8286c): undefined reference to __udivdi3'
Probably one of the called functions (that contains division) is inlined.
Signature · 1 line
~Randy
PATCH 1/1 benet: use do_div() for 64 bit divide
The benet driver is doing a 64 bit divide, which is not supported in Linux kernel on 32 bit architectures. The correct way to do this is to use do_div(). Compile tested on i386 only.
drivers/net/benet/be_main.c +19 -11
@@ -16,6 +16,7 @@*/ #include "be.h" +#include <asm/div64.h> MODULE_VERSION (DRV_VER );MODULE_DEVICE_TABLE (pci, be_dev_ids);
@@ -290,6 +291,17 @@ static struct net_device_stats *be_get_sreturn &adapter->stats.net_stats; } +static u32 be_calc_rate (u64 bytes,unsigned long ticks) +{ +u64 rate = bytes; + +do_div (rate, ticks /HZ ); + rate <<=3 ;/* bytes/sec -> bits/sec */ +do_div (rate,1000000ul );/* MB/Sec */ + +return rate; +} +static void be_tx_rate_update (struct be_adapter *adapter) {struct be_drvr_stats *stats =drvr_stats (adapter);
@@ -303,11 +315,9 @@ static void be_tx_rate_update(struct be_/* Update tx rate once in two seconds */ if ((now - stats->be_tx_jiffies) >2 *HZ ) { -u32 r; - r = (stats->be_tx_bytes - stats->be_tx_bytes_prev) / - ((now - stats->be_tx_jiffies) /HZ ); - r = r /1000000 ;/* M bytes/s */ - stats->be_tx_rate = r *8 ;/* M bits/s */ + stats->be_tx_rate =be_calc_rate (stats->be_tx_bytes + - stats->be_tx_bytes_prev, + now - stats->be_tx_jiffies); stats->be_tx_jiffies = now; stats->be_tx_bytes_prev = stats->be_tx_bytes; }
@@ -599,7 +609,6 @@ static void be_rx_rate_update(struct be_ {struct be_drvr_stats *stats =drvr_stats (adapter);ulong now = jiffies; -u32 rate;/* Wrapped around */ if (time_before (now, stats->be_rx_jiffies)) {
@@ -610,11 +619,10 @@ static void be_rx_rate_update(struct be_/* Update the rate once in two seconds */ if ((now - stats->be_rx_jiffies) <2 *HZ )return ; - - rate = (stats->be_rx_bytes - stats->be_rx_bytes_prev) / - ((now - stats->be_rx_jiffies) /HZ ); - rate = rate /1000000 ;/* MB/Sec */ - stats->be_rx_rate = rate *8 ;/* Mega Bits/Sec */ + + stats->be_rx_rate =be_calc_rate (stats->be_rx_bytes + - stats->be_rx_bytes_prev, + now - stats->be_rx_jiffies); stats->be_rx_jiffies = now; stats->be_rx_bytes_prev = stats->be_rx_bytes; }
Re: [PATCH] benet: use do_div() for 64 bit divide
Quoted 5 lines · Stephen Hemminger
The benet driver is doing a 64 bit divide, which is not supported in Linux kernel on 32 bit architectures. The correct way to do this is to use
do_div(). Compile tested on i386 only.Signed-off-by Stephen Hemminger <[email protected]>
Thanks.
Quoted 68 lines
drivers/net/benet/be_main.c +19
-11@@ -16,6 +16,7 @@*/ #include "be.h" +#include <asm/div64.h> MODULE_VERSION (DRV_VER );MODULE_DEVICE_TABLE (pci, be_dev_ids);@@ -290,6 +291,17 @@ static struct net_device_stats *be_get_sreturn &adapter->stats.net_stats; } +static u32 be_calc_rate (u64 bytes,unsigned long ticks) +{ +u64 rate = bytes; + +do_div (rate, ticks /HZ ); + rate <<=3 ;/* bytes/sec -> bits/sec */ +do_div (rate,1000000ul );/* MB/Sec */ + +return rate; +} +static void be_tx_rate_update (struct be_adapter *adapter) {struct be_drvr_stats *stats =drvr_stats (adapter);@@ -303,11 +315,9 @@ static void be_tx_rate_update(struct be_/* Update tx rate once in two seconds */ if ((now - stats->be_tx_jiffies) >2 *HZ ) { -u32 r; - r = (stats->be_tx_bytes - stats->be_tx_bytes_prev) / - ((now - stats->be_tx_jiffies) /HZ ); - r = r /1000000 ;/* M bytes/s */ - stats->be_tx_rate = r *8 ;/* M bits/s */ + stats->be_tx_rate =be_calc_rate (stats->be_tx_bytes + - stats->be_tx_bytes_prev, + now - stats->be_tx_jiffies); stats->be_tx_jiffies = now; stats->be_tx_bytes_prev = stats->be_tx_bytes; }@@ -599,7 +609,6 @@ static void be_rx_rate_update(struct be_ {struct be_drvr_stats *stats =drvr_stats (adapter);ulong now = jiffies; -u32 rate;/* Wrapped around */ if (time_before (now, stats->be_rx_jiffies)) {@@ -610,11 +619,10 @@ static void be_rx_rate_update(struct be_/* Update the rate once in two seconds */ if ((now - stats->be_rx_jiffies) <2 *HZ )return ; - - rate = (stats->be_rx_bytes - stats->be_rx_bytes_prev) / - ((now - stats->be_rx_jiffies) /HZ ); - rate = rate /1000000 ;/* MB/Sec */ - stats->be_rx_rate = rate *8 ;/* Mega Bits/Sec */ + + stats->be_rx_rate =be_calc_rate (stats->be_rx_bytes + - stats->be_rx_bytes_prev, + now - stats->be_rx_jiffies); stats->be_rx_jiffies = now; stats->be_rx_bytes_prev = stats->be_rx_bytes; }
Signature · 1 line
~Randy
Re: [PATCH] benet: use do_div() for 64 bit divide
From: Randy Dunlap <[email protected]>
Date: Thu, 26 Mar 2009 13:10:11 -0700
Quoted 8 lines
Quoted 5 lines · Stephen Hemminger
The benet driver is doing a 64 bit divide, which is not supported in Linux kernel on 32 bit architectures. The correct way to do this is to use
do_div(). Compile tested on i386 only.Signed-off-by Stephen Hemminger <[email protected]>
Applied, thanks everyone.
PATCH 1/1 exofs: fix printk format warnings
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix exofs printk format warnings:
fs/exofs/inode.c:184: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int' fs/exofs/inode.c:291: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int' fs/exofs/inode.c:373: warning: format '%zx' expects type 'size_t', but argument 7 has type 'long unsigned int' fs/exofs/inode.c:461: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int' fs/exofs/inode.c:534: warning: format '%zx' expects type 'size_t', but argument 7 has type 'long unsigned int' fs/exofs/inode.c:610: warning: format '%zx' expects type 'size_t', but argument 5 has type 'long unsigned int'
--- fs/exofs/inode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/exofs/inode.c +6 -6
@@ -182,7 +182,7 @@ static int __readpages_done(struct osd_r good_bytes = pcol->length - resid;EXOFS_DBGMSG ("readpages_done(%ld) good_bytes=%llx" -" length=%zx nr_pages=%u\n" , +" length=%lx nr_pages=%u\n" , pcol->inode->i_ino,_LLU (good_bytes), pcol->length, pcol->nr_pages);
@@ -288,7 +288,7 @@ static int read_exec(struct page_collectatomic_inc (&pcol->sbi->s_curr_pending); -EXOFS_DBGMSG ("read_exec obj=%llx start=%llx length=%zx\n" , +EXOFS_DBGMSG ("read_exec obj=%llx start=%llx length=%lx\n" , obj.id,_LLU (i_start), pcol->length);/* pages ownership was passed to pcol_copy */
@@ -371,7 +371,7 @@ try_again: ret =pcol_add_page (pcol, page, len);if (ret) {EXOFS_DBGMSG ("Failed pcol_add_page pages[i]=%p " -"len=%zx nr_pages=%u length=%zx\n" , +"len=%zx nr_pages=%u length=%lx\n" , page, len, pcol->nr_pages, pcol->length);/* split the request, and start again with current page */
@@ -459,7 +459,7 @@ static void writepages_done(struct osd_r good_bytes = pcol->length - resid;EXOFS_DBGMSG ("writepages_done(%lx) good_bytes=%llx" -" length=%zx nr_pages=%u\n" , +" length=%lx nr_pages=%u\n" , pcol->inode->i_ino,_LLU (good_bytes), pcol->length, pcol->nr_pages);
@@ -531,7 +531,7 @@ static int write_exec(struct page_collec }atomic_inc (&pcol->sbi->s_curr_pending); -EXOFS_DBGMSG ("write_exec(%lx, %lx) start=%llx length=%zx\n" , +EXOFS_DBGMSG ("write_exec(%lx, %lx) start=%llx length=%lx\n" , pcol->inode->i_ino, pcol->pg_first,_LLU (i_start), pcol->length);/* pages ownership was passed to pcol_copy */
@@ -608,7 +608,7 @@ try_again: ret =pcol_add_page (pcol, page, len);if (unlikely (ret)) {EXOFS_DBGMSG ("Failed pcol_add_page " -"nr_pages=%u total_length=%zx\n" , +"nr_pages=%u total_length=%lx\n" , pcol->nr_pages, pcol->length);/* split the request, next loop will start again */
Boaz Harrosh
AppliedRe: [PATCH -next] exofs: fix printk format warnings
Quoted 11 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix exofs printk format warnings:
fs/exofs/inode.c:184: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int'fs/exofs/inode.c:291: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int'fs/exofs/inode.c:373: warning: format '%zx' expects type 'size_t', but argument 7 has type 'long unsigned int'fs/exofs/inode.c:461: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int'fs/exofs/inode.c:534: warning: format '%zx' expects type 'size_t', but argument 7 has type 'long unsigned int'fs/exofs/inode.c:610: warning: format '%zx' expects type 'size_t', but argument 5 has type 'long unsigned int'
Quoted 2 lines
Signed-off-by Randy Dunlap <[email protected]>cc Boaz Harrosh <[email protected]>
Thanks, much obliged.
Applied, it will be pushed to linux-next and for-linus branches as part of the 2.6.30 patchset. (Later today)
Boaz
Quoted 60 lines
--- fs/exofs/inode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)fs/exofs/inode.c +6
-6@@ -182,7 +182,7 @@ static int __readpages_done(struct osd_r good_bytes = pcol->length - resid;EXOFS_DBGMSG ("readpages_done(%ld) good_bytes=%llx" -" length=%zx nr_pages=%u\n" , +" length=%lx nr_pages=%u\n" , pcol->inode->i_ino,_LLU (good_bytes), pcol->length, pcol->nr_pages);@@ -288,7 +288,7 @@ static int read_exec(struct page_collectatomic_inc (&pcol->sbi->s_curr_pending); -EXOFS_DBGMSG ("read_exec obj=%llx start=%llx length=%zx\n" , +EXOFS_DBGMSG ("read_exec obj=%llx start=%llx length=%lx\n" , obj.id,_LLU (i_start), pcol->length);/* pages ownership was passed to pcol_copy */ @@ -371,7 +371,7 @@ try_again: ret =pcol_add_page (pcol, page, len);if (ret) {EXOFS_DBGMSG ("Failed pcol_add_page pages[i]=%p " -"len=%zx nr_pages=%u length=%zx\n" , +"len=%zx nr_pages=%u length=%lx\n" , page, len, pcol->nr_pages, pcol->length);/* split the request, and start again with current page */ @@ -459,7 +459,7 @@ static void writepages_done(struct osd_r good_bytes = pcol->length - resid;EXOFS_DBGMSG ("writepages_done(%lx) good_bytes=%llx" -" length=%zx nr_pages=%u\n" , +" length=%lx nr_pages=%u\n" , pcol->inode->i_ino,_LLU (good_bytes), pcol->length, pcol->nr_pages);@@ -531,7 +531,7 @@ static int write_exec(struct page_collec }atomic_inc (&pcol->sbi->s_curr_pending); -EXOFS_DBGMSG ("write_exec(%lx, %lx) start=%llx length=%zx\n" , +EXOFS_DBGMSG ("write_exec(%lx, %lx) start=%llx length=%lx\n" , pcol->inode->i_ino, pcol->pg_first,_LLU (i_start), pcol->length);/* pages ownership was passed to pcol_copy */ @@ -608,7 +608,7 @@ try_again: ret =pcol_add_page (pcol, page, len);if (unlikely (ret)) {EXOFS_DBGMSG ("Failed pcol_add_page " -"nr_pages=%u total_length=%zx\n" , +"nr_pages=%u total_length=%lx\n" , pcol->nr_pages, pcol->length);/* split the request, next loop will start again */
Re: [PATCH -next] exofs: fix printk format warnings
In reply to Randy DunlapQuoted 10 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix exofs printk format warnings:
fs/exofs/inode.c:184: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int'fs/exofs/inode.c:291: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int'fs/exofs/inode.c:373: warning: format '%zx' expects type 'size_t', but argument 7 has type 'long unsigned int'fs/exofs/inode.c:461: warning: format '%zx' expects type 'size_t', but argument 6 has type 'long unsigned int'fs/exofs/inode.c:534: warning: format '%zx' expects type 'size_t', but argument 7 has type 'long unsigned int'fs/exofs/inode.c:610: warning: format '%zx' expects type 'size_t', but argument 5 has type 'long unsigned
It also wouldn't hurt to
- kill EXOFS_DBGMSG()
- s/EXOFS_DBGMSG/pr_debug/g
- #define pr_fmt(fmt) "%s: " fmt, __func__
That way we always get printf()-style warning checking, even if CONFIG_EXOFS_DEBUG
is not enabled.
Similar for EXOFS_ERR() -> pr_err()
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds