The patch titled
e1000 printk warning fixes
has been added to the -mm tree. Its filename is
e1000-printk-warning-fixes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: e1000 printk warning fixes
From: Andrew Morton <akpm@xxxxxxxx>
ia64:
drivers/net/e1000/e1000_main.c: In function `e1000_dump':
drivers/net/e1000/e1000_main.c:3365: warning: long long unsigned int format, u64 arg (arg 3)
drivers/net/e1000/e1000_main.c:3365: warning: long long unsigned int format, u64 arg (arg 4)
drivers/net/e1000/e1000_main.c:3365: warning: long long unsigned int format, dma_addr_t arg (arg 5)
drivers/net/e1000/e1000_main.c:3365: warning: long long unsigned int format, long unsigned int arg (arg 8)
drivers/net/e1000/e1000_main.c:3397: warning: long long unsigned int format, u64 arg (arg 3)
drivers/net/e1000/e1000_main.c:3397: warning: long long unsigned int format, u64 arg (arg 4)
drivers/net/e1000/e1000_main.c:3397: warning: long long unsigned int format, u64 arg (arg 5)
drivers/net/e1000/e1000_main.c:3397: warning: long long unsigned int format, u64 arg (arg 6)
drivers/net/e1000/e1000_main.c:3405: warning: long long unsigned int format, u64 arg (arg 3)
drivers/net/e1000/e1000_main.c:3405: warning: long long unsigned int format, u64 arg (arg 4)
drivers/net/e1000/e1000_main.c:3405: warning: long long unsigned int format, u64 arg (arg 5)
drivers/net/e1000/e1000_main.c:3405: warning: long long unsigned int format, u64 arg (arg 6)
drivers/net/e1000/e1000_main.c:3426: warning: long long unsigned int format, u64 arg (arg 3)
drivers/net/e1000/e1000_main.c:3426: warning: long long unsigned int format, u64 arg (arg 4)
drivers/net/e1000/e1000_main.c:3426: warning: long long unsigned int format, dma_addr_t arg (arg 5)
you do not know what type is used to implement u64 and you cannot print them.
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/e1000/e1000_main.c | 37 +++++++++++++++++++++----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff -puN drivers/net/e1000/e1000_main.c~e1000-printk-warning-fixes drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c~e1000-printk-warning-fixes
+++ a/drivers/net/e1000/e1000_main.c
@@ -3358,11 +3358,16 @@ void e1000_dump(struct e1000_adapter* ad
struct e1000_buffer *buffer_info = &tx_ring->buffer_info[i];
struct my_u { u64 a; u64 b;};
struct my_u *u = (struct my_u *)tx_desc;
- printk("T[0x%03X] %016llX %016llX %016llX %04X %3X %016llX %p",
- i, le64_to_cpu(u->a),le64_to_cpu(u->b),
- (u64)buffer_info->dma, buffer_info->length,
- buffer_info->next_to_watch, (u64)buffer_info->time_stamp,
- buffer_info->skb);
+ printk("T[0x%03X] %016llX %016llX %016llX %04X %3X "
+ "%016llX %p",
+ i,
+ (unsigned long long)le64_to_cpu(u->a),
+ (unsigned long long)le64_to_cpu(u->b),
+ (unsigned long long)buffer_info->dma,
+ buffer_info->length,
+ buffer_info->next_to_watch,
+ (unsigned long long)buffer_info->time_stamp,
+ buffer_info->skb);
if(i == tx_ring->next_to_use && i == tx_ring->next_to_clean)
printk(" NTC/U\n");
else if(i == tx_ring->next_to_use)
@@ -3392,15 +3397,22 @@ void e1000_dump(struct e1000_adapter* ad
uint32_t staterr;
staterr = le32_to_cpu(rx_desc->wb.middle.status_error);
if (staterr & E1000_RXD_STAT_DD) {
- printk("RWB[0x%03X] %016llX %016llX %016llX %016llX %p",
- i, le64_to_cpu(u->a),le64_to_cpu(u->b), le64_to_cpu(u->c), le64_to_cpu(u->d),
+ printk("RWB[0x%03X] %016llX %016llX "
+ "%016llX %016llX %p",
+ i,
+ (unsigned long long)le64_to_cpu(u->a),
+ (unsigned long long)le64_to_cpu(u->b),
+ (unsigned long long)le64_to_cpu(u->c),
+ (unsigned long long)le64_to_cpu(u->d),
buffer_info->skb);
}
else {
printk("R [0x%03X] %016llX %016llX %016llX"
" %016llX %016llX %p", i,
- le64_to_cpu(u->a), le64_to_cpu(u->b),
- le64_to_cpu(u->c), le64_to_cpu(u->d),
+ (unsigned long long)le64_to_cpu(u->a),
+ (unsigned long long)le64_to_cpu(u->b),
+ (unsigned long long)le64_to_cpu(u->c),
+ (unsigned long long)le64_to_cpu(u->d),
(unsigned long long)buffer_info->dma,
buffer_info->skb);
}
@@ -3422,8 +3434,11 @@ void e1000_dump(struct e1000_adapter* ad
struct my_u { u64 a; u64 b;};
struct my_u *u = (struct my_u *)rx_desc;
printk("R[0x%03X] %016llX %016llX %016llX %p",
- i, le64_to_cpu(u->a),le64_to_cpu(u->b),
- (u64)buffer_info->dma, buffer_info->skb);
+ i,
+ (unsigned long long)le64_to_cpu(u->a),
+ (unsigned long long)le64_to_cpu(u->b),
+ (unsigned long long)buffer_info->dma,
+ buffer_info->skb);
if(i == rx_ring->next_to_use)
printk(" NTU\n");
else if(i == rx_ring->next_to_clean)
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
dm-raid1-fix-waiting-for-io-on-suspend-fix.patch
revert-pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch
revert-generic_file_buffered_write-handle-zero-length-iovec-segments.patch
revert-generic_file_buffered_write-deadlock-on-vectored-write.patch
generic_file_buffered_write-cleanup.patch
mm-fix-pagecache-write-deadlocks.patch
fs-prepare_write-fixes-fuse-fix.patch
fs-prepare_write-fixes-fat-fix.patch
git-acpi.patch
video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register-msi-laptop-fix.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
video-sysfs-support-take-2-add-dev-argument-for-backlight_device_register-sony_acpi-fix.patch
git-cpufreq-prep.patch
git-cpufreq.patch
git-dvb.patch
git-ia64.patch
git-input.patch
git-input-fixup.patch
git-libata-all.patch
via-pata-controller-xfer-fixes-fix.patch
git-mtd.patch
git-netdev-all.patch
libphy-dont-do-that.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
e1000-linkage-fix.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-net.patch
net-uninline-xfrm_selector_match.patch
net-uninline-skb_put.patch
ioat-warning-fix.patch
revert-scsi-ips-soft-lockup-during-reset-initialization.patch
scsi-ips-soft-lockup-during-reset-initialization-2.patch
drivers-scsi-mca_53c9xc-save_flags-cli-removal-fix.patch
fix-gregkh-usb-usb-expand-autosuspend-autoresume-api.patch
git-watchdog.patch
x86_64-mm-i386-reloc-abssym-hack.patch
prep-for-paravirt-be-careful-about-touching-bios-warning-fix.patch
paravirtualization-patch-inline-replacements-for-fix-2.patch
xfs-rename-uio_read.patch
touchkit-ps-2-touchscreen-driver.patch
get-rid-of-zone_table.patch
new-scheme-to-preempt-swap-token-tidy.patch
balance_pdgat-cleanup.patch
vmalloc-optimization-cleanup-bugfixes-tweak.patch
radix-tree-rcu-lockless-readside.patch
acx1xx-wireless-driver.patch
swsusp-add-resume_offset-command-line-parameter-rev-2.patch
add-include-linux-freezerh-and-move-definitions-from-ueagle-fix.patch
cciss-set-sector_size-to-2048-for-performance-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
kbuild-dont-put-temp-files-in-the-source-tree.patch
lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch
drivers-add-lcd-support-3-Kconfig-fix.patch
setup_irq-better-mismatch-debugging.patch
probe_kernel_address-needs-to-do-set_fs.patch
slab-use-probe_kernel_address.patch
lockdep-spin_lock_irqsave_nested-fix.patch
lockdep-spin_lock_irqsave_nested-fix-2.patch
aio-use-prepare_to_wait.patch
exar-quad-port-serial-fix.patch
vfs_getattr-remove-dead-code.patch
ext3-uninline-large-functions.patch
ext4-uninline-large-functions.patch
uninline-module_put.patch
sleep-profiling-fixes.patch
debug-workqueue-locking-sanity-fix.patch
pktcdvd-bio-write-congestion-using-blk_congestion_wait-fix.patch
bug-test-1.patch
fsstack-introduce-fsstack_copy_attrinode_-tidy.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel-fix.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel-vs-git-cryptodev.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel-ppc-fix.patch
add-process_session-helper-routine-deprecate-old-field-tidy.patch
add-process_session-helper-routine-deprecate-old-field-fix-warnings.patch
add-process_session-helper-routine-deprecate-old-field-fix-warnings-2.patch
fs-cache-provide-a-filesystem-specific-syncable-page-bit-ext4.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching-12-fix.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-log2-fix.patch
mxser-session-warning-fix.patch
tty-switch-to-ktermios-and-new-framework-warning-fix.patch
tty-switch-to-ktermios-bluetooth-fix.patch
tty_ioctl-use-termios-for-the-old-structure-and-termios2-fix.patch
char-istallion-correct-fail-paths-fix.patch
drivers-isdn-handcrafted-min-max-macro-removal-fix.patch
kernel-schedc-whitespace-cleanups-more.patch
swap_prefetch-vs-zoned-counters.patch
add-include-linux-freezerh-and-move-definitions-from-prefetch.patch
readahead-sysctl-parameters.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
resier4-add-include-linux-freezerh-and-move-definitions-from.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
hpt3xx-rework-rate-filtering-tidy.patch
various-fbdev-files-mark-structs-fix.patch
md-allow-reads-that-have-bypassed-the-cache-to-be-retried-on-failure-fix.patch
statistics-infrastructure-fix-buffer-overflow-in-histogram-with-linear-tidy.patch
gtod-persistent-clock-support-i386.patch
hrtimers-state-tracking.patch
clockevents-drivers-for-i386.patch
gtod-mark-tsc-unusable-for-highres-timers.patch
round_jiffies-infrastructure-fix.patch
clocksource-small-cleanup-2-fix.patch
kevent_user_wait-retval-fix.patch
kevent-v23-socket-notifications-fix-again.patch
kevent-timer-notifications-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
mutex-subsystem-synchro-test-module-fix.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
jmicron-warning-fix.patch
squash-ipc-warnings.patch
squash-udf-warnings.patch
e1000-printk-warning-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
