Skip to contentSkip to conversation

mmotm 2010-03-23-15-34 uploaded

PATCH In review [email protected] 8 participants 14 messages Mar 23, 2010 – Mar 28, 2010

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

http://userweb.kernel.org/~akpm/mmotm/

and will soon be available at

git://zen-kernel.org/kernel/mmotm.git

It contains the following patches against 2.6.34-rc2:

origin.patch
memcg-disable-move-charge-in-no-mmu-case.patch
cgroups-remove-duplicate-include.patch
memcontrol-fix-potential-null-deref.patch
rtc-mc13783-fix-use-after-free-bug.patch
scripts-kernel-doc-handle-struct-member-__aligned.patch
fs-binfmt_aout-fix-pointer-warnings.patch documentation-volatile-considered-harmfultxt-correct-cpu_relax-documentation.patch blackfin-enable-debug_section_mismatch.patch
get_maintainer-repair-stdin-usage.patch
memcg-fix-typo-in-memcg-documentation.patch
drivers-gpio-max730xc-add-license-macro.patch
maintainers-use-tab-not-spaces-for-delimiter.patch nommu-fix-an-incorrect-comment-in-the-do_mmap_shared_file.patch kfifo-fix-kfifo_init-in-include-linux-kfifoh.patch documentation-rename-pci-pci-dma-mappingtxt-to-dma-api-howtotxt.patch scripts-kernel-doc-fix-fatal-error-on-function-prototype.patch document-linuxs-circular-buffering-capabilities.patch mm-ksmc-is-doing-an-unneeded-_notify-in-write_protect_page.patch c2port-fix-device_create-return-value-check.patch
tmpfs-fix-oops-on-mounts-with-mpol=default.patch
tmpfs-mpol=bind-0-dont-cause-mount-error.patch
tmpfs-handle-mpol_local-mount-option-properly.patch
tmpfs-cleanup-mpol_parse_str.patch
doc-add-the-documentation-for-mpol=local.patch cpuset-fix-the-problem-that-cpuset_mem_spread_node-returns-an-offline-node.patch cpuset-alloc-nodemask_t-on-the-heap-rather-than-the-stack.patch
exit-fix-oops-in-sync_mm_rss.patch
reiserfs-fix-oops-while-creating-privroot-with-selinux-enabled.patch reiserfs-properly-honor-read-only-devices.patch
mmc-fix-incorrect-interpretation-of-card-type-bits.patch mempolicy-fix-get_mempolicy-for-relative-and-static-nodes.patch
kcore-fix-test-for-end-of-list.patch page-allocator-reduce-fragmentation-in-buddy-allocator-by-adding-buddies-that-are-merging-to-the-tail-of-the-free-lists.patch lxfb-set-the-h-and-v-sync-polarity-of-the-flatpanel-output.patch fs-partitions-msdos-add-support-for-large-disks.patch fs-partition-msdos-fix-unusable-extended-partition-for-512b-sector.patch
linux-next.patch
next-remove-localversion.patch
i-need-old-gcc.patch
arch-x86-crypto-aesni-intel_asms-still-busted.patch include-linux-fsh-complete-hexification-of-fmode_-constants.patch hardware-latency-detector-remove-default-m.patch revert-input-wistron_btns-switch-to-using-sparse-keymap-library.patch drivers-i2c-busses-i2c-xiicc-is-borked.patch
fbdev-fix-kconfig-breakage-in-drivers-video.patch
ratelimit-annotate-___ratelimit.patch
ratelimit-annotate-___ratelimit-fix.patch
kernelh-fix-wrong-usage-of-__ratelimit.patch ratelimit-fix-the-return-value-when-__ratelimit-fails-to-acquire-the-lock.patch it8761e_gpio-fix-bug-in-gpio-numbering.patch
acpi_pad-processor_aggregator-name-too-long.patch power_meter-acpi_device_class-power_meter_resource-too-long.patch drivers-base-cpuc-fix-the-output-from-sys-devices-system-cpu-offline.patch em28xx-empia-em28xx-audio-too-long.patch
ecryptfs-fix-oops-after-umount.patch
inotify-dont-leak-user-struct-on-inotify-release.patch
dpt_i20-several-use-after-free-issues.patch
scsi-be2iscsi-fix-lock-imbalance.patch
scsi-lpfc-fix-lock-imbalances.patch
scsi-qla2xxx-fix-lock-imbalance.patch
acerhdf-add-new-bios-versions.patch
drivers-acpi-use-kasprintf.patch
drivers-acpi-use-kasprintf-fix.patch acpi-acpica-do-not-check-reference-counters-in-acpi_ev_enable_gpe.patch sbshc-acpi_device_class-smbus_host_controller-too-long.patch arch-x86-kernel-hpetc-fix-bug-in-rtc-emulation.patch x86-apic-ack-all-pending-irqs-when-crashed-on-kexec-v5.patch
arch-x86-pci-use-kasprintf.patch
x86-nosmp-command-line-option-should-force-the-system-into-up-mode.patch agp-amd64-fix-pci-reference-leaks.patch
arm-convert-proc-cpu-aligment-to-seq_file.patch
arch-arm-plat-pxa-dmac-correct-null-test.patch arch-arm-include-asm-elfh-forward-declare-the-task-struct.patch arm-convert-arm-to-arch_gettimeoffsetpatch-removed-from-mm-tree.patch cpufreq-ondemand-dont-synchronize-sample-rate-unless-mulitple-cpus-present.patch cpufreq-unexport-unlock_policy_rwsem-functions.patch
cpufreq-fix-a-lockdep-warning.patch
powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch arch-powerpc-platforms-pseries-use-kasprintf.patch
gpu-vga_switcheroo-fix-lock-imbalance.patch
drm-i915-add-sony-vgn-bz12vn-to-acpi-lid-quirk-list.patch
dib3000mc-reduce-large-stack-usage.patch
dib7000p-reduce-large-stack-usage.patch
dvb-usb-gp8psk-fix-potential-null-derefernce.patch
drivers-media-video-avoid-null-dereference.patch
fs-fscache-object-listc-fix-warning-on-32-bit.patch
hpet-factor-timer-allocate-from-open.patch
hpet-factor-timer-allocate-from-open-fix.patch
hpet-convert-from-acpi-to-pnp-driver.patch hpet-pass-physical-address-not-entire-hpet_data-to-hpet_is_known.patch hpet-clean-up-io-mapping-when-hpet_alloc-fails.patch
maintainers-remove-obsolete-hpet-acpi-entry.patch
intel-iommu-use-for_each_set_bit.patch
gpiolib-introduce-chip-addition-removal-notifier.patch of-gpio-add-support-for-two-stage-registration-for-the-of_gpio_chips.patch of-gpio-implement-gpiolib-notifier-hooks.patch
of-gpio-implement-gpiolib-notifier-hooks-fix.patch of-gpio-implement-gpiolib-notifier-hooks-fix-fix2.patch powerpc-mcu_mpc8349emitx-remove-of-gpio-handling-stuff.patch gpiolib-cosmetic-improvements-for-error-handling-in-gpiochip_add.patch timers-introduce-the-concept-of-timer-slack-for-legacy-timers.patch cpu-timers-simplify-rlimit_cpu-handling.patch
cpu-timers-cleanup-arm_timer.patch
cpu-timers-return-correct-previous-timer-reload-value.patch cpu-timers-change-sigev_none-timer-implementation.patch cpu-timers-assure-to-not-iterate-over-all-threads-in-fastpath_timer_check.patch cpu-timers-optimize-run_posix_cpu_timers.patch
cs5535-clockevt-free-timer-in-irq-setup-error-path.patch timer-print-function-name-for-timer-callbacks-modifying-preemption-count.patch time-clean-up-warp_clock.patch
time-clean-up-direct-xtime-usage-in-xen.patch
ntp-make-time_adjust-static.patch
ntp-remove-tickadj.patch
markup_oops-fix-perlcritic-warnings.patch
headerdep-perlcritic-warning.patch
kconfig-recalculate-symbol-value-before-showing-search-results.patch led-driver-for-the-soekris-net5501-board.patch led-driver-for-the-soekris-net5501-board-checkpatch-fixes.patch led-driver-for-the-soekris-net5501-board-fix-2.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch mfd-add-support-for-the-rdc321x-southbridge.patch
gpio-add-support-for-rdc321x-gpio-controller.patch watchdog-convert-rdc321x_wdt-to-use-southbridge-pci-device.patch
x86-remove-rdc321x_defsh.patch
bitops-rename-for_each_bit-to-for_each_set_bit-mtd.patch mtd-nandsim-fix-typo-struct-nandsin_geometry.patch mtd-nand-remove-stray-endchoice-from-kconfig-help-text.patch score-fix-dereference-of-null-pointer-in-local_flush_tlb_page.patch
cgroups-net_cls-as-module.patch
3x59x-fix-pci-resource-management.patch mbp_nvidia_bl-add-support-for-older-macbookpro-and-macbook-61.patch backlight-backlight_device_register-return-err_ptr.patch sunrpc-use-formatting-of-module-name-in-sunrpc.patch sunrpc-cache-fix-module-refcnt-leak-in-a-failure-path.patch serial-add-driver-for-the-altera-jtag-uart.patch
serial-add-driver-for-the-altera-uart.patch
serial-add-driver-for-the-altera-uart-unbork.patch serial-two-branches-the-same-in-timbuart_set_mctrl.patch serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed.patch serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed-fix.patch serial-8250_pnp-add-fujitsu-wacom-device.patch kernel-irq-procc-expose-the-irq_desc-node-in-proc-irq.patch lockdep-add-novalidate-class-for-dev-mutex-conversion.patch rcu-remove-init_rcu_head-rcu_head_init-rcu_head.patch
scsi-add-__init-__exit-macros-to-ibmvstgtc.patch
drivers-scsi-fnic-fnic_scsic-clean-up.patch
drivers-scsi-gdthc-fix-buffer-overflow.patch
drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch
osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch drivers-scsi-libsas-use-sam_good.patch
ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch drivers-scsi-remove-unnecessary-null-test.patch
drivers-message-move-dereference-after-null-test.patch scsi-pmcraid-redundant-check-in-pmcraid_check_ioctl_buffer.patch
mpt-fusion-convert-to-seq_file.patch
g_ncr5380-remove-misleading-pnp-error-message.patch
g_ncr5380-fix-broken-mmio-compilation.patch g_ncr5380-fix-missing-pnp_device_detach-and-scsi_unregister-on-rmmod.patch dc395x-decrease-iteration-for-tag_number-of-max_command-in-start_scsi.patch drivers-scsi-correct-the-size-argument-to-kmalloc.patch scsi-remove-superfluous-null-pointer-check-from-scsi_kill_request.patch mpt2sas-fix-confusion-in-_scsih_sas_device_status_change_event.patch scsi-sdc-quiet-all-sparse-noise.patch
drivers-scsi-bfa-bfad_imc-eliminate-useless-code.patch
lpfc-positive-error-return-into-negative.patch drivers-scsi-qla2xxx-qla_osc-fix-continuation-line-formats.patch scsi-bfa-correct-onstack-wait_queue_head-declaration.patch mptscsih-fix-first-line-of-kernel-doc-for-a-few-functions.patch drivers-scsi-chc-dont-use-vprintk-as-macro.patch
iscsi-change-to.patch
scsi-fix-convert-scsi_scanc-kernel-doc.patch
scsi-update-drivers-tools-url-references.patch bfa-wrong-fcport-h2i-message-tested-in-bfa_fcport_isr.patch
fs-splicec-fix-mapping_gfp_mask-usage.patch iio-iio_get_new_idr_val-return-negative-value-on-failure.patch iio-iio_get_new_idr_val-return-negative-value-on-failure-fix.patch vt6655-cgi-csi-confusion-in-device_ioctl.patch
musb-potential-use-after-free.patch
kaweth-new-usb-id-07c9-b010-allied-telesyn-at-usb10.patch vfs-fix-vfs_rename_dir-for-fs_rename_does_d_move-filesystems.patch vfs-improve-comment-describing-fget_light.patch
ecryptfs-another-lockdep-issue.patch
vfs-o_-bit-numbers-uniqueness-check.patch
vfs-o_-bit-numbers-uniqueness-check-update.patch
vfs-o_-bit-numbers-uniqueness-check-fix.patch
vfs-o_-bit-numbers-uniqueness-check-fix-2.patch vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos.patch vfs-clarify-that-nonseekable_open-will-never-fail.patch
xtensa-convert-to-asm-generic-hardirqh.patch
xtensa-includecheck-fix-vectorss.patch
xtensa-fix-unnecessary-setting-of-xtime.patch
modpost-support-objects-with-more-than-64k-sections.patch
mm.patch
sparsemem-on-no-vmemmap-path-put-mem_map-on-node-high-too.patch
shmem-remove-redundant-code.patch
define-madv_hugepage.patch
mm-remove-return-value-of-putback_lru_pages.patch
mempolicy-remove-redundant-code.patch
oom-filter-tasks-not-sharing-the-same-cpuset.patch oom-sacrifice-child-with-highest-badness-score-for-parent.patch oom-select-task-from-tasklist-for-mempolicy-ooms.patch oom-remove-special-handling-for-pagefault-ooms.patch
oom-badness-heuristic-rewrite.patch
oom-deprecate-oom_adj-tunable.patch
oom-replace-sysctls-with-quick-mode.patch
oom-avoid-oom-killer-for-lowmem-allocations.patch
oom-remove-unnecessary-code-and-cleanup.patch
oom-default-to-killing-current-for-pagefault-ooms.patch oom-avoid-race-for-oom-killed-tasks-detaching-mm-prior-to-exit.patch mempolicy-remove-case-mpol_interleave-from-policy_zonelist.patch
mempolicy-remove-redundant-check.patch
mempolicy-dont-call-mpol_set_nodemask-when-no_context.patch mempolicy-lose-unnecessary-loop-variable-in-mpol_parse_str.patch mempolicy-rename-policy_types-and-cleanup-initialization.patch mempolicy-factor-mpol_shared_policy_init-return-paths.patch mempolicy-document-cpuset-interaction-with-tmpfs-mpol-mount-option.patch frv-duplicate-output_buffer-of-e03.patch
frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch nommu-allow-private-mappings-of-read-only-devices.patch errh-add-__must_check-to-error-pointer-handlers.patch
kernel-user-remove-unreachable-code.patch bitops-optimize-hweight-by-making-use-of-compile-time-evaluation.patch x86-add-optimized-popcnt-variants.patch
improve-sys_personality-for-compat-architectures.patch
vsprintfc-use-noinline_for_stack.patch
dynamic_debug-small-cleanup-in-ddebug_proc_write.patch firmware-loader-use-statically-initialized-data-attribute.patch firmware-loader-use-statically-initialized-data-attribute-fix.patch firmware-loader-use-statically-initialized-data-attribute-fix-fix.patch davinci-mmc-pass-number-of-sg-segments-as-platform-data.patch mmc-omap-add-support-for-16-bit-and-32-bit-registers.patch sdhci-implement-cap_clock_base_broken-quirk.patch
sdhci-pltfm-implement-platform-data-passing.patch sdhci-pltfm-do-not-print-errors-in-case-of-an-extended-iomem-size.patch davinci-mmc-add-a-function-to-control-reset-state-of-the-controller.patch davinci-mmc-updates-to-suspend-resume-implementation.patch davinci-mmc-updates-to-suspend-resume-implementation-checkpatch-fixes.patch checkpatch-add-check-for-too-short-kconfig-descriptions.patch checkpatch-add-check-for-too-short-kconfig-descriptions-checkpatch-fixes.patch hwmon-driver-for-ti-tmp102-temperature-sensor.patch
s3c-rtc-driver-add-support-for-s3c64xx.patch
gpio-add-interrupt-handling-capability-to-max732x.patch fbdev-bfin-lq035q1-fb-respect-new-ppi-mode-platform-field.patch
sis-strcpy-=-strlcpy.patch
ext3-fixup-rb_root-initializations-to-use-rb_root.patch hfsplus-identify-journal-info-block-in-volume-header.patch
hfsplus-fix-journal-detection.patch
memcg-oom-wakeup-filter.patch
memcg-oom-wakeup-filter-update.patch
memcg-oom-notifier.patch
memcg-oom-notifier-update.patch
memcg-oom-kill-disable-and-oom-status.patch
memcg-oom-kill-disable-and-oom-status-update.patch memcg-oom-kill-disable-and-oom-status-update-checkpatch-fixes.patch kmod-add-init-function-to-usermodehelper.patch exec-replace-call_usermodehelper_pipe-with-use-of-umh-init-function-and-resolve-limit.patch umh-creds-convert-call_usermodehelper_keys-to-use-subprocess_info-init.patch umh-creds-kill-subprocess_info-cred-logic.patch
call_usermodehelper-no-need-to-unblock-signals.patch wait_for_helper-sigchld-from-user-space-can-lead-to-use-after-free.patch call_usermodehelper-simplify-fix-umh_no_wait-case.patch call_usermodehelper-umh_wait_exec-ignores-kernel_thread-failure.patch coredump-factor-out-the-not-ispipe-file-checks.patch
coredump-cleanup-ispipe-code.patch
coredump-factor-out-put_cred-calls.patch
coredump-shift-down_writemmap_sem-into-coredump_wait.patch exit-exit_notify-can-trust-signal-notify_count-0.patch exit-change-zap_other_threads-to-count-sub-threads.patch exit-avoid-sig-count-in-de_thread-__exit_signal-synchronization.patch exit-avoid-sig-count-in-__exit_signal-to-detect-the-group-dead-case.patch posix-cpu-timers-avoid-task-signal-=-null-checks.patch ia64-ptrace_attach_sync_user_rbs-avoid-task-signal-=-null-checks.patch fork-exit-move-tty_kref_put-outside-of-__cleanup_signal.patch signals-make-task_struct-signal-immutable-refcountable.patch signals-clear-signal-tty-when-the-last-thread-exits.patch signals-kill-the-awful-task_rq_unlock_wait-hack.patch exit-__exit_signal-use-thread_group_leader-consistently.patch kill-the-obsolete-thread_group_cputime_free-and-taskstats_tgid_init-helpers.patch exit-move-taskstats_tgid_free-from-__exit_signal-to-free_signal_struct.patch check_unshare_flags-kill-the-bogus-clone_sighand-sig-count-check.patch proc-get_nr_threads-doesnt-need-siglock-any-longer.patch
proc-make-collect_sigign_sigcatch-rcu-safe.patch
proc-make-task_sig-lockless.patch
proc-cleanup-remove-unused-assignments.patch cpu-hotplug-introduce-cpu_notify-__cpu_notify-cpu_notify_nofail.patch cpu-hotplug-return-better-errno-on-cpu-hotplug-failure.patch notifier-change-notifier_from_errno0-to-return-notify_ok.patch x86-convert-cpu-notifier-to-return-encapsulate-errno-value.patch topology-convert-cpu-notifier-to-return-encapsulate-errno-value.patch kernel-convert-cpu-notifier-to-return-encapsulate-errno-value.patch slab-convert-cpu-notifier-to-return-encapsulate-errno-value.patch iucv-convert-cpu-notifier-to-return-encapsulate-errno-value.patch ehca-convert-cpu-notifier-to-return-encapsulate-errno-value.patch s390-convert-cpu-notifier-to-return-encapsulate-errno-value.patch md-convert-cpu-notifier-to-return-encapsulate-errno-value.patch fault-injection-add-cpu-notifier-error-injection-module.patch fault-injection-add-cpu-notifier-error-injection-module-fix.patch ipmi-raise-precedence-of-pnp-based-discovery-mechanisms-acpi-pci.patch ipmi-convert-tracking-of-the-acpi-device-pointer-to-a-pnp-device.patch ipmi-update-driver-to-use-dev_printk-and-its-constructs.patch
char-drivers-ram-oops-panic-logger.patch
char-drivers-ram-oops-panic-logger-update.patch
drivers-char-ppdevc-use-kasprintf.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch delayacct-align-to-8-byte-boundary-on-64-bit-systems.patch
drivers-edac-introduce-missing-kfree.patch
edac-add-__init-to-i7core_xeon_pci_fixup.patch
ssb-add-dma_dev-to-ssb_device-structure.patch b43legacy-replace-the-ssb_dma-api-with-the-generic-dma-api.patch b43-replace-the-ssb_dma-api-with-the-generic-dma-api.patch b44-replace-the-ssb_dma-api-with-the-generic-dma-api.patch
ssb-remove-the-ssb-dma-api.patch
panic-allow-taint-flag-for-warnings-to-be-changed-from-taint_warn.patch panic-allow-taint-flag-for-warnings-to-be-changed-from-taint_warn-checkpatch-fixes.patch panic-add-taint-flag-taint_firmware_workaround-i.patch pci-dmar-combine-the-bios-dmar-table-warning-messages.patch pci-dmar-tone-down-warnings-about-invalid-bios-dmar-tables.patch kfifo-kfifo_is_fullempty-should-return-bools-not-ints.patch
time-kill-off-config_generic_time.patch
bitops-remove-temporary-for_each_bit.patch
vfs-add-super-operation-writeback_inodes.patch
vfs-take-2add-set_page_dirty_notag.patch
reiser4-export-remove_from_page_cache.patch
reiser4-export-remove_from_page_cache-fix.patch
reiser4-export-find_get_pages.patch
reiser4.patch
reiser4-writeback_inodes-implementation.patch
reiser4-writeback_inodes-implementation-fix.patch
reiser4-fixup-checkin-checkout-jnodes-for-entd.patch
reiser4-fixups.patch
reiser4-broke.patch
make-sure-nobodys-leaking-resources.patch
journal_add_journal_head-debug.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
mutex-subsystem-synchro-test-module.patch mutex-subsystem-synchro-test-module-add-missing-header-file.patch
slab-leaks3-default-y.patch
put_bh-debug.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
prio_tree-debugging-patch.patch
single_open-seq_release-leak-diagnostics.patch
add-a-refcount-check-in-dput.patch
getblk-handle-2tb-devices.patch
getblk-handle-2tb-devices-fix.patch
notify_change-callers-must-hold-i_mutex.patch

#1 lore raw

Re: mmotm 2010-03-23-15-34 uploaded (staging vs. media)

Quoted 7 lines · On 03/23/10 15:34, [email protected] wrote:

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

http://userweb.kernel.org/~akpm/mmotm/

and will soon be available at

git://zen-kernel.org/kernel/mmotm.git

drivers/staging/cx25821/cx25821-video.c:89:struct cx25821_fmt *format_by_fourcc(unsigned int fourcc) (not static)

conflicts with (has the same non-static name as)

drivers/media/common/saa7146_video.c:87:struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc)

so when both of these drivers are built into the kernel image:

(.text+0x6360): multiple definition of `format_by_fourcc'

Signature · 1 line
~Randy
#2 lore raw

Re: mmotm 2010-03-23-15-34 uploaded (staging vs. media)

Hi Randy,

Quoted 13 lines · Randy Dunlap
Quoted 7 lines · On 03/23/10 15:34, [email protected] wrote:

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

http://userweb.kernel.org/~akpm/mmotm/

and will soon be available at

git://zen-kernel.org/kernel/mmotm.git

drivers/staging/cx25821/cx25821-video.c:89:struct cx25821_fmt *format_by_fourcc(unsigned int fourcc) (not static)

Quoted 8 lines

conflicts with (has the same non-static name as)

drivers/media/common/saa7146_video.c:87:struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc)

so when both of these drivers are built into the kernel image:

(.text+0x6360): multiple definition of `format_by_fourcc'

The cx25821 driver is capable of simultaneously handling 8 video inputs at the same time, and 4 video outputs. However, the way it does is by duplicating exactly the same code 8 times, for input, and 4 times, for the output.

Due to that, several symbols that should normally be internal to the driver's code are exported (see the huge exports list at drivers/staging/cx25821/cx25821-video.h).

The proper fix is to remove all those duplicated code, adding one parameter into the board struct, with the number of the video input or output.

While this won't happen, I'll add a patch at the tree, renaming its symbols to contain cx28521 with this small script:

cat drivers/staging/cx25821/cx25821-video.h|perl -ne 'if (m/extern.* ([^\s\*]+)\(/) { $n=$1; print "s/([^\d\w_\.])$1/\\1cx25821_$1/g;\n" if (!($n =~ m/cx25821/)); }' >changes; for i in drivers/staging/cx25821/*.[ch]; do sed -r -f changes $i >a && mv a $i; done

Cheers,
Mauro

---

As reference, those are the only differences between each cx25821-video[0-7].c:

staging/cx25821/cx25821-video2.c renamed from staging/cx25821/cx25821-video1.c +24 -22
@@ -30,7 +30,7 @@ static void buffer_queue(struct videobuf
 	struct cx25821_buffer *prev;
 	struct cx25821_fh *fh = vq->priv_data;
 	struct cx25821_dev *dev = fh->dev;
-	struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH01];
+	struct cx25821_dmaqueue *q = &dev->vidq[SRAM_CH02];
 
 	/* add jump to stopper */
 	buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
@@ -48,7 +48,7 @@ static void buffer_queue(struct videobuf
 	} else if (list_empty(&q->active)) {
 		list_add_tail(&buf->vb.queue, &q->active);
 		cx25821_start_video_dma(dev, q, buf,
-					&dev->sram_channels[SRAM_CH01]);
+					&dev->sram_channels[SRAM_CH02]);
 		buf->vb.state = VIDEOBUF_ACTIVE;
 		buf->count = q->count++;
 		mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
@@ -120,7 +120,7 @@ static int video_open(struct file *file)
 	else
 		fh->height = 480;
 
-	dev->channel_opened = SRAM_CH01;
+	dev->channel_opened = SRAM_CH02;
 	pix_format =
 	    (dev->pixel_formats[dev->channel_opened] ==
 	     PIXEL_FRMT_411) ? V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
@@ -147,7 +147,7 @@ static ssize_t video_read(struct file *f
 
 	switch (fh->type) {
 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-		if (res_locked(fh->dev, RESOURCE_VIDEO1))
+		if (res_locked(fh->dev, RESOURCE_VIDEO2))
 			return -EBUSY;
 
 		return videobuf_read_one(&fh->vidq, data, count, ppos,
@@ -165,7 +165,7 @@ static unsigned int video_poll(struct fi
 	struct cx25821_fh *fh = file->private_data;
 	struct cx25821_buffer *buf;
 
-	if (res_check(fh, RESOURCE_VIDEO1)) {
+	if (res_check(fh, RESOURCE_VIDEO2)) {
 		/* streaming capture */
 		if (list_empty(&fh->vidq.stream))
 			return POLLERR;
@@ -183,7 +183,7 @@ static unsigned int video_poll(struct fi
 		if (buf->vb.state == VIDEOBUF_DONE) {
 			struct cx25821_dev *dev = fh->dev;
 
-			if (dev && dev->use_cif_resolution[SRAM_CH01]) {
+			if (dev && dev->use_cif_resolution[SRAM_CH02]) {
 				u8 cam_id = *((char *)buf->vb.baddr + 3);
 				memcpy((char *)buf->vb.baddr,
 				       (char *)buf->vb.baddr + (fh->width * 2),
@@ -204,12 +204,12 @@ static int video_release(struct file *fi
 	struct cx25821_dev *dev = fh->dev;
 
 	//stop the risc engine and fifo
-	cx_write(channel1->dma_ctl, 0);	/* FIFO and RISC disable */
+	cx_write(channel2->dma_ctl, 0);	/* FIFO and RISC disable */
 
 	/* stop video capture */
-	if (res_check(fh, RESOURCE_VIDEO1)) {
+	if (res_check(fh, RESOURCE_VIDEO2)) {
 		videobuf_queue_cancel(&fh->vidq);
-		res_free(dev, fh, RESOURCE_VIDEO1);
+		res_free(dev, fh, RESOURCE_VIDEO2);
 	}
 
 	if (fh->vidq.read_buf) {
@@ -239,7 +239,7 @@ static int vidioc_streamon(struct file *
 		return -EINVAL;
 	}
 
-	if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO1)))) {
+	if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO2)))) {
 		return -EBUSY;
 	}
 
@@ -257,7 +257,7 @@ static int vidioc_streamoff(struct file 
 	if (i != fh->type)
 		return -EINVAL;
 
-	res = get_resource(fh, RESOURCE_VIDEO1);
+	res = get_resource(fh, RESOURCE_VIDEO2);
 	err = videobuf_streamoff(get_queue(fh));
 	if (err < 0)
 		return err;
@@ -304,16 +304,16 @@ static int vidioc_s_fmt_vid_cap(struct f
 	else
 		return -EINVAL;
 
-	cx25821_set_pixel_format(dev, SRAM_CH01, pix_format);
+	cx25821_set_pixel_format(dev, SRAM_CH02, pix_format);
 
 	// check if cif resolution
 	if (fh->width == 320 || fh->width == 352) {
-		dev->use_cif_resolution[SRAM_CH01] = 1;
+		dev->use_cif_resolution[SRAM_CH02] = 1;
 	} else {
-		dev->use_cif_resolution[SRAM_CH01] = 0;
+		dev->use_cif_resolution[SRAM_CH02] = 0;
 	}
-	dev->cif_width[SRAM_CH01] = fh->width;
-	medusa_set_resolution(dev, fh->width, SRAM_CH01);
+	dev->cif_width[SRAM_CH02] = fh->width;
+	medusa_set_resolution(dev, fh->width, SRAM_CH02);
 
 	dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
 		fh->height, fh->vidq.field);
@@ -330,7 +330,7 @@ static int vidioc_dqbuf(struct file *fil
 
 	ret_val = videobuf_dqbuf(get_queue(fh), p, file->f_flags & O_NONBLOCK);
 
-	p->sequence = dev->vidq[SRAM_CH01].count;
+	p->sequence = dev->vidq[SRAM_CH02].count;
 
 	return ret_val;
 }
@@ -340,15 +340,17 @@ static int vidioc_log_status(struct file
 	struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
 	char name[32 + 2];
 
-	struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH01];
+	struct sram_channel *sram_ch = &dev->sram_channels[SRAM_CH02];
 	u32 tmp = 0;
 
 	snprintf(name, sizeof(name), "%s/2", dev->name);
 	printk(KERN_INFO "%s/2: ============  START LOG STATUS  ============\n",
 	       dev->name);
+
 	cx25821_call_all(dev, core, log_status);
+
 	tmp = cx_read(sram_ch->dma_ctl);
-	printk(KERN_INFO "Video input 1 is %s\n",
+	printk(KERN_INFO "Video input 2 is %s\n",
 	       (tmp & 0x11) ? "streaming" : "stopped");
 	printk(KERN_INFO "%s/2: =============  END LOG STATUS  =============\n",
 	       dev->name);
@@ -368,10 +370,10 @@ static int vidioc_s_ctrl(struct file *fi
 			return err;
 	}
 
-	return cx25821_set_control(dev, ctl, SRAM_CH01);
+	return cx25821_set_control(dev, ctl, SRAM_CH02);
 }
 
-//exported stuff
+// exported stuff
 static const struct v4l2_file_operations video_fops = {
 	.owner = THIS_MODULE,
 	.open = video_open,
@@ -425,7 +427,7 @@ static const struct v4l2_ioctl_ops video
 #endif
 };
 
-struct video_device cx25821_video_template1 = {
+struct video_device cx25821_video_template2 = {
 	.name = "cx25821-video",
 	.fops = &video_fops,
 	.ioctl_ops = &video_ioctl_ops,
Signature · 2 lines
Cheers,
Mauro
#3 lore raw

PATCH 1/1 leds-input: depends on INPUT

In reply to [email protected]

From: Randy Dunlap <[email protected]>

leds-input uses input_*() functions so it should depend on INPUT.

leds-input.c:(.text+0x6e0513): undefined reference to input_unregister_handle' leds-input.c:(.text+0x6e06eb): undefined reference to input_inject_event' leds-input.c:(.text+0x6e0700): undefined reference to input_inject_event' leds-input.c:(.text+0x6e0906): undefined reference to input_register_handle' leds-input.c:(.text+0x6e0bdc): undefined reference to input_unregister_handler' leds-input.c:(.init.text+0x285c8): undefined reference to input_register_handler' leds-input.c:(.exit.text+0x7b04): undefined reference to `input_unregister_handler'

Cc Samuel Thibault <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Richard Purdie <[email protected]>
---
 drivers/leds/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/Kconfig +1 -1
@@ -25,7 +25,7 @@ config LEDS_88PM860X
 
 config LEDS_INPUT
 	tristate "LED Support using input keyboards"
-	depends on LEDS_CLASS
+	depends on LEDS_CLASS && INPUT
 	select LEDS_TRIGGERS
 	help
 	  This option enables support for the LEDs on keyboard managed
#4 lore raw

Re: [PATCH -mmotm] leds-input: depends on INPUT

Quoted 12 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

leds-input uses input_*() functions so it should depend on INPUT.

leds-input.c:(.text+0x6e0513): undefined reference to input_unregister_handle' leds-input.c:(.text+0x6e06eb): undefined reference to input_inject_event' leds-input.c:(.text+0x6e0700): undefined reference to input_inject_event' leds-input.c:(.text+0x6e0906): undefined reference to input_register_handle' leds-input.c:(.text+0x6e0bdc): undefined reference to input_unregister_handler' leds-input.c:(.init.text+0x285c8): undefined reference to input_register_handler' leds-input.c:(.exit.text+0x7b04): undefined reference to `input_unregister_handler'

Quoted 3 lines
Cc Samuel Thibault <[email protected]>
Cc Pavel Machek <[email protected]>

ACK.

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#5 lore raw

Re: [PATCH -mmotm] leds-input: depends on INPUT

Quoted 13 lines · Pavel Machek, le Wed 24 Mar 2010 22:02:01 +0100, a écrit :
Quoted 12 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

leds-input uses input_*() functions so it should depend on INPUT.

leds-input.c:(.text+0x6e0513): undefined reference to input_unregister_handle' leds-input.c:(.text+0x6e06eb): undefined reference to input_inject_event' leds-input.c:(.text+0x6e0700): undefined reference to input_inject_event' leds-input.c:(.text+0x6e0906): undefined reference to input_register_handle' leds-input.c:(.text+0x6e0bdc): undefined reference to input_unregister_handler' leds-input.c:(.init.text+0x285c8): undefined reference to input_register_handler' leds-input.c:(.exit.text+0x7b04): undefined reference to `input_unregister_handler'

Quoted 5 lines
Quoted 3 lines
Cc Samuel Thibault <[email protected]>
Cc Pavel Machek <[email protected]>

ACK.

ACK.

Samuel

#6 lore raw

mmotm 2010-03-23 - IPv6 warnings...

In reply to [email protected]
Quoted 3 lines · On Tue, 23 Mar 2010 15:34:59 PDT, [email protected] said:

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

http://userweb.kernel.org/~akpm/mmotm/

Seen in my dmesg. It may be relevant that I'm at home, and my IPv6 prefix arrives via a PPP VPN connection. This happened about 20-25 seconds after I launched pppd.

[  175.269411] ------------[ cut here ]------------
[  175.269433] WARNING: at net/ipv6/addrconf.c:544 inet6_ifa_finish_destroy+0x40/0xbb()
[  175.269441] Hardware name: Latitude E6500                  
[  175.269447] Modules linked in: ppp_async sunrpc usb_storage [last unloaded: scsi_wait_scan]
[  175.269473] Pid: 7, comm: ksoftirqd/1 Tainted: G        W   2.6.34-rc2-mmotm0323 #1
[  175.269480] Call Trace:
[  175.269488]  <IRQ>  [<ffffffff8103728a>] warn_slowpath_common+0x80/0x98
[  175.269517]  [<ffffffff810372b7>] warn_slowpath_null+0x15/0x17
[  175.269530]  [<ffffffff814f2093>] inet6_ifa_finish_destroy+0x40/0xbb
[  175.269542]  [<ffffffff814f2122>] in6_ifa_put+0x14/0x16
[  175.269555]  [<ffffffff814f4893>] addrconf_prefix_rcv+0x583/0x786
[  175.269568]  [<ffffffff814f70b3>] ? rt6_get_dflt_router+0xab/0xbb
[  175.269581]  [<ffffffff814fd98c>] ndisc_rcv+0x90f/0xdb4
[  175.269595]  [<ffffffff810852a7>] ? __rcu_read_unlock+0x30c/0x341
[  175.269609]  [<ffffffff81502f6d>] ? debug_lockdep_rcu_enabled+0x33/0x39
[  175.269622]  [<ffffffff815040ae>] icmpv6_rcv+0x59b/0x659
[  175.269634]  [<ffffffff81504c9e>] ? ipv6_chk_mcast_addr+0xaf/0x13d
[  175.269648]  [<ffffffff81063e21>] ? trace_hardirqs_on_caller+0x16/0x13c
[  175.269661]  [<ffffffff8103d5b3>] ? _local_bh_enable_ip+0x15c/0x16e
[  175.269674]  [<ffffffff8103d5ce>] ? local_bh_enable_ip+0x9/0xb
[  175.269689]  [<ffffffff81598c44>] ? _raw_read_unlock_bh+0x39/0x3e
[  175.269702]  [<ffffffff81504d13>] ? ipv6_chk_mcast_addr+0x124/0x13d
[  175.269714]  [<ffffffff814eee7d>] ? ip6_input_finish+0x0/0x343
[  175.269726]  [<ffffffff814ef066>] ip6_input_finish+0x1e9/0x343
[  175.269737]  [<ffffffff814eee7d>] ? ip6_input_finish+0x0/0x343
[  175.269748]  [<ffffffff814ef20c>] NF_HOOK.clone.1+0x4c/0x53
[  175.269759]  [<ffffffff814ef6d6>] ip6_input+0x1c/0x1e
[  175.269769]  [<ffffffff814ef7df>] ip6_mc_input+0x107/0x11c
[  175.269780]  [<ffffffff814eee17>] ? ip6_rcv_finish+0x0/0x26
[  175.269791]  [<ffffffff814eee39>] ip6_rcv_finish+0x22/0x26
[  175.269802]  [<ffffffff814ef20c>] NF_HOOK.clone.1+0x4c/0x53
[  175.269812]  [<ffffffff814ef666>] ipv6_rcv+0x453/0x4a7
[  175.269827]  [<ffffffff8146527e>] __netif_receive_skb+0x2da/0x307
[  175.269839]  [<ffffffff81465348>] process_backlog+0x9d/0xd6
[  175.269851]  [<ffffffff81465631>] net_rx_action+0xf2/0x356
[  175.269863]  [<ffffffff8103dc41>] __do_softirq+0x14a/0x282
[  175.269876]  [<ffffffff8100360c>] call_softirq+0x1c/0x34
[  175.269882]  <EOI>  [<ffffffff81004b58>] ? do_softirq+0x44/0xf0
[  175.269901]  [<ffffffff8103d7dd>] run_ksoftirqd+0xbc/0x1fb
[  175.269912]  [<ffffffff8103d721>] ? run_ksoftirqd+0x0/0x1fb
[  175.269925]  [<ffffffff81052c6b>] kthread+0x7a/0x82
[  175.269937]  [<ffffffff81003514>] kernel_thread_helper+0x4/0x10
[  175.269949]  [<ffffffff81599900>] ? restore_args+0x0/0x30
[  175.269961]  [<ffffffff81052bf1>] ? kthread+0x0/0x82
[  175.269971]  [<ffffffff81003510>] ? kernel_thread_helper+0x0/0x10
[  175.269979] ---[ end trace a7919e7f17c0a727 ]---
[  175.269986] Freeing alive inet6 address ffff880107e1a400
[  176.472172] ------------[ cut here ]------------
[  176.472192] WARNING: at net/ipv6/addrconf.c:544 inet6_ifa_finish_destroy+0x40/0xbb()
[  176.472200] Hardware name: Latitude E6500                  
[  176.472206] Modules linked in: ppp_async sunrpc usb_storage [last unloaded: scsi_wait_scan]
[  176.472232] Pid: 4008, comm: fetchmail Tainted: G        W   2.6.34-rc2-mmotm0323 #1
[  176.472239] Call Trace:
[  176.472256]  [<ffffffff8103728a>] warn_slowpath_common+0x80/0x98
[  176.472269]  [<ffffffff810372b7>] warn_slowpath_null+0x15/0x17
[  176.472280]  [<ffffffff814f2093>] inet6_ifa_finish_destroy+0x40/0xbb
[  176.472291]  [<ffffffff814f2122>] in6_ifa_put+0x14/0x16
[  176.472303]  [<ffffffff814f2a7b>] ipv6_dev_get_saddr+0x2b3/0x2c7
[  176.472316]  [<ffffffff814f8f32>] ? fib6_rule_lookup+0x18/0x1a
[  176.472328]  [<ffffffff814ebb04>] ip6_dst_lookup_tail+0x90/0xc5
[  176.472339]  [<ffffffff814ebc37>] ip6_dst_lookup+0x10/0x12
[  176.472352]  [<ffffffff8150f712>] ip6_datagram_connect+0x334/0x4f6
[  176.472365]  [<ffffffff8103d5b3>] ? _local_bh_enable_ip+0x15c/0x16e
[  176.472378]  [<ffffffff81457d82>] ? release_sock+0xff/0x108
[  176.472390]  [<ffffffff814c0042>] inet_dgram_connect+0x56/0x5d
[  176.472402]  [<ffffffff81455907>] sys_connect+0x75/0x98
[  176.472415]  [<ffffffff810e24b4>] ? path_put+0x1d/0x22
[  176.472429]  [<ffffffff81063e21>] ? trace_hardirqs_on_caller+0x16/0x13c
[  176.472442]  [<ffffffff8107d442>] ? audit_syscall_entry+0xcb/0x19c
[  176.472455]  [<ffffffff810026eb>] system_call_fastpath+0x16/0x1b
[  176.472464] ---[ end trace a7919e7f17c0a728 ]---
[  176.472472] Freeing alive inet6 address ffff880107e1a400
#7 lore raw

Re: mmotm 2010-03-23 - IPv6 warnings...

Quoted 8 lines · On Wed, 24 Mar 2010 21:36:41 -0400 [email protected] wrote:
Quoted 3 lines · On Tue, 23 Mar 2010 15:34:59 PDT, [email protected] said:

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

http://userweb.kernel.org/~akpm/mmotm/

Seen in my dmesg. It may be relevant that I'm at home, and my IPv6 prefix arrives via a PPP VPN connection. This happened about 20-25 seconds after I launched pppd.

Yes, thanks, I get the same - it doesn't seem to break anything. It also happens some time after boot has completed, presumably when I do something, but I haven't looked into what "something" is. It's certainly not as complex as a PPP VPN connection.

The net guys are crunching on it.

#8 lore raw

Re: mmotm 2010-03-23 - IPv6 warnings...

Quoted 5 lines · Andrew Morton
Quoted 3 lines · On Wed, 24 Mar 2010 21:36:41 -0400 [email protected] wrote:
Quoted 2 lines · On Tue, 23 Mar 2010 15:34:59 PDT, [email protected] said:

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

http://userweb.kernel.org/~akpm/mmotm/

Seen in my dmesg. It may be relevant that I'm at home, and my IPv6 prefix arrives via a PPP VPN connection. This happened about 20-25 seconds after I launched pppd.

Yes, thanks, I get the same - it doesn't seem to break anything. It also happens some time after boot has completed.

Just doing an 'ifup eth0' on a network with IPv6 on it is sufficient.

And it does break stuff:

% ifconfig eth0
eth0 Link encap:Ethernet HWaddr 00:24:E8:C6:AD:17

          inet addr:128.173.14.107  Bcast:128.173.15.255  Mask:255.255.252.0
          inet6 addr: fe80::224:e8ff:fec6:ad17/64 Scope:Link
          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1

With 2.6.34-rc1-mmotm0309, I see:

% ifconfig eth0
eth0 Link encap:Ethernet HWaddr 00:24:E8:C6:AD:17

          inet addr:128.173.14.107  Bcast:128.173.15.255  Mask:255.255.252.0
          inet6 addr: 2001:468:c80:2103:224:e8ff:fec6:ad17/64 Scope:Global
          inet6 addr: fe80::224:e8ff:fec6:ad17/64 Scope:Link
          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1

Something ate my IPv6 address. We run a lot of IPv6 in production, so stuff is acting wonky.

maintainer
#9 lore raw

Re: mmotm 2010-03-23 - IPv6 warnings...

From: [email protected]
Date: Thu, 25 Mar 2010 12:45:30 -0400

Quoted 8 lines · Andrew Morton
Quoted 7 lines · On Wed, 24 Mar 2010 21:36:41 -0400 [email protected] wrote:
Quoted 6 lines · On Tue, 23 Mar 2010 15:34:59 PDT, [email protected] said:
Quoted 3 lines

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

http://userweb.kernel.org/~akpm/mmotm/

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Seen in my dmesg. It may be relevant that I'm at home, and my IPv6 prefix arrives via a PPP VPN connection. This happened about 20-25 seconds after I launched pppd.

Yes, thanks, I get the same - it doesn't seem to break anything. It also happens some time after boot has completed.

Just doing an 'ifup eth0' on a network with IPv6 on it is sufficient.

I'm going to look into this more deeply tonight.

maintainer
#10 lore raw

Re: mmotm 2010-03-23 - IPv6 warnings...

In reply to [email protected]

From: [email protected]
Date: Thu, 25 Mar 2010 12:45:30 -0400

Quoted 8 lines · Andrew Morton
Quoted 7 lines · On Wed, 24 Mar 2010 21:36:41 -0400 [email protected] wrote:
Quoted 6 lines · On Tue, 23 Mar 2010 15:34:59 PDT, [email protected] said:
Quoted 3 lines

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

http://userweb.kernel.org/~akpm/mmotm/

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Seen in my dmesg. It may be relevant that I'm at home, and my IPv6 prefix arrives via a PPP VPN connection. This happened about 20-25 seconds after I launched pppd.

Yes, thanks, I get the same - it doesn't seem to break anything. It also happens some time after boot has completed.

Just doing an 'ifup eth0' on a network with IPv6 on it is sufficient.

I just checked the following into net-next-2.6 which should at least kill that dmesg log.

If you still are missing your ipv6 addresses, let me know how they normally get added, maybe that's enough to let me figure it out.

Thanks.

ipv6: Fix result generation in ipv6_get_ifaddr().

Finishing naturally from hlist_for_each_entry(x, ...) does not result in 'x' being NULL.

---
 net/ipv6/addrconf.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
net/ipv6/addrconf.c +4 -3
index 9995683..21b4c9e 100644
@@ -1341,9 +1341,9 @@ EXPORT_SYMBOL(ipv6_chk_prefix);
 struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *addr,
 				     struct net_device *dev, int strict)
 {
-	struct inet6_ifaddr *ifp = NULL;
-	struct hlist_node *node;
+	struct inet6_ifaddr *ifp, *result = NULL;
 	unsigned int hash = ipv6_addr_hash(addr);
+	struct hlist_node *node;
 
 	rcu_read_lock_bh();
 	hlist_for_each_entry_rcu(ifp, node, &inet6_addr_lst[hash], addr_lst) {
@@ -1352,6 +1352,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add
 		if (ipv6_addr_equal(&ifp->addr, addr)) {
 			if (dev == NULL || ifp->idev->dev == dev ||
 			    !(ifp->scope&(IFA_LINK|IFA_HOST) || strict)) {
+				result = ifp;
 				in6_ifa_hold(ifp);
 				break;
 			}
@@ -1359,7 +1360,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add
 	}
 	rcu_read_unlock_bh();
 
-	return ifp;
+	return result;
 }
 
 /* Gets referenced address, destroys ifaddr */
Signature · 1 line
1.7.0.3
#11 lore raw

Re: mmotm 2010-03-23 - IPv6 warnings...

Quoted 13 lines · David Miller

From: [email protected]
Date: Thu, 25 Mar 2010 12:45:30 -0400

Quoted 10 lines · Andrew Morton
Quoted 9 lines · On Wed, 24 Mar 2010 21:36:41 -0400 [email protected] wrote:
Quoted 8 lines · On Tue, 23 Mar 2010 15:34:59 PDT, [email protected] said:
Quoted 3 lines

The mm-of-the-moment snapshot 2010-03-23-15-34 has been uploaded to

http://userweb.kernel.org/~akpm/mmotm/

Seen in my dmesg. It may be relevant that I'm at home, and my IPv6 prefix arrives via a PPP VPN connection. This happened about 20-25 secon

ds

Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Quoted 1 line

after I launched pppd.

Yes, thanks, I get the same - it doesn't seem to break anything. It also happens some time after boot has completed.

Quoted 8 lines
Quoted 1 line

Just doing an 'ifup eth0' on a network with IPv6 on it is sufficient.

I just checked the following into net-next-2.6 which should at least kill that dmesg log.

If you still are missing your ipv6 addresses, let me know how they normally get added, maybe that's enough to let me figure it out.

Confirming looks like a good fix - no cruft in dmesg, and I have ipv6 addresses:

% ifconfig ppp0
ppp0 Link encap:Point-to-Point Protocol

          inet addr:128.173.34.103  P-t-P:128.173.32.21  Mask:255.255.255.255
          inet6 addr: 2001:468:c80:3b04:105d:a65c:28c4:75d1/64 Scope:Global
          inet6 addr: fe80::105d:a65c:28c4:75d1/10 Scope:Link
          UP POINTOPOINT RUNNING NOARP MULTICAST  MTU:1460  Metric:1
          RX packets:79 errors:0 dropped:0 overruns:0 frame:0
          TX packets:85 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:3 
          RX bytes:30943 (30.2 KiB)  TX bytes:6746 (6.5 KiB)
maintainer
#12 lore raw

Re: mmotm 2010-03-23 - IPv6 warnings...

From: [email protected]
Date: Fri, 26 Mar 2010 02:18:22 -0400

Quoted 1 line

Confirming looks like a good fix - no cruft in dmesg, and I have ipv6 addresses:

Great, thanks for testing.

Andrew your box should be good now too.

#13 lore raw

Re: mmotm 2010-03-23 - IPv6 warnings...

Quoted 8 lines · On Thu, 25 Mar 2010 23:23:49 -0700 (PDT) David Miller <[email protected]>…

From: [email protected]
Date: Fri, 26 Mar 2010 02:18:22 -0400

Quoted 1 line

Confirming looks like a good fix - no cruft in dmesg, and I have ipv6 addresses:

Great, thanks for testing.

Andrew your box should be good now too.

Thanks for fixing this.