* mmotm 2010-10-13-17-13 uploaded
@ 2010-10-14 0:13 akpm
2010-10-14 4:17 ` mmotm 2010-10-13-17-13 uploaded (staging/bcm) Randy Dunlap
` (4 more replies)
0 siblings, 5 replies; 29+ messages in thread
From: akpm @ 2010-10-14 0:13 UTC (permalink / raw)
To: mm-commits, linux-kernel
The mm-of-the-moment snapshot 2010-10-13-17-13 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.36-rc7:
origin.patch
sysctl-min-max-bounds-are-optional.patch
linux-next.patch
next-remove-localversion.patch
fs-inodec-work-around-bug.patch
arch-x86-kernel-entry_64s-fix-build-with-gas-2161.patch
arch-x86-kernel-entry_32s-i386-too.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
mm-vmap-area-cache.patch
arch-arm-plat-omap-iovmmc-fix-end-address-of-vm-area-comparation-in-alloc_iovm_area.patch
audit-call-tty_audit_push_task-outside-preempt-disabled.patch
audit-do-not-send-uninitialized-data-for-audit_tty_get.patch
audit-use-rcu-for-task-lookup-protection.patch
backlight-fix-88pm860x_bl-macro-collision.patch
cciss-fix-botched-tag-masking-for-scsi-tape-commands.patch
arch-mips-include-asm-fcntlh-needs-typesh.patch
time-compensate-for-rounding-on-odd-frequency-clocksources.patch
hrtimers-fix-a-complex-race.patch
hrtimers-fix-a-complex-race-update.patch
x86-enable-arch_dma_addr_t_64bit-with-x86_64-highmem64g.patch
x86-fake-numa-assign-cpus-to-nodes-in-round-robin-manner.patch
drivers-char-agp-parisc-agpc-eliminate-memory-leak.patch
audit-add-support-to-match-lsm-labels-on-user-audit-messages.patch
fs-btrfs-use-memdup_user.patch
fs-btrfs-use-err_cast.patch
gcc-46-btrfs-clean-up-unused-variables-bugs.patch
gcc-46-btrfs-clean-up-unused-variables-nonbugs.patch
btrfs-only-bug_on-when-the-errno-is-not-enoent.patch
fs-btrfs-inodec-eliminate-memory-leak.patch
btrfs-dont-dereference-extent_mapping-if-null.patch
powerpc-enable-arch_dma_addr_t_64bit-with-arch_phys_addr_t_64bit.patch
drivers-gpu-drm-radeon-atomc-fix-warning.patch
drivers-media-ir-ene_irc-fix-null-dereference.patch
drivers-media-video-cx23885-cx23885-corec-fix-cx23885_dev_checkrevision.patch
fs-notify-fanotify-fanotify_userc-fix-warnings.patch
fsnotify-remove-alignment-padding-from-fsnotify_mark-on-64-bit-builds.patch
drivers-i2c-busses-i2c-pasemic-fix-unsigned-return-type.patch
softirq-improve-preempt-count-error-message.patch
softirq-cleanup-preempt-check.patch
tile-enable-arch_dma_addr_t_64bit.patch
timer_list-remove-alignment-padding-on-64-bit-when-config_timer_stats.patch
timer-initialize-the-field-slack-of-timer_list.patch
kernel-time-use-array_size-macro-in-timecomparec.patch
timer-make-try_to_del_timer_sync-safe-on-both-hardirq-context-and-up.patch
timer-del_timer_sync-can-be-used-in-softirq-context.patch
timer-warn-when-del_timer_sync-used-in-hardirq-context.patch
timer-permit-statically-declared-work-with-deferrable-timers.patch
posix-timers-annotate-lock_timer.patch
readme-cite-nconfig.patch
leds-route-kbd-leds-through-the-generic-leds-layer.patch
led-class-always-implement-blinking.patch
leds-driver-for-national-semiconductor-lp5521-chip.patch
leds-driver-for-national-semiconductors-lp5523-chip.patch
leds-update-lp552x-support-kconfig-and-makefile.patch
documentation-led-drivers-lp5521-and-lp5523.patch
mips-enable-arch_dma_addr_t_64bit-with-highmem-64bit_phys_addr-64bit.patch
mtdpart-memory-accessor-interface-for-mtd-layer.patch
jffs2-use-cond_resched-instead-of-yield.patch
net-avoid-limits-overflow.patch
drivers-video-backlight-s6e63m0c-set-permissions-on-gamma_table-file-to-0444.patch
backlight-fix-blanking-for-lms283gf05-lcd.patch
backlight-fix-blanking-for-l4f00242t03-lcd.patch
backlight-s6e63m0-unregister-backlight-device-and-remove-sysfs-attribute-file-in-s6e63m0_remove.patch
backlight-s6e63m0-fix-section-mismatch.patch
backlight-add-low-threshold-to-pwm-backlight.patch
btusb-patch-add_apple_macbookpro62.patch
serial8250-ratelimit-too-much-work-error.patch
serial8250-ratelimit-too-much-work-error-fix.patch
serial8250-ratelimit-too-much-work-error-fix-fix.patch
s390-enable-arch_dma_addr_t_64bit-with-64bit.patch
sched-make-sched_param-argument-static-variables-in-some-sched_setscheduler-caller.patch
percpu-fix-list_head-init-bug-in-__percpu_counter_init.patch
drivers-message-fusion-mptsasc-fix-warning.patch
block-m68k-z2ram-correct-printing-of-sector_t.patch
drivers-block-aoe-aoeblkc-ratelimit-a-warning-printk.patch
lirc-make-struct-file_operations-pointer-const.patch
drivers-usb-gadget-amd5536udcc-fix-error-path.patch
vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos.patch
vfs-remove-a-warning-on-open_fmode.patch
vfs-add-__fmode_exec.patch
vfs-fix-infinite-loop-caused-by-clone_mnt-race.patch
vfs-ignore-error-on-forced-remount.patch
vfs-fix-per-mount-read-write.patch
vfs-add-sb_force_remount_readonly-helper.patch
vfs-allow-mnt_want_write-to-sleep.patch
vfs-allow-mnt_want_write-to-sleep-fix.patch
vfs-keep-list-of-mounts-for-each-superblock.patch
vfs-protect-remounting-superblock-read-only.patch
vfs-fs_may_remount_ro-turn-unnecessary-check-into-a-warn_on.patch
vfs-mark-mounts-read-only-on-forced-remount.patch
mm.patch
vmcore-it-is-not-experimental-any-more.patch
documentation-filesystems-proctxt-improve-smaps-field-documentation.patch
mm-smaps-export-mlock-information.patch
oom-add-per-mm-oom-disable-count.patch
oom-add-per-mm-oom-disable-count-protect-oom_disable_count-with-task_lock-in-fork.patch
oom-add-per-mm-oom-disable-count-use-old_mm-for-oom_disable_count-in-exec.patch
oom-avoid-killing-a-task-if-a-thread-sharing-its-mm-cannot-be-killed.patch
oom-kill-all-threads-sharing-oom-killed-tasks-mm.patch
oom-kill-all-threads-sharing-oom-killed-tasks-mm-fix.patch
oom-kill-all-threads-sharing-oom-killed-tasks-mm-fix-fix.patch
oom-rewrite-error-handling-for-oom_adj-and-oom_score_adj-tunables.patch
oom-fix-locking-for-oom_adj-and-oom_score_adj.patch
writeback-remove-nonblocking-encountered_congestion-references.patch
include-linux-pageblock-flagsh-fix-set_pageblock_flags-macro-definiton.patch
mm-only-build-per-node-scan_unevictable-functions-when-numa-is-enabled.patch
mm-only-build-per-node-scan_unevictable-functions-when-numa-is-enabled-cleanup.patch
mm-compaction-fix-compactpagefailed-counting.patch
memory-hotplug-fix-notifiers-return-value-check.patch
memory-hotplug-unify-is_removable-and-offline-detection-code.patch
memory-hotplug-unify-is_removable-and-offline-detection-code-checkpatch-fixes.patch
vmscan-prevent-background-aging-of-anon-page-in-no-swap-system.patch
mm-mempolicy-check-return-code-of-check_range.patch
mm-add-account_page_writeback.patch
writeback-add-nr_dirtied-and-nr_written-to-proc-vmstat.patch
writeback-add-nr_dirtied-and-nr_written-to-proc-vmstat-update.patch
writeback-add-sys-devices-system-node-node-vmstat.patch
writeback-add-sys-devices-system-node-node-vmstat-update.patch
writeback-report-dirty-thresholds-in-proc-vmstat.patch
mm-fix-typo-in-mmh-when-node_not_in_page_flags.patch
vmscan-delete-dead-code.patch
tracing-vmscan-add-trace-events-for-lru-list-shrinking.patch
writeback-account-for-time-spent-congestion_waited.patch
vmscan-synchronous-lumpy-reclaim-should-not-call-congestion_wait.patch
vmscan-narrow-the-scenarios-lumpy-reclaim-uses-synchrounous-reclaim.patch
vmscan-remove-dead-code-in-shrink_inactive_list.patch
vmscan-isolated_lru_pages-stop-neighbour-search-if-neighbour-cannot-be-isolated.patch
writeback-do-not-sleep-on-the-congestion-queue-if-there-are-no-congested-bdis.patch
writeback-do-not-sleep-on-the-congestion-queue-if-there-are-no-congested-bdis-or-if-significant-congestion-is-not-being-encountered-in-the-current-zone.patch
writeback-do-not-sleep-on-the-congestion-queue-if-there-are-no-congested-bdis-or-if-significant-congestion-is-not-being-encounted-in-the-current-zone-fix.patch
writeback-remove-the-internal-5%-low-bound-on-dirty_ratio.patch
vmscantmpfs-treat-used-once-pages-on-tmpfs-as-used-once.patch
mm-strictly-nested-kmap_atomic.patch
mm-stack-based-kmap_atomic.patch
mm-stack-based-kmap_atomic-checkpatch-fixes.patch
mm-stack-based-kmap_atomic-fix.patch
mm-remove-pte_map_nested.patch
perf-x86-fix-up-kmap_atomic-type.patch
mm-highmem-documentation.patch
mm-add-a-might_sleep_if-in-dma_pool_alloc.patch
mm-remove-alignment-padding-from-anon_vma-on-some-64-bit-builds.patch
mm-filemap_fault-unique-path-for-locking-page.patch
mm-retry-page-fault-when-blocking-on-disk-transfer.patch
mm-retry-page-fault-when-blocking-on-disk-transfer-update.patch
mm-retry-page-fault-when-blocking-on-disk-transfer-update-fix.patch
x86-access_error-api-cleanup.patch
mm-remove-temporary-variable-on-generic_file_direct_write.patch
mm-add-casts-to-from-gfp_t-in-gfp_to_alloc_flags.patch
mm-wrap-get_locked_pte-using-__cond_lock.patch
mm-add-lock-release-annotation-on-do_wp_page.patch
mm-wrap-follow_pte-using-__cond_lock.patch
rmap-annotate-lock-context-change-on-page_lock_anon_vma.patch
rmap-wrap-page_check_address-using-__cond_lock.patch
rmap-make-anon_vma_free-static.patch
rmap-make-anon_vma_free-static-fix.patch
vmalloc-rename-temporary-variable-in-__insert_vmap_area.patch
vmalloc-annotate-lock-context-change-on-s_start-stop.patch
mm-declare-some-external-symbols.patch
vmstat-include-compactionh-when-config_compaction.patch
vmstat-include-compactionh-when-config_compaction-fix.patch
mm-fix-sparse-warnings-on-gfp_zone_table-bad.patch
fs-fs-writebackc-restore-lost-comment.patch
define-madv_hugepage.patch
frv-duplicate-output_buffer-of-e03.patch
frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch
hpet-unmap-unused-i-o-space.patch
hpet-fix-unwanted-interrupt-due-to-stale-irq-status-bit.patch
hpet-fix-style-problems.patch
documentation-timers-hpet_examplec-add-supporting-info-for-hpet_example.patch
hpet-factor-timer-allocate-from-open.patch
hpet-factor-timer-allocate-from-open-fix.patch
alpha-enable-arch_dma_addr_t_64bit.patch
alpha-use-single-hae-window-on-t2-core-logic-gamma-sable.patch
uml-define-config_no_dma.patch
uml-fix-config_static_link=y-build-failure-with-newer-glibc.patch
um-migrate-from-__do_irq-to-generic_handle_irq.patch
kernelh-add-minmax3-macros.patch
kernelh-add-minmax3-macros-fix.patch
replace-nested-max-min-macros-with-maxmin3-macro.patch
m68knommu-blackfin-remove-old-assembler-only-flags-bit-definitions.patch
include-linux-kernelh-add-__must_check-to-strict_strto.patch
add-the-common-dma_addr_t-typedef-to-include-linux-typesh.patch
modules-no-need-to-align-modinfo-strings.patch
use-clear_page-copy_page-in-favor-of-memset-memcpy-on-whole-pages.patch
fuse-use-clear_highpage-and-km_user0-instead-of-km_user1.patch
ihex-add-support-for-cs-ip-eip-records.patch
drivers-misc-phantomc-add-missing-warning-messages-in-phantom_probe.patch
init-mark-__user-address-space-on-string-literals.patch
kernel-userc-add-lock-release-annotation-on-free_user.patch
fs-allow-for-more-than-231-files.patch
stop_machine-convert-cpu-notifier-to-return-encapsulate-errno-value.patch
kernel-remove-pf_flusher.patch
misc-devices-do-not-enable-by-default.patch
printk-fixup-declaration-of-kmsg_reasons.patch
printk-add-lock-context-annotation.patch
printk-change-type-of-boot_delay-to-int.patch
printk-declare-printk_ratelimit_state-in-ratelimith.patch
printk-declare-printk_ratelimit_state-in-ratelimith-fix.patch
vsprintfc-use-default-pointer-field-size-for-null-strings.patch
vsprintfc-use-default-pointer-field-size-for-null-strings-fix.patch
lib-fix-scnprintf-if-size-is-==-0.patch
scripts-get_maintainerpl-add-git-blame-rolestats-authored-lines-information.patch
scripts-get_maintainerpl-use-correct-indentation.patch
scripts-get_maintainerpl-dont-search-maintainers-for-keywords-or-emails.patch
scripts-get_maintainerpl-add-default-git-fallback-remove-default-git.patch
scripts-get_maintainerpl-use-get_maintainerconf-from-then-home-then-scripts.patch
scripts-get_maintainerpl-add-interactive-mode.patch
scripts-get_maintainerpl-improve-interactive-ui.patch
scripts-get_maintainerpl-update-interactive-ui-improve-hg-runtime.patch
scripts-get_maintainerpl-use-case-insensitive-name-de-duplication.patch
scripts-get_maintainerpl-fix-mailmap-handling.patch
scripts-get_maintainerpl-correct-indentation-in-a-few-places.patch
scripts-get_maintainerpl-use-mailmap-in-name-deduplication-and-other-updates.patch
scripts-get_maintainerpl-dont-deduplicate-unnamed-addresses-ie-mailing-lists.patch
maintainers-fix-colibri-pxa270-file-pattern.patch
maintainers-merge-imote2-and-stargate.patch
maintainers-merge-s3c-244x-sections.patch
maintainers-merge-s3c6400-and-6410-to-64xx.patch
maintainers-remove-usb-ov511-driver.patch
maintainers-remove-usb-zc0301-driver.patch
maintainers-use-t-git-and-whitespace-trivia.patch
lib-bitmapc-use-hex_to_bin.patch
idr-fix-idr_pre_get-locking-description.patch
idr-fix-idr_pre_get-locking-description-fix.patch
lib-div64c-document-that-div64_u64-is-not-precise-on-32bit-platforms.patch
percpu_counter-add-debugobj-support.patch
lib-kconfigdebug-add-list_sort-debugging-switch.patch
lib-list_sort-test-use-more-reasonable-printk-levels.patch
lib-list_sort-test-use-generic-random32.patch
lib-list_sort-test-improve-errors-handling.patch
lib-list_sort-test-unify-test-messages.patch
lib-list_sort-test-check-element-addresses.patch
percpu_counter-use-this_cpu_ptr-instead-of-per_cpu_ptr.patch
lib-parser-cleanup-match_number.patch
drivers-mmc-host-omapc-use-resource_size.patch
drivers-mmc-host-omap_hsmmcc-use-resource_size.patch
checkpatch-fix-regressions-in-fix-handling-of-leading-spaces.patch
checkpatch-types-may-sit-on-a-line-on-their-own.patch
checkpatch-suggest-cleanpatch-and-cleanfile-when-appropriate.patch
checkpatch-ensure-we-do-not-collapse-bracketed-sections-into-constants.patch
checkpatch-handle-casts-better-fixing-false-categorisation-of-as-binary.patch
checkpatch-returning-errno-typically-should-be-negative.patch
checkpatch-add-check-for-space-after-struct-union-and-enum.patch
checkpatch-simplify-and-consolidate-missing-space-after-checks.patch
checkpatch-ensure-kconfig-help-checks-only-apply-when-we-are-adding-help.patch
checkpatch-check-for-incorrect-permissions.patch
checkpatch-add-additional-attribute-defines.patch
checkpatch-update-copyright-dates.patch
checkpatch-clean-up-structure-definition-macro-handline.patch
checkpatch-handle-export_symbol-for-device_attr-and-similar.patch
checkpatch-statement-block-context-analyser-should-look-at-sanitised-lines.patch
checkpatch-version-031.patch
scripts-checkpatchpl-add-warnings-for-static-char-that-could-be-static-const-char.patch
select-rename-estimate_accuracy-to-select_estimate_accuracy.patch
epoll-make-epoll_wait-use-the-hrtimer-range-feature.patch
dmi-log-board-system-and-bios-information-v2.patch
drivers-char-vt_ioctlc-fix-vt_openqry-error-value.patch
vcs-add-poll-fasync-support-fix-fix.patch
rtc-rtc-lpc32xx-introduce-rtc-driver-for-the-lpc32xx-soc-v4.patch
rtc-bfin-shrink-optimize-interrupt-handler-a-bit.patch
rtc-bfin-add-debug-markers-to-suspend-resume-paths.patch
drivers-rtc-classc-fix-device_register-error-handling.patch
rtc-omap-let-device-wakeup-capability-be-configured-from-chip-init-logic.patch
rtc-rtc-s3c-fix-access-unit-from-byte-to-word-on-rtccon.patch
rtc-rtc-s3c-fix-access-unit-from-byte-to-word-on-rtccon-checkpatch-fixes.patch
rtc-rtc-s3c-fix-setting-missing-field-of-getalarm.patch
rtc-rtc-s3c-fix-on-support-rtc-alarm.patch
rtc-rtc-s3c-fix-debug-message-format-on-rtc.patch
rtc-rtc-s3c-fix-rtc-initialization-method.patch
rtc-rtc-s3c-add-rtc_valid_tm-in-s3c_rtc_gettime.patch
gpio-add-driver-for-basic-memory-mapped-gpio-controllers.patch
gpio-add-driver-for-basic-memory-mapped-gpio-controllers-fix.patch
gpiolib-fix-have_gpio_lib-leftovers-in-asm-generic-gpioh.patch
gpio-timbgpio-use-a-copy-of-the-ier-register-to-avoid-it-being-trashed.patch
drivers-video-matrox-matroxfb_dac1064c-remove-undead-ifdef-config_fb_matrox_g.patch
savagefb-fix-ddc-for-savage-4.patch
drivers-video-matrox-matroxfb_mavenc-fix-unsigned-return-type.patch
fbmem-ix-whitespace.patch
cyber2000fb-avoid-palette-corruption-at-higher-clocks.patch
fbmem-fix-fb_read-fb_write-unaligned-accesses.patch
drivers-video-gbefbc-eliminate-memory-leak.patch
jbd-remove-dependency-on-__gfp_nofail.patch
isofs-work-around-for-rock-ridgejoliet-cds-with-empty-iso-root-directory.patch
isofs-fix-isofs_get_blocks-for-8tb-files.patch
hfsplus-identify-journal-info-block-in-volume-header.patch
hfsplus-fix-journal-detection.patch
doc-clarify-the-behaviour-of-dirty_ratio-dirty_bytes.patch
cgroup_freezer-unnecessary-test-in-cgroup_freezing_or_frozen.patch
cgroup_freezer-fix-can_attach-to-prohibit-moving-from-to-freezing-frozen-cgroups.patch
cgroup_freezer-update_freezer_state-does-incorrect-state-transitions.patch
cgroup_freezer-update_freezer_state-does-incorrect-state-transitions-checkpatch-fixes.patch
cgroup-add-clone_children-control-file.patch
cgroup-make-the-mount-options-parsing-more-accurate.patch
cgroups-add-check-for-strcpy-destination-string-overflow.patch
cgroup-notify-ns_cgroup-deprecated.patch
memcg-fix-race-in-file_mapped-accouting-flag-management.patch
memcg-avoid-lock-in-updating-file_mapped-was-fix-race-in-file_mapped-accouting-flag-management.patch
memcg-use-for_each_mem_cgroup.patch
memcg-cpu-hotplug-aware-percpu-count-updates.patch
memcg-cpu-hotplug-aware-percpu-count-updates-fix.patch
memcg-cpu-hotplug-aware-quick-acount_move-detection.patch
memcg-cpu-hotplug-aware-quick-acount_move-detection-checkpatch-fixes.patch
memcg-generic-filestat-update-interface.patch
memcg-reduce-lock-hold-time-during-charge-moving.patch
ptrace-annotate-lock-context-change-on-exit_ptrace.patch
ptrace-change-signature-of-sys_ptrace-and-friends.patch
ptrace-cleanup-ptrace_request.patch
ptrace-change-signature-of-arch_ptrace.patch
ptrace-cleanup-arch_ptrace-on-x86.patch
ptrace-cleanup-arch_ptrace-on-arm.patch
ptrace-cleanup-arch_ptrace-on-avr32.patch
ptrace-cleanup-arch_ptrace-and-friends-on-blackfin.patch
ptrace-cleanup-arch_ptrace-on-cris.patch
ptrace-cleanup-arch_ptrace-on-frv.patch
ptrace-cleanup-arch_ptrace-on-h8300.patch
ptrace-cleanup-arch_ptrace-on-m32r.patch
ptrace-cleanup-arch_ptrace-on-m68k.patch
ptrace-cleanup-arch_ptrace-on-m68knommu.patch
ptrace-cleanup-arch_ptrace-on-microblaze.patch
ptrace-cleanup-arch_ptrace-on-mips.patch
ptrace-cleanup-arch_ptrace-on-mn10300.patch
ptrace-cleanup-arch_ptrace-on-parisc.patch
ptrace-cleanup-arch_ptrace-on-powerpc.patch
ptrace-cleanup-arch_ptrace-on-score.patch
ptrace-cleanup-arch_ptrace-on-sh.patch
ptrace-cleanup-arch_ptrace-on-sparc.patch
ptrace-cleanup-arch_ptrace-on-tile.patch
ptrace-cleanup-arch_ptrace-on-um.patch
ptrace-cleanup-arch_ptrace-on-xtensa.patch
signals-annotate-lock_task_sighand.patch
signals-annotate-lock-context-change-on-ptrace_stop.patch
core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler.patch
core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update.patch
core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update-2.patch
core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update-2-checkpatch-fixes.patch
default-config_core_dump_default_elf_headers=y.patch
exit-add-lock-context-annotation-on-find_new_reaper.patch
proc-pid-smaps-export-amount-of-anonymous-memory-in-a-mapping.patch
proc-pid-smaps-export-amount-of-anonymous-memory-in-a-mapping-doc.patch
proc-pid-pagemap-document-in-documentation-filesystems-proctxt.patch
procfs-fix-proc-softirqs-formatting.patch
ipc-shmc-add-rss-and-swap-size-information-to-proc-sysvipc-shm.patch
ipc-shmc-add-rss-and-swap-size-information-to-proc-sysvipc-shm-v2.patch
ipc-initialize-structure-memory-to-zero-for-compat-functions.patch
ipmi-fix-__init-and-__exit-attribute-locations.patch
rocket-release_region-or-error-path.patch
drivers-char-hvc_consolec-remove-unneeded-__set_current_statetask_running.patch
sgi-altix-ia64-mmtimer-eliminate-long-interval-timer-holdoffs.patch
sgi-altix-ia64-mmtimer-eliminate-long-interval-timer-holdoffs-update.patch
hvc_console-fix-dropping-of-characters-when-output-byte-channel-is-full.patch
rapidio-fix-rapidio-sysfs-hierarchy.patch
rapidio-powerpc-85xx-modify-rio-port-write-interrupt-handler.patch
rapidio-use-stored-ingress-port-number-instead-of-register-read.patch
rapidio-add-relation-links-between-rio-device-structures.patch
rapidio-add-default-handler-for-error-stopped-state.patch
rapidio-modify-sysfs-initialization-for-switches.patch
rapidio-add-handling-of-orphan-port-write-message.patch
rapidio-add-device-access-check-into-the-enumeration.patch
rapidio-add-support-for-idt-cps-gen2-switches.patch
rapidio-add-handling-of-redundant-routes.patch
rapidio-fix-idle2-bits-corruption.patch
namespaces-remove-pid_ns-and-net_ns-experimental-status.patch
namespaces-default-all-the-namespaces-to-yes-when-config_namespaces-is-selected.patch
fs-execc-provide-the-correct-process-pid-to-the-pipe-helper.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
taskstats-separate-taskstats-commands.patch
taskstats-split-fill_pid-function.patch
taskstats-use-real-microsecond-granularity-for-cpu-times.patch
fuse-use-release_pages.patch
sparc-remove-dma64_addr_t-usage.patch
mips-remove-dma64_addr_t-usage.patch
alpha-remove-dma64_addr_t-usage.patch
remove-dma64_addr_t.patch
affs-testing-the-wrong-variable.patch
pps-trivial-fixes.patch
pps-declare-variables-where-they-are-used-in-switch.patch
pps-fix-race-in-pps_fetch-handler.patch
pps-unify-timestamp-gathering.patch
pps-access-pps-device-by-direct-pointer.patch
pps-convert-printk-pr_-to-dev_.patch
pps-move-idr-stuff-to-ppsc.patch
pps-add-async-pps-event-handler.patch
pps-add-async-pps-event-handler-fix.patch
pps-dont-disable-interrupts-when-using-spin-locks.patch
pps-use-bug_on-for-kernel-api-safety-checks.patch
pps-simplify-conditions-a-bit.patch
ntp-add-hardpps-implementation.patch
pps-capture-monotonic_raw-timestamps-as-well.patch
pps-add-kernel-consumer-support.patch
pps-add-parallel-port-pps-client.patch
pps-add-parallel-port-pps-signal-generator.patch
memstick-a-few-changes-to-core.patch
memstick-add-support-for-legacy-memorysticks.patch
memstick-add-driver-for-ricoh-r5c592-card-reader.patch
memstick-add-driver-for-ricoh-r5c592-card-reader-fix.patch
memstick-core-fix-device_register-error-handling.patch
w1-dont-allow-arbitrary-users-to-remove-w1-devices.patch
aio-bump-i_count-instead-of-using-igrab.patch
kernel-resourcec-handle-reinsertion-of-an-already-inserted-resource.patch
ramoops-use-the-platform-data-structure-instead-of-module-params.patch
ramoops-use-the-platform-data-structure-instead-of-module-params-fix.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
memblock-add-input-size-checking-to-memblock_find_region.patch
memblock-add-input-size-checking-to-memblock_find_region-fix.patch
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (staging/bcm)
2010-10-14 0:13 mmotm 2010-10-13-17-13 uploaded akpm
@ 2010-10-14 4:17 ` Randy Dunlap
2010-10-14 19:14 ` Greg KH
2010-10-14 4:29 ` mmotm 2010-10-13-17-13 uploaded (leds) Randy Dunlap
` (3 subsequent siblings)
4 siblings, 1 reply; 29+ messages in thread
From: Randy Dunlap @ 2010-10-14 4:17 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm, driverdevel, gregkh
On Wed, 13 Oct 2010 17:13:25 -0700 akpm@linux-foundation.org wrote:
> The mm-of-the-moment snapshot 2010-10-13-17-13 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.36-rc7:
drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:26: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:33: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:34: error: 'struct net_device' has no member named 'refcnt'
drivers/staging/bcm/Bcmnet.c:35: error: 'struct net_device' has no member named 'refcnt'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (leds)
2010-10-14 0:13 mmotm 2010-10-13-17-13 uploaded akpm
2010-10-14 4:17 ` mmotm 2010-10-13-17-13 uploaded (staging/bcm) Randy Dunlap
@ 2010-10-14 4:29 ` Randy Dunlap
2010-10-14 11:38 ` Johannes Berg
2010-10-14 10:26 ` mmotm 2010-10-13-17-13 uploaded Zimny Lech
` (2 subsequent siblings)
4 siblings, 1 reply; 29+ messages in thread
From: Randy Dunlap @ 2010-10-14 4:29 UTC (permalink / raw)
To: akpm, Johannes Berg; +Cc: linux-kernel
On Wed, 13 Oct 2010 17:13:25 -0700 akpm@linux-foundation.org wrote:
> The mm-of-the-moment snapshot 2010-10-13-17-13 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.36-rc7:
> led-class-always-implement-blinking.patch
When # CONFIG_LEDS_CLASS is not set
& CONFIG_LEDS_TRIGGERS=y:
drivers/built-in.o: In function `led_trigger_set':
(.text+0x4737b): undefined reference to `led_brightness_set'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded
2010-10-14 0:13 mmotm 2010-10-13-17-13 uploaded akpm
2010-10-14 4:17 ` mmotm 2010-10-13-17-13 uploaded (staging/bcm) Randy Dunlap
2010-10-14 4:29 ` mmotm 2010-10-13-17-13 uploaded (leds) Randy Dunlap
@ 2010-10-14 10:26 ` Zimny Lech
2010-10-14 19:16 ` Andrew Morton
2010-10-14 20:06 ` mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken Valdis.Kletnieks
2010-10-20 15:50 ` ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded] Jiri Slaby
4 siblings, 1 reply; 29+ messages in thread
From: Zimny Lech @ 2010-10-14 10:26 UTC (permalink / raw)
To: akpm; +Cc: mm-commits, linux-kernel
2010/10/14 <akpm@linux-foundation.org>:
> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
linux-next.patch breaks things
GEN /home/test/linux-2.6-obj/Makefile
HOSTCC scripts/kconfig/zconf.tab.o
In file included from scripts/kconfig/zconf.tab.c:2462:0:
scripts/kconfig/lex.zconf.c:2425:7: error: conflicting types for 'zconf_curname'
/home/test/linux-2.6-mm/scripts/kconfig/lkc.h:79:13: note: previous
declaration of 'zconf_curname' was here
scripts/kconfig/lex.zconf.c: In function 'zconf_curname':
scripts/kconfig/lex.zconf.c:2427:2: warning: return discards
qualifiers from pointer target type
make[3]: *** [scripts/kconfig/zconf.tab.o] Error 1
make[2]: *** [silentoldconfig] Error 2
make[1]: *** No rule to make target `include/config/auto.conf', needed
by `include/config/kernel.release'. Stop.
make: *** [sub-make] Error 2
--
Slawa!
N.P.S.
Les fleurs du mal unfold
Comme les fleurs du mal
Dark demons of my soul
Un amour fatal
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (leds)
2010-10-14 4:29 ` mmotm 2010-10-13-17-13 uploaded (leds) Randy Dunlap
@ 2010-10-14 11:38 ` Johannes Berg
2010-10-14 16:14 ` Randy Dunlap
0 siblings, 1 reply; 29+ messages in thread
From: Johannes Berg @ 2010-10-14 11:38 UTC (permalink / raw)
To: Randy Dunlap; +Cc: akpm, linux-kernel, rpurdie
On Thu, 2010-10-14 at 05:29 +0100, Randy Dunlap wrote:
> When # CONFIG_LEDS_CLASS is not set
> & CONFIG_LEDS_TRIGGERS=y:
>
> drivers/built-in.o: In function `led_trigger_set':
> (.text+0x4737b): undefined reference to `led_brightness_set'
Curious. Why is that even possible?
config LEDS_CLASS
...
if LEDS_CLASS
...
config LEDS_TRIGGERS
...
endif # LEDS_TRIGGERS
endif # LEDS_CLASS
...
Are there dependencies missing? I was under the impression that this
shouldn't be happening. And what's the point in having triggers, but
nothing to trigger...? How about the patch below?
johannes
Subject: leds: fix up dependencies
From: Johannes Berg <johannes.berg@intel.com>
It's not useful to build LED triggers when
there's no LEDs that can be triggered by
them. Therefore, fix up the dependencies
so that this cannot happen, and fix a few
users that select triggers to depend on
LEDS_CLASS as well (there is also one user
that also selects LEDS_CLASS, which is OK).
As a result, we can now make everything a
module again if desired (including the LED
triggers, that previously could only be
built in) -- and add back the warning in
rt2x00's Kconfig I previously removed.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
drivers/leds/Kconfig | 55 ++++++++++++++++++++++++++++--------
drivers/macintosh/Kconfig | 1
drivers/net/wireless/rt2x00/Kconfig | 3 +
net/mac80211/Kconfig | 2 -
4 files changed, 49 insertions(+), 12 deletions(-)
--- wireless-testing.orig/drivers/leds/Kconfig 2010-10-14 13:32:25.000000000 +0200
+++ wireless-testing/drivers/leds/Kconfig 2010-10-14 13:32:36.000000000 +0200
@@ -7,26 +7,27 @@ menuconfig NEW_LEDS
This is not related to standard keyboard LEDs which are controlled
via the input system.
-if NEW_LEDS
-
config LEDS_CLASS
- bool "LED Class Support"
+ tristate "LED Class Support"
+ depends on NEW_LEDS
help
This option enables the led sysfs class in /sys/class/leds. You'll
need this to do anything useful with LEDs. If unsure, say N.
-if LEDS_CLASS
+if NEW_LEDS
comment "LED drivers"
config LEDS_PRINTK
tristate "printk fake LED"
+ depends on LEDS_CLASS
help
This adds an LED that just prints the brightness to
the kernel messages.
config LEDS_88PM860X
tristate "LED Support for Marvell 88PM860x PMIC"
+ depends on LEDS_CLASS
depends on MFD_88PM860X
help
This option enables support for on-chip LED drivers found on Marvell
@@ -34,6 +35,7 @@ config LEDS_88PM860X
config LEDS_ATMEL_PWM
tristate "LED Support using Atmel PWM outputs"
+ depends on LEDS_CLASS
depends on ATMEL_PWM
help
This option enables support for LEDs driven using outputs
@@ -41,6 +43,7 @@ config LEDS_ATMEL_PWM
config LEDS_LOCOMO
tristate "LED Support for Locomo device"
+ depends on LEDS_CLASS
depends on SHARP_LOCOMO
help
This option enables support for the LEDs on Sharp Locomo.
@@ -48,6 +51,7 @@ config LEDS_LOCOMO
config LEDS_MIKROTIK_RB532
tristate "LED Support for Mikrotik Routerboard 532"
+ depends on LEDS_CLASS
depends on MIKROTIK_RB532
help
This option enables support for the so called "User LED" of
@@ -55,6 +59,7 @@ config LEDS_MIKROTIK_RB532
config LEDS_S3C24XX
tristate "LED Support for Samsung S3C24XX GPIO LEDs"
+ depends on LEDS_CLASS
depends on ARCH_S3C2410
help
This option enables support for LEDs connected to GPIO lines
@@ -62,12 +67,14 @@ config LEDS_S3C24XX
config LEDS_AMS_DELTA
tristate "LED Support for the Amstrad Delta (E3)"
+ depends on LEDS_CLASS
depends on MACH_AMS_DELTA
help
This option enables support for the LEDs on Amstrad Delta (E3).
config LEDS_NET48XX
tristate "LED Support for Soekris net48xx series Error LED"
+ depends on LEDS_CLASS
depends on SCx200_GPIO
help
This option enables support for the Soekris net4801 and net4826 error
@@ -85,18 +92,21 @@ config LEDS_NET5501
config LEDS_FSG
tristate "LED Support for the Freecom FSG-3"
+ depends on LEDS_CLASS
depends on MACH_FSG
help
This option enables support for the LEDs on the Freecom FSG-3.
config LEDS_WRAP
tristate "LED Support for the WRAP series LEDs"
+ depends on LEDS_CLASS
depends on SCx200_GPIO
help
This option enables support for the PCEngines WRAP programmable LEDs.
config LEDS_ALIX2
tristate "LED Support for ALIX.2 and ALIX.3 series"
+ depends on LEDS_CLASS
depends on X86 && !GPIO_CS5535 && !CS5535_GPIO
help
This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs.
@@ -104,12 +114,14 @@ config LEDS_ALIX2
config LEDS_H1940
tristate "LED Support for iPAQ H1940 device"
+ depends on LEDS_CLASS
depends on ARCH_H1940
help
This option enables support for the LEDs on the h1940.
config LEDS_COBALT_QUBE
tristate "LED Support for the Cobalt Qube series front LED"
+ depends on LEDS_CLASS
depends on MIPS_COBALT
help
This option enables support for the front LED on Cobalt Qube series
@@ -123,6 +135,7 @@ config LEDS_COBALT_RAQ
config LEDS_SUNFIRE
tristate "LED support for SunFire servers."
+ depends on LEDS_CLASS
depends on SPARC64
select LEDS_TRIGGERS
help
@@ -131,6 +144,7 @@ config LEDS_SUNFIRE
config LEDS_HP6XX
tristate "LED Support for the HP Jornada 6xx"
+ depends on LEDS_CLASS
depends on SH_HP6XX
help
This option enables LED support for the handheld
@@ -138,6 +152,7 @@ config LEDS_HP6XX
config LEDS_PCA9532
tristate "LED driver for PCA9532 dimmer"
+ depends on LEDS_CLASS
depends on I2C && INPUT && EXPERIMENTAL
help
This option enables support for NXP pca9532
@@ -146,6 +161,7 @@ config LEDS_PCA9532
config LEDS_GPIO
tristate "LED Support for GPIO connected LEDs"
+ depends on LEDS_CLASS
depends on GENERIC_GPIO
help
This option enables support for the LEDs connected to GPIO
@@ -173,6 +189,7 @@ config LEDS_GPIO_OF
config LEDS_LP3944
tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip"
+ depends on LEDS_CLASS
depends on I2C
help
This option enables support for LEDs connected to the National
@@ -184,6 +201,7 @@ config LEDS_LP3944
config LEDS_CLEVO_MAIL
tristate "Mail LED on Clevo notebook"
+ depends on LEDS_CLASS
depends on X86 && SERIO_I8042 && DMI
help
This driver makes the mail LED accessible from userspace
@@ -214,6 +232,7 @@ config LEDS_CLEVO_MAIL
config LEDS_PCA955X
tristate "LED Support for PCA955x I2C chips"
+ depends on LEDS_CLASS
depends on I2C
help
This option enables support for LEDs connected to PCA955x
@@ -222,6 +241,7 @@ config LEDS_PCA955X
config LEDS_WM831X_STATUS
tristate "LED support for status LEDs on WM831x PMICs"
+ depends on LEDS_CLASS
depends on MFD_WM831X
help
This option enables support for the status LEDs of the WM831x
@@ -229,6 +249,7 @@ config LEDS_WM831X_STATUS
config LEDS_WM8350
tristate "LED Support for WM8350 AudioPlus PMIC"
+ depends on LEDS_CLASS
depends on MFD_WM8350
help
This option enables support for LEDs driven by the Wolfson
@@ -236,6 +257,7 @@ config LEDS_WM8350
config LEDS_DA903X
tristate "LED Support for DA9030/DA9034 PMIC"
+ depends on LEDS_CLASS
depends on PMIC_DA903X
help
This option enables support for on-chip LED drivers found
@@ -243,6 +265,7 @@ config LEDS_DA903X
config LEDS_DAC124S085
tristate "LED Support for DAC124S085 SPI DAC"
+ depends on LEDS_CLASS
depends on SPI
help
This option enables support for DAC124S085 SPI DAC from NatSemi,
@@ -250,18 +273,21 @@ config LEDS_DAC124S085
config LEDS_PWM
tristate "PWM driven LED Support"
+ depends on LEDS_CLASS
depends on HAVE_PWM
help
This option enables support for pwm driven LEDs
config LEDS_REGULATOR
tristate "REGULATOR driven LED support"
+ depends on LEDS_CLASS
depends on REGULATOR
help
This option enables support for regulator driven LEDs.
config LEDS_BD2802
tristate "LED driver for BD2802 RGB LED"
+ depends on LEDS_CLASS
depends on I2C
help
This option enables support for BD2802GU RGB LED driver chips
@@ -269,6 +295,7 @@ config LEDS_BD2802
config LEDS_INTEL_SS4200
tristate "LED driver for Intel NAS SS4200 series"
+ depends on LEDS_CLASS
depends on PCI && DMI
help
This option enables support for the Intel SS4200 series of
@@ -278,6 +305,7 @@ config LEDS_INTEL_SS4200
config LEDS_LT3593
tristate "LED driver for LT3593 controllers"
+ depends on LEDS_CLASS
depends on GENERIC_GPIO
help
This option enables support for LEDs driven by a Linear Technology
@@ -286,6 +314,7 @@ config LEDS_LT3593
config LEDS_ADP5520
tristate "LED Support for ADP5520/ADP5501 PMIC"
+ depends on LEDS_CLASS
depends on PMIC_ADP5520
help
This option enables support for on-chip LED drivers found
@@ -296,6 +325,7 @@ config LEDS_ADP5520
config LEDS_DELL_NETBOOKS
tristate "External LED on Dell Business Netbooks"
+ depends on LEDS_CLASS
depends on X86 && ACPI_WMI
help
This adds support for the Latitude 2100 and similar
@@ -303,6 +333,7 @@ config LEDS_DELL_NETBOOKS
config LEDS_MC13783
tristate "LED Support for MC13783 PMIC"
+ depends on LEDS_CLASS
depends on MFD_MC13783
help
This option enable support for on-chip LED drivers found
@@ -310,6 +341,7 @@ config LEDS_MC13783
config LEDS_NS2
tristate "LED support for Network Space v2 GPIO LEDs"
+ depends on LEDS_CLASS
depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || MACH_NETSPACE_MAX_V2
default y
help
@@ -318,18 +350,18 @@ config LEDS_NS2
Network Space (Max) v2 and d2 Network v2 boards.
config LEDS_TRIGGERS
- bool "LED Trigger support"
+ tristate "LED Trigger support"
+ depends on LEDS_CLASS
help
This option enables trigger support for the leds class.
These triggers allow kernel events to drive the LEDs and can
be configured via sysfs. If unsure, say Y.
-if LEDS_TRIGGERS
-
comment "LED Triggers"
config LEDS_TRIGGER_TIMER
tristate "LED Timer Trigger"
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled by a programmable timer
via sysfs. Some LED hardware can be programmed to start
@@ -341,12 +373,14 @@ config LEDS_TRIGGER_TIMER
config LEDS_TRIGGER_IDE_DISK
bool "LED IDE Disk Trigger"
depends on IDE_GD_ATA
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled by IDE disk activity.
If unsure, say Y.
config LEDS_TRIGGER_HEARTBEAT
tristate "LED Heartbeat Trigger"
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled by a CPU load average.
The flash frequency is a hyperbolic function of the 1-minute
@@ -355,6 +389,7 @@ config LEDS_TRIGGER_HEARTBEAT
config LEDS_TRIGGER_BACKLIGHT
tristate "LED backlight Trigger"
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled as a backlight device: they
turn off and on when the display is blanked and unblanked.
@@ -363,6 +398,7 @@ config LEDS_TRIGGER_BACKLIGHT
config LEDS_TRIGGER_GPIO
tristate "LED GPIO Trigger"
+ depends on LEDS_TRIGGERS
depends on GPIOLIB
help
This allows LEDs to be controlled by gpio events. It's good
@@ -375,6 +411,7 @@ config LEDS_TRIGGER_GPIO
config LEDS_TRIGGER_DEFAULT_ON
tristate "LED Default ON Trigger"
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be initialised in the ON state.
If unsure, say Y.
@@ -382,8 +419,4 @@ config LEDS_TRIGGER_DEFAULT_ON
comment "iptables trigger is under Netfilter config (LED target)"
depends on LEDS_TRIGGERS
-endif # LEDS_TRIGGERS
-
-endif # LEDS_CLASS
-
endif # NEW_LEDS
--- wireless-testing.orig/drivers/macintosh/Kconfig 2010-10-14 13:32:26.000000000 +0200
+++ wireless-testing/drivers/macintosh/Kconfig 2010-10-14 13:32:36.000000000 +0200
@@ -102,6 +102,7 @@ config ADB_PMU_LED
config ADB_PMU_LED_IDE
bool "Use front LED as IDE LED by default"
depends on ADB_PMU_LED
+ depends on LEDS_CLASS=y
select LEDS_TRIGGERS
select LEDS_TRIGGER_IDE_DISK
help
--- wireless-testing.orig/net/mac80211/Kconfig 2010-10-14 13:32:25.000000000 +0200
+++ wireless-testing/net/mac80211/Kconfig 2010-10-14 13:32:36.000000000 +0200
@@ -92,7 +92,7 @@ config MAC80211_MESH
config MAC80211_LEDS
bool "Enable LED triggers"
depends on MAC80211
- select NEW_LEDS
+ depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211
select LEDS_TRIGGERS
---help---
This option enables a few LED triggers for different
--- wireless-testing.orig/drivers/net/wireless/rt2x00/Kconfig 2010-10-14 13:32:39.000000000 +0200
+++ wireless-testing/drivers/net/wireless/rt2x00/Kconfig 2010-10-14 13:32:43.000000000 +0200
@@ -221,6 +221,9 @@ config RT2X00_LIB_LEDS
boolean
default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)
+comment "rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00"
+ depends on RT2X00_LIB=y && LEDS_CLASS=m
+
config RT2X00_LIB_DEBUGFS
bool "Ralink debugfs support"
depends on RT2X00_LIB && MAC80211_DEBUGFS
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (leds)
2010-10-14 11:38 ` Johannes Berg
@ 2010-10-14 16:14 ` Randy Dunlap
2010-10-14 20:13 ` Johannes Berg
0 siblings, 1 reply; 29+ messages in thread
From: Randy Dunlap @ 2010-10-14 16:14 UTC (permalink / raw)
To: Johannes Berg; +Cc: akpm, linux-kernel, rpurdie
On 10/14/10 04:38, Johannes Berg wrote:
> On Thu, 2010-10-14 at 05:29 +0100, Randy Dunlap wrote:
>
>> When # CONFIG_LEDS_CLASS is not set
>> & CONFIG_LEDS_TRIGGERS=y:
>>
>> drivers/built-in.o: In function `led_trigger_set':
>> (.text+0x4737b): undefined reference to `led_brightness_set'
>
> Curious. Why is that even possible?
>
> config LEDS_CLASS
> ...
> if LEDS_CLASS
> ...
> config LEDS_TRIGGERS
> ...
> endif # LEDS_TRIGGERS
>
> endif # LEDS_CLASS
> ...
>
> Are there dependencies missing? I was under the impression that this
> shouldn't be happening. And what's the point in having triggers, but
> nothing to trigger...? How about the patch below?
It seems to be due to net/mac80211/Kconfig:
config MAC80211_LEDS
bool "Enable LED triggers"
depends on MAC80211
select NEW_LEDS
select LEDS_TRIGGERS
> johannes
>
>
> Subject: leds: fix up dependencies
> From: Johannes Berg <johannes.berg@intel.com>
>
> It's not useful to build LED triggers when
> there's no LEDs that can be triggered by
> them. Therefore, fix up the dependencies
> so that this cannot happen, and fix a few
> users that select triggers to depend on
> LEDS_CLASS as well (there is also one user
> that also selects LEDS_CLASS, which is OK).
>
> As a result, we can now make everything a
> module again if desired (including the LED
> triggers, that previously could only be
> built in) -- and add back the warning in
> rt2x00's Kconfig I previously removed.
>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
The patch does not apply cleanly to mmotm, but it seems
like a good plan...
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (staging/bcm)
2010-10-14 4:17 ` mmotm 2010-10-13-17-13 uploaded (staging/bcm) Randy Dunlap
@ 2010-10-14 19:14 ` Greg KH
2010-10-14 20:38 ` Randy Dunlap
0 siblings, 1 reply; 29+ messages in thread
From: Greg KH @ 2010-10-14 19:14 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-kernel, akpm, driverdevel, gregkh
On Wed, Oct 13, 2010 at 09:17:54PM -0700, Randy Dunlap wrote:
> On Wed, 13 Oct 2010 17:13:25 -0700 akpm@linux-foundation.org wrote:
>
> > The mm-of-the-moment snapshot 2010-10-13-17-13 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.36-rc7:
>
>
> drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:26: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:33: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:34: error: 'struct net_device' has no member named 'refcnt'
> drivers/staging/bcm/Bcmnet.c:35: error: 'struct net_device' has no member named 'refcnt'
Very wierd, is this coming from some other net_device structure change
in linux-next or mm?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded
2010-10-14 10:26 ` mmotm 2010-10-13-17-13 uploaded Zimny Lech
@ 2010-10-14 19:16 ` Andrew Morton
2010-10-14 19:23 ` Zimny Lech
0 siblings, 1 reply; 29+ messages in thread
From: Andrew Morton @ 2010-10-14 19:16 UTC (permalink / raw)
To: Zimny Lech
Cc: mm-commits, linux-kernel, Arnaud Lacombe, Sam Ravnborg, Michal Marek
On Thu, 14 Oct 2010 12:26:45 +0200
Zimny Lech <napohybelskurwysynom2010@gmail.com> wrote:
> 2010/10/14 <akpm@linux-foundation.org>:
> > The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
>
> linux-next.patch breaks things
>
> GEN /home/test/linux-2.6-obj/Makefile
> HOSTCC scripts/kconfig/zconf.tab.o
> In file included from scripts/kconfig/zconf.tab.c:2462:0:
> scripts/kconfig/lex.zconf.c:2425:7: error: conflicting types for 'zconf_curname'
> /home/test/linux-2.6-mm/scripts/kconfig/lkc.h:79:13: note: previous
> declaration of 'zconf_curname' was here
> scripts/kconfig/lex.zconf.c: In function 'zconf_curname':
> scripts/kconfig/lex.zconf.c:2427:2: warning: return discards
> qualifiers from pointer target type
> make[3]: *** [scripts/kconfig/zconf.tab.o] Error 1
> make[2]: *** [silentoldconfig] Error 2
> make[1]: *** No rule to make target `include/config/auto.conf', needed
> by `include/config/kernel.release'. Stop.
> make: *** [sub-make] Error 2
>
Something went wrong with the zconf_curname() constification.
lex scripts never seem to get along well with the build dependency
systems - did you try a `make mrproper' and a rebuild?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded
2010-10-14 19:16 ` Andrew Morton
@ 2010-10-14 19:23 ` Zimny Lech
0 siblings, 0 replies; 29+ messages in thread
From: Zimny Lech @ 2010-10-14 19:23 UTC (permalink / raw)
To: Andrew Morton
Cc: mm-commits, linux-kernel, Arnaud Lacombe, Sam Ravnborg, Michal Marek
2010/10/14 Andrew Morton <akpm@linux-foundation.org>:
> On Thu, 14 Oct 2010 12:26:45 +0200
> Zimny Lech <napohybelskurwysynom2010@gmail.com> wrote:
>
>> 2010/10/14 <akpm@linux-foundation.org>:
>> > The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
>>
>> linux-next.patch breaks things
>>
>> GEN /home/test/linux-2.6-obj/Makefile
>> HOSTCC scripts/kconfig/zconf.tab.o
>> In file included from scripts/kconfig/zconf.tab.c:2462:0:
>> scripts/kconfig/lex.zconf.c:2425:7: error: conflicting types for 'zconf_curname'
>> /home/test/linux-2.6-mm/scripts/kconfig/lkc.h:79:13: note: previous
>> declaration of 'zconf_curname' was here
>> scripts/kconfig/lex.zconf.c: In function 'zconf_curname':
>> scripts/kconfig/lex.zconf.c:2427:2: warning: return discards
>> qualifiers from pointer target type
>> make[3]: *** [scripts/kconfig/zconf.tab.o] Error 1
>> make[2]: *** [silentoldconfig] Error 2
>> make[1]: *** No rule to make target `include/config/auto.conf', needed
>> by `include/config/kernel.release'. Stop.
>> make: *** [sub-make] Error 2
>>
>
> Something went wrong with the zconf_curname() constification.
>
> lex scripts never seem to get along well with the build dependency
> systems - did you try a `make mrproper' and a rebuild?
Yes and no.
Yes, because I've got mrproper for KERNEL_DIR, and no, because I don't
have this for KERNEL_OBJ_DIR
def kernel_make_mrproper(self):
print("make mrproper")
os.system("cd " + self.config["KERNEL_DIR"] + " &&
LANG=\"C\" make mrproper &> /dev/null")
def kernel_make_clean(self):
print("make clean")
os.system("cd " + self.config["KERNEL_DIR"] + " &&
LANG=\"C\" make O=" + self.config["KERNEL_OBJ_DIR"] + " clean &>
/dev/null")
I'll fix my script :)
--
Slawa!
N.P.S.
Les fleurs du mal unfold
Comme les fleurs du mal
Dark demons of my soul
Un amour fatal
^ permalink raw reply [flat|nested] 29+ messages in thread
* mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
2010-10-14 0:13 mmotm 2010-10-13-17-13 uploaded akpm
` (2 preceding siblings ...)
2010-10-14 10:26 ` mmotm 2010-10-13-17-13 uploaded Zimny Lech
@ 2010-10-14 20:06 ` Valdis.Kletnieks
2010-10-15 8:45 ` Hans Verkuil
2010-10-20 15:50 ` ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded] Jiri Slaby
4 siblings, 1 reply; 29+ messages in thread
From: Valdis.Kletnieks @ 2010-10-14 20:06 UTC (permalink / raw)
To: Andrew Morton, Hans Verkuil, Mauro Carvalho Chehab
Cc: linux-kernel, linux-media
[-- Attachment #1: Type: text/plain, Size: 1774 bytes --]
On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said:
> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
>
> http://userweb.kernel.org/~akpm/mmotm/
This broke my webcam. I bisected it down to this commit, and things
work again after reverting the 2 code lines of change.
commit 9e4d79a98ebd857ec729f5fa8f432f35def4d0da
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Sep 26 08:16:56 2010 -0300
V4L/DVB: v4l2-dev: after a disconnect any ioctl call will be blocked
Until now all fops except release and (unlocked_)ioctl returned an error
after the device node was unregistered. Extend this as well to the ioctl
fops. There is nothing useful that an application can do here and it
complicates the driver code unnecessarily.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index d4a3532..f069c61 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -221,8 +221,8 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd,
struct video_device *vdev = video_devdata(filp);
int ret;
- /* Allow ioctl to continue even if the device was unregistered.
- Things like dequeueing buffers might still be useful. */
+ if (!vdev->fops->ioctl)
+ return -ENOTTY;
if (vdev->fops->unlocked_ioctl) {
ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);
} else if (vdev->fops->ioctl) {
I suspect this doesn't do what's intended if a driver is using ->unlocked_ioctl
rather than ->ioctl, and it should be reverted - it only saves at most one
if statement.
[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (leds)
2010-10-14 16:14 ` Randy Dunlap
@ 2010-10-14 20:13 ` Johannes Berg
2010-10-14 20:32 ` Randy Dunlap
0 siblings, 1 reply; 29+ messages in thread
From: Johannes Berg @ 2010-10-14 20:13 UTC (permalink / raw)
To: Randy Dunlap; +Cc: akpm, linux-kernel, rpurdie
On Thu, 2010-10-14 at 09:14 -0700, Randy Dunlap wrote:
> > Are there dependencies missing? I was under the impression that this
> > shouldn't be happening. And what's the point in having triggers, but
> > nothing to trigger...? How about the patch below?
>
> It seems to be due to net/mac80211/Kconfig:
>
> config MAC80211_LEDS
> bool "Enable LED triggers"
> depends on MAC80211
> select NEW_LEDS
> select LEDS_TRIGGERS
Ohh. Indeed, that should be easy to fix, make it depend on
LEDS_TRIGGERS=y || LEDS_TRIGGERS=MAC80211 or so?
> > Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>
> The patch does not apply cleanly to mmotm, but it seems
> like a good plan...
Hmm, ok, it was against the latest -rc or so. It'll have to wait a bit,
I'm about to leave for a week. Sorry!
johannes
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (leds)
2010-10-14 20:13 ` Johannes Berg
@ 2010-10-14 20:32 ` Randy Dunlap
2010-10-26 10:14 ` Johannes Berg
0 siblings, 1 reply; 29+ messages in thread
From: Randy Dunlap @ 2010-10-14 20:32 UTC (permalink / raw)
To: Johannes Berg; +Cc: akpm, linux-kernel, rpurdie
On 10/14/10 13:13, Johannes Berg wrote:
> On Thu, 2010-10-14 at 09:14 -0700, Randy Dunlap wrote:
>
>>> Are there dependencies missing? I was under the impression that this
>>> shouldn't be happening. And what's the point in having triggers, but
>>> nothing to trigger...? How about the patch below?
>>
>> It seems to be due to net/mac80211/Kconfig:
>>
>> config MAC80211_LEDS
>> bool "Enable LED triggers"
>> depends on MAC80211
>> select NEW_LEDS
>> select LEDS_TRIGGERS
>
> Ohh. Indeed, that should be easy to fix, make it depend on
> LEDS_TRIGGERS=y || LEDS_TRIGGERS=MAC80211 or so?
Yes.
>>> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
>>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>>
>> The patch does not apply cleanly to mmotm, but it seems
>> like a good plan...
>
> Hmm, ok, it was against the latest -rc or so. It'll have to wait a bit,
> I'm about to leave for a week. Sorry!
No problem.
later,
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (staging/bcm)
2010-10-14 19:14 ` Greg KH
@ 2010-10-14 20:38 ` Randy Dunlap
0 siblings, 0 replies; 29+ messages in thread
From: Randy Dunlap @ 2010-10-14 20:38 UTC (permalink / raw)
To: Greg KH; +Cc: linux-kernel, akpm, driverdevel, gregkh
On 10/14/10 12:14, Greg KH wrote:
> On Wed, Oct 13, 2010 at 09:17:54PM -0700, Randy Dunlap wrote:
>> On Wed, 13 Oct 2010 17:13:25 -0700 akpm@linux-foundation.org wrote:
>>
>>> The mm-of-the-moment snapshot 2010-10-13-17-13 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.36-rc7:
>>
>>
>> drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:24: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:26: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:31: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:33: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:34: error: 'struct net_device' has no member named 'refcnt'
>> drivers/staging/bcm/Bcmnet.c:35: error: 'struct net_device' has no member named 'refcnt'
>
> Very wierd, is this coming from some other net_device structure change
> in linux-next or mm?
in linux-next:
include/linux/netdevice.h:
< atomic_t refcnt ____cacheline_aligned_in_smp;
> int __percpu *pcpu_refcnt;
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
2010-10-14 20:06 ` mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken Valdis.Kletnieks
@ 2010-10-15 8:45 ` Hans Verkuil
2010-10-15 9:05 ` Andrew Morton
0 siblings, 1 reply; 29+ messages in thread
From: Hans Verkuil @ 2010-10-15 8:45 UTC (permalink / raw)
To: Valdis.Kletnieks
Cc: Andrew Morton, Mauro Carvalho Chehab, linux-kernel, linux-media
On Thursday, October 14, 2010 22:06:29 Valdis.Kletnieks@vt.edu wrote:
> On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said:
> > The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
> >
> > http://userweb.kernel.org/~akpm/mmotm/
>
> This broke my webcam. I bisected it down to this commit, and things
> work again after reverting the 2 code lines of change.
>
> commit 9e4d79a98ebd857ec729f5fa8f432f35def4d0da
> Author: Hans Verkuil <hverkuil@xs4all.nl>
> Date: Sun Sep 26 08:16:56 2010 -0300
>
> V4L/DVB: v4l2-dev: after a disconnect any ioctl call will be blocked
>
> Until now all fops except release and (unlocked_)ioctl returned an error
> after the device node was unregistered. Extend this as well to the ioctl
> fops. There is nothing useful that an application can do here and it
> complicates the driver code unnecessarily.
>
> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
>
>
> diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
> index d4a3532..f069c61 100644
> --- a/drivers/media/video/v4l2-dev.c
> +++ b/drivers/media/video/v4l2-dev.c
> @@ -221,8 +221,8 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd,
> struct video_device *vdev = video_devdata(filp);
> int ret;
>
> - /* Allow ioctl to continue even if the device was unregistered.
> - Things like dequeueing buffers might still be useful. */
> + if (!vdev->fops->ioctl)
> + return -ENOTTY;
> if (vdev->fops->unlocked_ioctl) {
> ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);
> } else if (vdev->fops->ioctl) {
>
> I suspect this doesn't do what's intended if a driver is using ->unlocked_ioctl
> rather than ->ioctl, and it should be reverted - it only saves at most one
> if statement.
>
>
I'm not sure what is going on here. It looks like this patch is mangled in your
tree since the same patch in the v4l-dvb repository looks like this:
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 32575a6..26d39c4 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -222,8 +222,8 @@ static int v4l2_ioctl(struct inode *inode, struct file *filp,
if (!vdev->fops->ioctl)
return -ENOTTY;
- /* Allow ioctl to continue even if the device was unregistered.
- Things like dequeueing buffers might still be useful. */
+ if (!video_is_registered(vdev))
+ return -ENODEV;
return vdev->fops->ioctl(filp, cmd, arg);
}
@@ -234,8 +234,8 @@ static long v4l2_unlocked_ioctl(struct file *filp,
if (!vdev->fops->unlocked_ioctl)
return -ENOTTY;
- /* Allow ioctl to continue even if the device was unregistered.
- Things like dequeueing buffers might still be useful. */
+ if (!video_is_registered(vdev))
+ return -ENODEV;
return vdev->fops->unlocked_ioctl(filp, cmd, arg);
}
In your diff there is a mismatch between ioctl and unlocked_ioctl which no doubt
is causing all the problems for you.
Regards,
Hans
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco
^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
2010-10-15 8:45 ` Hans Verkuil
@ 2010-10-15 9:05 ` Andrew Morton
2010-10-15 10:02 ` Hans Verkuil
0 siblings, 1 reply; 29+ messages in thread
From: Andrew Morton @ 2010-10-15 9:05 UTC (permalink / raw)
To: Hans Verkuil
Cc: Valdis.Kletnieks, Mauro Carvalho Chehab, linux-kernel, linux-media
On Fri, 15 Oct 2010 10:45:45 +0200 Hans Verkuil <hverkuil@xs4all.nl> wrote:
> On Thursday, October 14, 2010 22:06:29 Valdis.Kletnieks@vt.edu wrote:
> > On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said:
> > > The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
> > >
> > > http://userweb.kernel.org/~akpm/mmotm/
> >
> > This broke my webcam. I bisected it down to this commit, and things
> > work again after reverting the 2 code lines of change.
> >
> > commit 9e4d79a98ebd857ec729f5fa8f432f35def4d0da
> > Author: Hans Verkuil <hverkuil@xs4all.nl>
> > Date: Sun Sep 26 08:16:56 2010 -0300
> >
> > V4L/DVB: v4l2-dev: after a disconnect any ioctl call will be blocked
> >
> > Until now all fops except release and (unlocked_)ioctl returned an error
> > after the device node was unregistered. Extend this as well to the ioctl
> > fops. There is nothing useful that an application can do here and it
> > complicates the driver code unnecessarily.
> >
> > Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> >
> >
> > diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
> > index d4a3532..f069c61 100644
> > --- a/drivers/media/video/v4l2-dev.c
> > +++ b/drivers/media/video/v4l2-dev.c
> > @@ -221,8 +221,8 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd,
> > struct video_device *vdev = video_devdata(filp);
> > int ret;
> >
> > - /* Allow ioctl to continue even if the device was unregistered.
> > - Things like dequeueing buffers might still be useful. */
> > + if (!vdev->fops->ioctl)
> > + return -ENOTTY;
> > if (vdev->fops->unlocked_ioctl) {
> > ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);
> > } else if (vdev->fops->ioctl) {
> >
> > I suspect this doesn't do what's intended if a driver is using ->unlocked_ioctl
> > rather than ->ioctl, and it should be reverted - it only saves at most one
> > if statement.
> >
> >
>
> I'm not sure what is going on here. It looks like this patch is mangled in your
> tree since the same patch in the v4l-dvb repository looks like this:
>
> diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
> index 32575a6..26d39c4 100644
> --- a/drivers/media/video/v4l2-dev.c
> +++ b/drivers/media/video/v4l2-dev.c
> @@ -222,8 +222,8 @@ static int v4l2_ioctl(struct inode *inode, struct file *filp,
>
> if (!vdev->fops->ioctl)
> return -ENOTTY;
> - /* Allow ioctl to continue even if the device was unregistered.
> - Things like dequeueing buffers might still be useful. */
> + if (!video_is_registered(vdev))
> + return -ENODEV;
> return vdev->fops->ioctl(filp, cmd, arg);
> }
>
> @@ -234,8 +234,8 @@ static long v4l2_unlocked_ioctl(struct file *filp,
>
> if (!vdev->fops->unlocked_ioctl)
> return -ENOTTY;
> - /* Allow ioctl to continue even if the device was unregistered.
> - Things like dequeueing buffers might still be useful. */
> + if (!video_is_registered(vdev))
> + return -ENODEV;
> return vdev->fops->unlocked_ioctl(filp, cmd, arg);
> }
>
> In your diff there is a mismatch between ioctl and unlocked_ioctl which no doubt
> is causing all the problems for you.
The patch which Valdis quoted is what is in linux-next. I'm not
at which stage the mangling happened?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
2010-10-15 9:05 ` Andrew Morton
@ 2010-10-15 10:02 ` Hans Verkuil
2010-10-15 12:05 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 29+ messages in thread
From: Hans Verkuil @ 2010-10-15 10:02 UTC (permalink / raw)
To: Andrew Morton
Cc: Valdis.Kletnieks, Mauro Carvalho Chehab, linux-kernel, linux-media
On Friday, October 15, 2010 11:05:26 Andrew Morton wrote:
> On Fri, 15 Oct 2010 10:45:45 +0200 Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
> > On Thursday, October 14, 2010 22:06:29 Valdis.Kletnieks@vt.edu wrote:
> > > On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said:
> > > > The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
> > > >
> > > > http://userweb.kernel.org/~akpm/mmotm/
> > >
> > > This broke my webcam. I bisected it down to this commit, and things
> > > work again after reverting the 2 code lines of change.
> > >
> > > commit 9e4d79a98ebd857ec729f5fa8f432f35def4d0da
> > > Author: Hans Verkuil <hverkuil@xs4all.nl>
> > > Date: Sun Sep 26 08:16:56 2010 -0300
> > >
> > > V4L/DVB: v4l2-dev: after a disconnect any ioctl call will be blocked
> > >
> > > Until now all fops except release and (unlocked_)ioctl returned an error
> > > after the device node was unregistered. Extend this as well to the ioctl
> > > fops. There is nothing useful that an application can do here and it
> > > complicates the driver code unnecessarily.
> > >
> > > Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
> > > Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> > >
> > >
> > > diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
> > > index d4a3532..f069c61 100644
> > > --- a/drivers/media/video/v4l2-dev.c
> > > +++ b/drivers/media/video/v4l2-dev.c
> > > @@ -221,8 +221,8 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd,
> > > struct video_device *vdev = video_devdata(filp);
> > > int ret;
> > >
> > > - /* Allow ioctl to continue even if the device was unregistered.
> > > - Things like dequeueing buffers might still be useful. */
> > > + if (!vdev->fops->ioctl)
> > > + return -ENOTTY;
> > > if (vdev->fops->unlocked_ioctl) {
> > > ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);
> > > } else if (vdev->fops->ioctl) {
> > >
> > > I suspect this doesn't do what's intended if a driver is using ->unlocked_ioctl
> > > rather than ->ioctl, and it should be reverted - it only saves at most one
> > > if statement.
> > >
> > >
> >
> > I'm not sure what is going on here. It looks like this patch is mangled in your
> > tree since the same patch in the v4l-dvb repository looks like this:
> >
> > diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
> > index 32575a6..26d39c4 100644
> > --- a/drivers/media/video/v4l2-dev.c
> > +++ b/drivers/media/video/v4l2-dev.c
> > @@ -222,8 +222,8 @@ static int v4l2_ioctl(struct inode *inode, struct file *filp,
> >
> > if (!vdev->fops->ioctl)
> > return -ENOTTY;
> > - /* Allow ioctl to continue even if the device was unregistered.
> > - Things like dequeueing buffers might still be useful. */
> > + if (!video_is_registered(vdev))
> > + return -ENODEV;
> > return vdev->fops->ioctl(filp, cmd, arg);
> > }
> >
> > @@ -234,8 +234,8 @@ static long v4l2_unlocked_ioctl(struct file *filp,
> >
> > if (!vdev->fops->unlocked_ioctl)
> > return -ENOTTY;
> > - /* Allow ioctl to continue even if the device was unregistered.
> > - Things like dequeueing buffers might still be useful. */
> > + if (!video_is_registered(vdev))
> > + return -ENODEV;
> > return vdev->fops->unlocked_ioctl(filp, cmd, arg);
> > }
> >
> > In your diff there is a mismatch between ioctl and unlocked_ioctl which no doubt
> > is causing all the problems for you.
>
> The patch which Valdis quoted is what is in linux-next. I'm not
> at which stage the mangling happened?
>
OK, I see what happened. My original patch:
http://git.linuxtv.org/media_tree.git?a=commitdiff;h=30de1fa062e42a74c54e94c8977d7dcef9a5049f;hp=f39385558f50f0b5b2bc9b47c187b81a8188fb10
clashed with Arnd Bergmann's patch:
http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commit;h=86a5ef7d777cdd61dfe82379d559dbea069aea3d
Someone tried to resolve the conflict but made a mistake.
The result is this:
static long v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct video_device *vdev = video_devdata(filp);
int ret;
if (!vdev->fops->ioctl)
return -ENOTTY;
if (vdev->fops->unlocked_ioctl) {
if (vdev->lock)
mutex_lock(vdev->lock);
ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);
if (vdev->lock)
mutex_unlock(vdev->lock);
} else if (vdev->fops->ioctl) {
/* TODO: convert all drivers to unlocked_ioctl */
lock_kernel();
ret = vdev->fops->ioctl(filp, cmd, arg);
unlock_kernel();
} else
ret = -ENOTTY;
return ret;
}
But this is wrong.
What it should be is this:
static long v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct video_device *vdev = video_devdata(filp);
int ret = -ENODEV;
if (vdev->fops->unlocked_ioctl) {
if (vdev->lock)
mutex_lock(vdev->lock);
if (video_is_registered(vdev))
ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);
if (vdev->lock)
mutex_unlock(vdev->lock);
} else if (vdev->fops->ioctl) {
/* TODO: convert all drivers to unlocked_ioctl */
lock_kernel();
if (video_is_registered(vdev))
ret = vdev->fops->ioctl(filp, cmd, arg);
unlock_kernel();
} else
ret = -ENOTTY;
return ret;
}
Mauro, is this something for you to fix?
Regards,
Hans
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
2010-10-15 10:02 ` Hans Verkuil
@ 2010-10-15 12:05 ` Mauro Carvalho Chehab
2010-10-15 12:23 ` Hans Verkuil
0 siblings, 1 reply; 29+ messages in thread
From: Mauro Carvalho Chehab @ 2010-10-15 12:05 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Andrew Morton, Valdis.Kletnieks, linux-kernel, linux-media
Em 15-10-2010 07:02, Hans Verkuil escreveu:
> On Friday, October 15, 2010 11:05:26 Andrew Morton wrote:
>> On Fri, 15 Oct 2010 10:45:45 +0200 Hans Verkuil <hverkuil@xs4all.nl> wrote:
>>
>>> On Thursday, October 14, 2010 22:06:29 Valdis.Kletnieks@vt.edu wrote:
>>>> On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said:
>>>>> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
>
> Mauro, is this something for you to fix?
I have a patch fixing this conflict already:
http://git.linuxtv.org/mchehab/sbtvd.git?a=commit;h=88164fbe701a0a16e9044b74443dddb6188b54cc
The patch is currently on a separate tree, that I'm using to test some experimental
drivers for Brazilian Digital TV system (SBTVD). I'm planning to merge this patch, among
with other patches I received for .37 during this weekend.
The problem were due to a conflict between a BKL patch and your patch.
Cheers,
Mauro.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
2010-10-15 12:05 ` Mauro Carvalho Chehab
@ 2010-10-15 12:23 ` Hans Verkuil
2010-10-18 19:00 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 29+ messages in thread
From: Hans Verkuil @ 2010-10-15 12:23 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Andrew Morton, Valdis.Kletnieks, linux-kernel, linux-media
On Friday, October 15, 2010 14:05:39 Mauro Carvalho Chehab wrote:
> Em 15-10-2010 07:02, Hans Verkuil escreveu:
> > On Friday, October 15, 2010 11:05:26 Andrew Morton wrote:
> >> On Fri, 15 Oct 2010 10:45:45 +0200 Hans Verkuil <hverkuil@xs4all.nl> wrote:
> >>
> >>> On Thursday, October 14, 2010 22:06:29 Valdis.Kletnieks@vt.edu wrote:
> >>>> On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said:
> >>>>> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
> >
> > Mauro, is this something for you to fix?
>
> I have a patch fixing this conflict already:
>
> http://git.linuxtv.org/mchehab/sbtvd.git?a=commit;h=88164fbe701a0a16e9044b74443dddb6188b54cc
>
> The patch is currently on a separate tree, that I'm using to test some experimental
> drivers for Brazilian Digital TV system (SBTVD). I'm planning to merge this patch, among
> with other patches I received for .37 during this weekend.
No, this patch isn't sufficient. It backs out the wrong code but doesn't put
in the 'video_is_registered()' if statements that were in my original patch.
Those are really needed.
Regards,
Hans
> The problem were due to a conflict between a BKL patch and your patch.
>
> Cheers,
> Mauro.
>
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
2010-10-15 12:23 ` Hans Verkuil
@ 2010-10-18 19:00 ` Mauro Carvalho Chehab
2010-10-18 19:39 ` Hans Verkuil
0 siblings, 1 reply; 29+ messages in thread
From: Mauro Carvalho Chehab @ 2010-10-18 19:00 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Andrew Morton, Valdis.Kletnieks, linux-kernel, linux-media
Em 15-10-2010 09:23, Hans Verkuil escreveu:
> On Friday, October 15, 2010 14:05:39 Mauro Carvalho Chehab wrote:
>> Em 15-10-2010 07:02, Hans Verkuil escreveu:
>>> On Friday, October 15, 2010 11:05:26 Andrew Morton wrote:
>>>> On Fri, 15 Oct 2010 10:45:45 +0200 Hans Verkuil <hverkuil@xs4all.nl> wrote:
>>>>
>>>>> On Thursday, October 14, 2010 22:06:29 Valdis.Kletnieks@vt.edu wrote:
>>>>>> On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said:
>>>>>>> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
>>>
>>> Mauro, is this something for you to fix?
>>
>> I have a patch fixing this conflict already:
>>
>> http://git.linuxtv.org/mchehab/sbtvd.git?a=commit;h=88164fbe701a0a16e9044b74443dddb6188b54cc
>>
>> The patch is currently on a separate tree, that I'm using to test some experimental
>> drivers for Brazilian Digital TV system (SBTVD). I'm planning to merge this patch, among
>> with other patches I received for .37 during this weekend.
>
> No, this patch isn't sufficient. It backs out the wrong code but doesn't put
> in the 'video_is_registered()' if statements that were in my original patch.
>
> Those are really needed.
Ok, I've re-done the conflict fix patch:
http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-next.git;a=commitdiff;h=f9fccbad2a67668240edeaa6ada5aea2281d10b3
Cheers,
Mauro.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
2010-10-18 19:00 ` Mauro Carvalho Chehab
@ 2010-10-18 19:39 ` Hans Verkuil
0 siblings, 0 replies; 29+ messages in thread
From: Hans Verkuil @ 2010-10-18 19:39 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Andrew Morton, Valdis.Kletnieks, linux-kernel, linux-media
On Monday, October 18, 2010 21:00:57 Mauro Carvalho Chehab wrote:
> Em 15-10-2010 09:23, Hans Verkuil escreveu:
> > On Friday, October 15, 2010 14:05:39 Mauro Carvalho Chehab wrote:
> >> Em 15-10-2010 07:02, Hans Verkuil escreveu:
> >>> On Friday, October 15, 2010 11:05:26 Andrew Morton wrote:
> >>>> On Fri, 15 Oct 2010 10:45:45 +0200 Hans Verkuil <hverkuil@xs4all.nl> wrote:
> >>>>
> >>>>> On Thursday, October 14, 2010 22:06:29 Valdis.Kletnieks@vt.edu wrote:
> >>>>>> On Wed, 13 Oct 2010 17:13:25 PDT, akpm@linux-foundation.org said:
> >>>>>>> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
> >>>
> >>> Mauro, is this something for you to fix?
> >>
> >> I have a patch fixing this conflict already:
> >>
> >> http://git.linuxtv.org/mchehab/sbtvd.git?a=commit;h=88164fbe701a0a16e9044b74443dddb6188b54cc
> >>
> >> The patch is currently on a separate tree, that I'm using to test some experimental
> >> drivers for Brazilian Digital TV system (SBTVD). I'm planning to merge this patch, among
> >> with other patches I received for .37 during this weekend.
> >
> > No, this patch isn't sufficient. It backs out the wrong code but doesn't put
> > in the 'video_is_registered()' if statements that were in my original patch.
> >
> > Those are really needed.
>
> Ok, I've re-done the conflict fix patch:
>
> http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-next.git;a=commitdiff;h=f9fccbad2a67668240edeaa6ada5aea2281d10b3
I hate to say this, but it is still not right. This is the correct code:
static long v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct video_device *vdev = video_devdata(filp);
int ret = -ENODEV;
if (vdev->fops->unlocked_ioctl) {
if (vdev->lock)
mutex_lock(vdev->lock);
if (video_is_registered(vdev))
ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);
if (vdev->lock)
mutex_unlock(vdev->lock);
} else if (vdev->fops->ioctl) {
/* TODO: convert all drivers to unlocked_ioctl */
lock_kernel();
if (video_is_registered(vdev))
ret = vdev->fops->ioctl(filp, cmd, arg);
unlock_kernel();
} else
ret = -ENOTTY;
return ret;
}
As you can see, the video_is_registered is called with the lock held.
Regards,
Hans
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG, part of Cisco
^ permalink raw reply [flat|nested] 29+ messages in thread
* ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded]
2010-10-14 0:13 mmotm 2010-10-13-17-13 uploaded akpm
` (3 preceding siblings ...)
2010-10-14 20:06 ` mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken Valdis.Kletnieks
@ 2010-10-20 15:50 ` Jiri Slaby
2010-10-20 15:52 ` Peter Zijlstra
2010-10-20 15:54 ` Frederic Weisbecker
4 siblings, 2 replies; 29+ messages in thread
From: Jiri Slaby @ 2010-10-20 15:50 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm, mm-commits, Peter Zijlstra, Ingo Molnar
On 10/14/2010 02:13 AM, akpm@linux-foundation.org wrote:
> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
Hi, I tried to run a process in gdb and got this BUG:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000080
IP: [<ffffffff810c5c08>] fetch_bp_busy_slots.clone.1+0x28/0x1c0
PGD 1bacfa067 PUD 13b7f1067 PMD 0
Oops: 0000 [#1] SMP
last sysfs file: /sys/devices/virtual/net/tun0/statistics/collisions
CPU 1
Modules linked in: dvb_usb_af9015 dvb_usb
Pid: 18934, comm: gdb Not tainted 2.6.36-rc7-mm1_64+ #1286 To be filled
by O.E.M./To Be Filled By O.E.M.
RIP: 0010:[<ffffffff810c5c08>] [<ffffffff810c5c08>]
fetch_bp_busy_slots.clone.1+0x28/0x1c0
RSP: 0018:ffff8801b71a3ca8 EFLAGS: 00010286
RAX: 0000000000000000 RBX: ffff8801b71a3d18 RCX: 0000000000000000
RDX: ffff8801b71a3fd8 RSI: ffff88013bafc800 RDI: ffff8801b71a3d18
RBP: ffff8801b71a3cf8 R08: ffffffff81039620 R09: ffff88013bafc800
R10: fffe060673f40000 R11: 0000000000000001 R12: ffff88013bafc800
R13: 0000000000000000 R14: 00000000ffffffff R15: ffff88013bafc800
FS: 00007f0acb802700(0000) GS:ffff8800af280000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000080 CR3: 0000000188f40000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process gdb (pid: 18934, threadinfo ffff8801b71a2000, task ffff88019ddfee80)
Stack:
0000000000000000 0000000000000000 0000000000000000 0000000000000000
<0> 0000000000000000 ffff88013bafc800 ffff88013bafc800 0000000000000000
<0> 0000000000000000 ffff88013bafc800 ffff8801b71a3d38 ffffffff810c5dfa
Call Trace:
[<ffffffff810c5dfa>] __reserve_bp_slot+0x5a/0x90
[<ffffffff815c26d9>] ? mutex_lock+0x19/0x50
[<ffffffff810c5e60>] reserve_bp_slot+0x20/0x40
[<ffffffff810c5f41>] register_perf_hw_breakpoint+0x11/0x50
[<ffffffff810c8da2>] ? filemap_fault+0x122/0x4b0
[<ffffffff810c5fad>] hw_breakpoint_event_init+0x2d/0x50
[<ffffffff810c4346>] perf_init_event+0x36/0x80
[<ffffffff810c45d8>] perf_event_alloc+0x248/0x350
[<ffffffff81039620>] ? ptrace_triggered+0x0/0x40
[<ffffffff810c49bc>] perf_event_create_kernel_counter+0x2c/0x150
[<ffffffff810c5601>] register_user_hw_breakpoint+0x11/0x20
[<ffffffff8103975e>] ptrace_set_breakpoint_addr+0xde/0x100
[<ffffffff8103a485>] ptrace_set_debugreg+0x55/0x80
[<ffffffff8103a902>] arch_ptrace+0xe2/0x370
[<ffffffff81074c18>] sys_ptrace+0x68/0xc0
[<ffffffff815c3e1f>] ? page_fault+0x1f/0x30
[<ffffffff8102ee2b>] system_call_fastpath+0x16/0x1b
Code: 00 00 00 55 48 89 e5 41 57 41 56 41 55 41 54 49 89 f4 53 48 89 fb
48 83 ec 28 44 8b b6 dc 01 00 00 48 8b 86 80 01 00 00 45 85 f6 <4c> 8b
a8 80 00 00 00 78 5f 48 c7 c0 d8 e2 00 00 4d 63 f6 4a 8b
RIP [<ffffffff810c5c08>] fetch_bp_busy_slots.clone.1+0x28/0x1c0
RSP <ffff8801b71a3ca8>
CR2: 0000000000000080
---[ end trace 8199f8c45e224e74 ]---
psi[18938] trap int3 ip:7ffff3bdaa01 sp:7fffffffccc8 error:0
Is there a pacth for this already? Or should I investigate further?
regards,
--
js
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded]
2010-10-20 15:50 ` ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded] Jiri Slaby
@ 2010-10-20 15:52 ` Peter Zijlstra
2010-10-20 15:54 ` Frederic Weisbecker
1 sibling, 0 replies; 29+ messages in thread
From: Peter Zijlstra @ 2010-10-20 15:52 UTC (permalink / raw)
To: Jiri Slaby; +Cc: linux-kernel, akpm, mm-commits, Ingo Molnar
On Wed, 2010-10-20 at 17:50 +0200, Jiri Slaby wrote:
> On 10/14/2010 02:13 AM, akpm@linux-foundation.org wrote:
> > The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
>
> Hi, I tried to run a process in gdb and got this BUG:
>
> BUG: unable to handle kernel NULL pointer dereference at 0000000000000080
> IP: [<ffffffff810c5c08>] fetch_bp_busy_slots.clone.1+0x28/0x1c0
> PGD 1bacfa067 PUD 13b7f1067 PMD 0
> Oops: 0000 [#1] SMP
> last sysfs file: /sys/devices/virtual/net/tun0/statistics/collisions
> CPU 1
> Modules linked in: dvb_usb_af9015 dvb_usb
>
> Pid: 18934, comm: gdb Not tainted 2.6.36-rc7-mm1_64+ #1286 To be filled
> by O.E.M./To Be Filled By O.E.M.
> RIP: 0010:[<ffffffff810c5c08>] [<ffffffff810c5c08>]
> fetch_bp_busy_slots.clone.1+0x28/0x1c0
> RSP: 0018:ffff8801b71a3ca8 EFLAGS: 00010286
> RAX: 0000000000000000 RBX: ffff8801b71a3d18 RCX: 0000000000000000
> RDX: ffff8801b71a3fd8 RSI: ffff88013bafc800 RDI: ffff8801b71a3d18
> RBP: ffff8801b71a3cf8 R08: ffffffff81039620 R09: ffff88013bafc800
> R10: fffe060673f40000 R11: 0000000000000001 R12: ffff88013bafc800
> R13: 0000000000000000 R14: 00000000ffffffff R15: ffff88013bafc800
> FS: 00007f0acb802700(0000) GS:ffff8800af280000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 0000000000000080 CR3: 0000000188f40000 CR4: 00000000000006e0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> Process gdb (pid: 18934, threadinfo ffff8801b71a2000, task ffff88019ddfee80)
> Stack:
> 0000000000000000 0000000000000000 0000000000000000 0000000000000000
> <0> 0000000000000000 ffff88013bafc800 ffff88013bafc800 0000000000000000
> <0> 0000000000000000 ffff88013bafc800 ffff8801b71a3d38 ffffffff810c5dfa
> Call Trace:
> [<ffffffff810c5dfa>] __reserve_bp_slot+0x5a/0x90
> [<ffffffff815c26d9>] ? mutex_lock+0x19/0x50
> [<ffffffff810c5e60>] reserve_bp_slot+0x20/0x40
> [<ffffffff810c5f41>] register_perf_hw_breakpoint+0x11/0x50
> [<ffffffff810c8da2>] ? filemap_fault+0x122/0x4b0
> [<ffffffff810c5fad>] hw_breakpoint_event_init+0x2d/0x50
> [<ffffffff810c4346>] perf_init_event+0x36/0x80
> [<ffffffff810c45d8>] perf_event_alloc+0x248/0x350
> [<ffffffff81039620>] ? ptrace_triggered+0x0/0x40
> [<ffffffff810c49bc>] perf_event_create_kernel_counter+0x2c/0x150
> [<ffffffff810c5601>] register_user_hw_breakpoint+0x11/0x20
> [<ffffffff8103975e>] ptrace_set_breakpoint_addr+0xde/0x100
> [<ffffffff8103a485>] ptrace_set_debugreg+0x55/0x80
> [<ffffffff8103a902>] arch_ptrace+0xe2/0x370
> [<ffffffff81074c18>] sys_ptrace+0x68/0xc0
> [<ffffffff815c3e1f>] ? page_fault+0x1f/0x30
> [<ffffffff8102ee2b>] system_call_fastpath+0x16/0x1b
> Code: 00 00 00 55 48 89 e5 41 57 41 56 41 55 41 54 49 89 f4 53 48 89 fb
> 48 83 ec 28 44 8b b6 dc 01 00 00 48 8b 86 80 01 00 00 45 85 f6 <4c> 8b
> a8 80 00 00 00 78 5f 48 c7 c0 d8 e2 00 00 4d 63 f6 4a 8b
> RIP [<ffffffff810c5c08>] fetch_bp_busy_slots.clone.1+0x28/0x1c0
> RSP <ffff8801b71a3ca8>
> CR2: 0000000000000080
> ---[ end trace 8199f8c45e224e74 ]---
> psi[18938] trap int3 ip:7ffff3bdaa01 sp:7fffffffccc8 error:0
>
> Is there a pacth for this already? Or should I investigate further?
---
commit d580ff8699e8811a9af37e9de4dea375401bdeec
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu Oct 14 17:43:23 2010 +0200
perf, hw_breakpoint: Fix crash in hw_breakpoint creation
hw_breakpoint creation needs to account stuff per-task to ensure there
is always sufficient hardware resources to back these things due to
ptrace.
With the perf per pmu context changes the event initialization no
longer has access to the event context, for the simple reason that we
need to first find the pmu (result of initialization) before we can
find the context.
This makes hw_breakpoints unhappy, because it can no longer do per
task accounting, cure this by frobbing a task pointer in the event::hw
bits for now...
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20101014203625.391543667@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 2ebfc9a..97965fa 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -536,6 +536,12 @@ struct hw_perf_event {
struct { /* breakpoint */
struct arch_hw_breakpoint info;
struct list_head bp_list;
+ /*
+ * Crufty hack to avoid the chicken and egg
+ * problem hw_breakpoint has with context
+ * creation and event initalization.
+ */
+ struct task_struct *bp_target;
};
#endif
};
@@ -693,6 +699,7 @@ struct swevent_hlist {
#define PERF_ATTACH_CONTEXT 0x01
#define PERF_ATTACH_GROUP 0x02
+#define PERF_ATTACH_TASK 0x04
/**
* struct perf_event - performance event kernel representation:
diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c
index 3b714e8..2c9120f 100644
--- a/kernel/hw_breakpoint.c
+++ b/kernel/hw_breakpoint.c
@@ -113,12 +113,12 @@ static unsigned int max_task_bp_pinned(int cpu, enum bp_type_idx type)
*/
static int task_bp_pinned(struct perf_event *bp, enum bp_type_idx type)
{
- struct perf_event_context *ctx = bp->ctx;
+ struct task_struct *tsk = bp->hw.bp_target;
struct perf_event *iter;
int count = 0;
list_for_each_entry(iter, &bp_task_head, hw.bp_list) {
- if (iter->ctx == ctx && find_slot_idx(iter) == type)
+ if (iter->hw.bp_target == tsk && find_slot_idx(iter) == type)
count += hw_breakpoint_weight(iter);
}
@@ -134,7 +134,7 @@ fetch_bp_busy_slots(struct bp_busy_slots *slots, struct perf_event *bp,
enum bp_type_idx type)
{
int cpu = bp->cpu;
- struct task_struct *tsk = bp->ctx->task;
+ struct task_struct *tsk = bp->hw.bp_target;
if (cpu >= 0) {
slots->pinned = per_cpu(nr_cpu_bp_pinned[type], cpu);
@@ -213,7 +213,7 @@ toggle_bp_slot(struct perf_event *bp, bool enable, enum bp_type_idx type,
int weight)
{
int cpu = bp->cpu;
- struct task_struct *tsk = bp->ctx->task;
+ struct task_struct *tsk = bp->hw.bp_target;
/* Pinned counter cpu profiling */
if (!tsk) {
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index b21d06a..856e20b 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -5255,9 +5255,10 @@ unlock:
*/
static struct perf_event *
perf_event_alloc(struct perf_event_attr *attr, int cpu,
- struct perf_event *group_leader,
- struct perf_event *parent_event,
- perf_overflow_handler_t overflow_handler)
+ struct task_struct *task,
+ struct perf_event *group_leader,
+ struct perf_event *parent_event,
+ perf_overflow_handler_t overflow_handler)
{
struct pmu *pmu;
struct perf_event *event;
@@ -5299,6 +5300,17 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
event->state = PERF_EVENT_STATE_INACTIVE;
+ if (task) {
+ event->attach_state = PERF_ATTACH_TASK;
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+ /*
+ * hw_breakpoint is a bit difficult here..
+ */
+ if (attr->type == PERF_TYPE_BREAKPOINT)
+ event->hw.bp_target = task;
+#endif
+ }
+
if (!overflow_handler && parent_event)
overflow_handler = parent_event->overflow_handler;
@@ -5559,7 +5571,7 @@ SYSCALL_DEFINE5(perf_event_open,
}
}
- event = perf_event_alloc(&attr, cpu, group_leader, NULL, NULL);
+ event = perf_event_alloc(&attr, cpu, task, group_leader, NULL, NULL);
if (IS_ERR(event)) {
err = PTR_ERR(event);
goto err_task;
@@ -5728,7 +5740,7 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu,
* Get the target context (task or percpu):
*/
- event = perf_event_alloc(attr, cpu, NULL, NULL, overflow_handler);
+ event = perf_event_alloc(attr, cpu, task, NULL, NULL, overflow_handler);
if (IS_ERR(event)) {
err = PTR_ERR(event);
goto err;
@@ -5996,6 +6008,7 @@ inherit_event(struct perf_event *parent_event,
child_event = perf_event_alloc(&parent_event->attr,
parent_event->cpu,
+ child,
group_leader, parent_event,
NULL);
if (IS_ERR(child_event))
^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded]
2010-10-20 15:50 ` ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded] Jiri Slaby
2010-10-20 15:52 ` Peter Zijlstra
@ 2010-10-20 15:54 ` Frederic Weisbecker
2010-10-20 16:03 ` Jiri Slaby
1 sibling, 1 reply; 29+ messages in thread
From: Frederic Weisbecker @ 2010-10-20 15:54 UTC (permalink / raw)
To: Jiri Slaby; +Cc: linux-kernel, akpm, mm-commits, Peter Zijlstra, Ingo Molnar
On Wed, Oct 20, 2010 at 05:50:15PM +0200, Jiri Slaby wrote:
> On 10/14/2010 02:13 AM, akpm@linux-foundation.org wrote:
> > The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
>
> Hi, I tried to run a process in gdb and got this BUG:
>
> BUG: unable to handle kernel NULL pointer dereference at 0000000000000080
> IP: [<ffffffff810c5c08>] fetch_bp_busy_slots.clone.1+0x28/0x1c0
> PGD 1bacfa067 PUD 13b7f1067 PMD 0
> Oops: 0000 [#1] SMP
> last sysfs file: /sys/devices/virtual/net/tun0/statistics/collisions
> CPU 1
> Modules linked in: dvb_usb_af9015 dvb_usb
Do you have this fix?
d580ff8699e8811a9af37e9de4dea375401bdeec
("perf, hw_breakpoint: Fix crash in hw_breakpoint creation")
It's in tip:/perf/core, which perhaps hasn't yet reached -next.
This should fix the problem.
>
> Pid: 18934, comm: gdb Not tainted 2.6.36-rc7-mm1_64+ #1286 To be filled
> by O.E.M./To Be Filled By O.E.M.
> RIP: 0010:[<ffffffff810c5c08>] [<ffffffff810c5c08>]
> fetch_bp_busy_slots.clone.1+0x28/0x1c0
> RSP: 0018:ffff8801b71a3ca8 EFLAGS: 00010286
> RAX: 0000000000000000 RBX: ffff8801b71a3d18 RCX: 0000000000000000
> RDX: ffff8801b71a3fd8 RSI: ffff88013bafc800 RDI: ffff8801b71a3d18
> RBP: ffff8801b71a3cf8 R08: ffffffff81039620 R09: ffff88013bafc800
> R10: fffe060673f40000 R11: 0000000000000001 R12: ffff88013bafc800
> R13: 0000000000000000 R14: 00000000ffffffff R15: ffff88013bafc800
> FS: 00007f0acb802700(0000) GS:ffff8800af280000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 0000000000000080 CR3: 0000000188f40000 CR4: 00000000000006e0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> Process gdb (pid: 18934, threadinfo ffff8801b71a2000, task ffff88019ddfee80)
> Stack:
> 0000000000000000 0000000000000000 0000000000000000 0000000000000000
> <0> 0000000000000000 ffff88013bafc800 ffff88013bafc800 0000000000000000
> <0> 0000000000000000 ffff88013bafc800 ffff8801b71a3d38 ffffffff810c5dfa
> Call Trace:
> [<ffffffff810c5dfa>] __reserve_bp_slot+0x5a/0x90
> [<ffffffff815c26d9>] ? mutex_lock+0x19/0x50
> [<ffffffff810c5e60>] reserve_bp_slot+0x20/0x40
> [<ffffffff810c5f41>] register_perf_hw_breakpoint+0x11/0x50
> [<ffffffff810c8da2>] ? filemap_fault+0x122/0x4b0
> [<ffffffff810c5fad>] hw_breakpoint_event_init+0x2d/0x50
> [<ffffffff810c4346>] perf_init_event+0x36/0x80
> [<ffffffff810c45d8>] perf_event_alloc+0x248/0x350
> [<ffffffff81039620>] ? ptrace_triggered+0x0/0x40
> [<ffffffff810c49bc>] perf_event_create_kernel_counter+0x2c/0x150
> [<ffffffff810c5601>] register_user_hw_breakpoint+0x11/0x20
> [<ffffffff8103975e>] ptrace_set_breakpoint_addr+0xde/0x100
> [<ffffffff8103a485>] ptrace_set_debugreg+0x55/0x80
> [<ffffffff8103a902>] arch_ptrace+0xe2/0x370
> [<ffffffff81074c18>] sys_ptrace+0x68/0xc0
> [<ffffffff815c3e1f>] ? page_fault+0x1f/0x30
> [<ffffffff8102ee2b>] system_call_fastpath+0x16/0x1b
> Code: 00 00 00 55 48 89 e5 41 57 41 56 41 55 41 54 49 89 f4 53 48 89 fb
> 48 83 ec 28 44 8b b6 dc 01 00 00 48 8b 86 80 01 00 00 45 85 f6 <4c> 8b
> a8 80 00 00 00 78 5f 48 c7 c0 d8 e2 00 00 4d 63 f6 4a 8b
> RIP [<ffffffff810c5c08>] fetch_bp_busy_slots.clone.1+0x28/0x1c0
> RSP <ffff8801b71a3ca8>
> CR2: 0000000000000080
> ---[ end trace 8199f8c45e224e74 ]---
> psi[18938] trap int3 ip:7ffff3bdaa01 sp:7fffffffccc8 error:0
>
> Is there a pacth for this already? Or should I investigate further?
>
> regards,
> --
> js
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded]
2010-10-20 15:54 ` Frederic Weisbecker
@ 2010-10-20 16:03 ` Jiri Slaby
2010-10-20 16:13 ` Peter Zijlstra
0 siblings, 1 reply; 29+ messages in thread
From: Jiri Slaby @ 2010-10-20 16:03 UTC (permalink / raw)
To: Frederic Weisbecker
Cc: linux-kernel, akpm, mm-commits, Peter Zijlstra, Ingo Molnar
On 10/20/2010 05:54 PM, Frederic Weisbecker wrote:
> On Wed, Oct 20, 2010 at 05:50:15PM +0200, Jiri Slaby wrote:
>> On 10/14/2010 02:13 AM, akpm@linux-foundation.org wrote:
>>> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to
>>
>> Hi, I tried to run a process in gdb and got this BUG:
>>
>> BUG: unable to handle kernel NULL pointer dereference at 0000000000000080
>> IP: [<ffffffff810c5c08>] fetch_bp_busy_slots.clone.1+0x28/0x1c0
>> PGD 1bacfa067 PUD 13b7f1067 PMD 0
>> Oops: 0000 [#1] SMP
>> last sysfs file: /sys/devices/virtual/net/tun0/statistics/collisions
>> CPU 1
>> Modules linked in: dvb_usb_af9015 dvb_usb
>
>
>
> Do you have this fix?
>
> d580ff8699e8811a9af37e9de4dea375401bdeec
> ("perf, hw_breakpoint: Fix crash in hw_breakpoint creation")
>
> It's in tip:/perf/core, which perhaps hasn't yet reached -next.
>
>
> This should fix the problem.
I applied the patch and got another BUG:
WARNING: at /home/l/latest/xxx/kernel/fork.c:183
__put_task_struct+0xf2/0x110()
Hardware name: To Be Filled By O.E.M.
Modules linked in: dvb_usb_af9015 dvb_usb
Pid: 4743, comm: gdb Not tainted 2.6.36-rc7-mm1_64+ #1295
Call Trace:
[<ffffffff810692ca>] warn_slowpath_common+0x7a/0xb0
[<ffffffff81069315>] warn_slowpath_null+0x15/0x20
[<ffffffff810672a2>] __put_task_struct+0xf2/0x110
[<ffffffff81074c4f>] sys_ptrace+0x7f/0xc0
[<ffffffff8102ee2b>] system_call_fastpath+0x16/0x1b
---[ end trace 4d39ff87d0cf3ac8 ]---
------------[ cut here ]------------
WARNING: at /home/l/latest/xxx/kernel/fork.c:183
__put_task_struct+0xf2/0x110()
Hardware name: To Be Filled By O.E.M.
Modules linked in: dvb_usb_af9015 dvb_usb
Pid: 4743, comm: gdb Tainted: G W 2.6.36-rc7-mm1_64+ #1295
Call Trace:
[<ffffffff810692ca>] warn_slowpath_common+0x7a/0xb0
[<ffffffff81069315>] warn_slowpath_null+0x15/0x20
[<ffffffff810672a2>] __put_task_struct+0xf2/0x110
[<ffffffff81074c4f>] sys_ptrace+0x7f/0xc0
[<ffffffff8102ee2b>] system_call_fastpath+0x16/0x1b
---[ end trace 4d39ff87d0cf3ac9 ]---
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [<ffffffff8108b55a>] exit_creds+0x1a/0x90
PGD 1abdc9067 PUD 1abdcb067 PMD 0
Oops: 0000 [#1] SMP
last sysfs file: /sys/devices/virtual/net/tun0/statistics/collisions
CPU 1
Modules linked in: dvb_usb_af9015 dvb_usb
Pid: 4743, comm: gdb Tainted: G W 2.6.36-rc7-mm1_64+ #1295 To
be filled by O.E.M./To Be Filled By O.E.M.
RIP: 0010:[<ffffffff8108b55a>] [<ffffffff8108b55a>] exit_creds+0x1a/0x90
RSP: 0018:ffff8801a98e5f08 EFLAGS: 00010292
RAX: 0000000000000000 RBX: ffff88019584f500 RCX: 000000000003ffff
RDX: ffffffff81812968 RSI: 0000000000000046 RDI: 0000000000000000
RBP: ffff8801a98e5f18 R08: 0000000000000034 R09: 000000000000e1fd
R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000006
R13: 0000000000000368 R14: 0000000000000000 R15: 000000000003057f
FS: 00007f4d44bb5700(0000) GS:ffff8800af280000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000000 CR3: 00000001abff4000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process gdb (pid: 4743, threadinfo ffff8801a98e4000, task ffff88019583a080)
Stack:
ffff8801a98e5f18 ffff88019584f500 ffff8801a98e5f38 ffffffff810671ed
ffff88019584f500 0000000000000006 ffff8801a98e5f78 ffffffff81074c4f
0000000000000003 fffffffffffffffd 00007f4d44bb56a8 0000000000000003
Call Trace:
[<ffffffff810671ed>] __put_task_struct+0x3d/0x110
[<ffffffff81074c4f>] sys_ptrace+0x7f/0xc0
[<ffffffff8102ee2b>] system_call_fastpath+0x16/0x1b
Code: 84 36 ff ff ff e9 0f ff ff ff 0f 0b 0f 0b 0f 1f 00 55 48 89 e5 53
48 89 fb 48 83 ec 08 48 8b 87 08 03 00 00 48 8b bf 00 03 00 00 <8b> 00
48 c7 83 00 03 00 00 00 00 00 00 f0 ff 0f 0f 94 c0 84 c0
RIP [<ffffffff8108b55a>] exit_creds+0x1a/0x90
RSP <ffff8801a98e5f08>
CR2: 0000000000000000
---[ end trace 4d39ff87d0cf3aca ]---
psi[4748] trap int3 ip:7ffff3bdaa01 sp:7fffffffccc8 error:0
thanks,
--
js
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded]
2010-10-20 16:03 ` Jiri Slaby
@ 2010-10-20 16:13 ` Peter Zijlstra
2010-10-20 17:29 ` Jiri Slaby
2010-10-21 7:34 ` Jiri Slaby
0 siblings, 2 replies; 29+ messages in thread
From: Peter Zijlstra @ 2010-10-20 16:13 UTC (permalink / raw)
To: Jiri Slaby
Cc: Frederic Weisbecker, linux-kernel, akpm, mm-commits, Ingo Molnar
On Wed, 2010-10-20 at 18:03 +0200, Jiri Slaby wrote:
> I applied the patch and got another BUG:
I don't think it applies on its own.. please use -tip or -next.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded]
2010-10-20 16:13 ` Peter Zijlstra
@ 2010-10-20 17:29 ` Jiri Slaby
2010-10-21 7:34 ` Jiri Slaby
1 sibling, 0 replies; 29+ messages in thread
From: Jiri Slaby @ 2010-10-20 17:29 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Frederic Weisbecker, linux-kernel, akpm, mm-commits, Ingo Molnar
On 10/20/2010 06:13 PM, Peter Zijlstra wrote:
> On Wed, 2010-10-20 at 18:03 +0200, Jiri Slaby wrote:
>> I applied the patch and got another BUG:
>
> I don't think it applies on its own.. please use -tip or -next.
Ok, I will try not to use gdb/strace till the next mmotm and will report
then.
thanks,
--
js
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded]
2010-10-20 16:13 ` Peter Zijlstra
2010-10-20 17:29 ` Jiri Slaby
@ 2010-10-21 7:34 ` Jiri Slaby
2010-10-21 7:40 ` Peter Zijlstra
1 sibling, 1 reply; 29+ messages in thread
From: Jiri Slaby @ 2010-10-21 7:34 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Frederic Weisbecker, linux-kernel, akpm, mm-commits, Ingo Molnar
On 10/20/2010 06:13 PM, Peter Zijlstra wrote:
> On Wed, 2010-10-20 at 18:03 +0200, Jiri Slaby wrote:
>> I applied the patch and got another BUG:
>
> I don't think it applies on its own.. please use -tip or -next.
Ok, it works in mmotm 2010-10-20-15-01.
thanks,
--
js
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded]
2010-10-21 7:34 ` Jiri Slaby
@ 2010-10-21 7:40 ` Peter Zijlstra
0 siblings, 0 replies; 29+ messages in thread
From: Peter Zijlstra @ 2010-10-21 7:40 UTC (permalink / raw)
To: Jiri Slaby
Cc: Frederic Weisbecker, linux-kernel, akpm, mm-commits, Ingo Molnar
On Thu, 2010-10-21 at 09:34 +0200, Jiri Slaby wrote:
> On 10/20/2010 06:13 PM, Peter Zijlstra wrote:
> > On Wed, 2010-10-20 at 18:03 +0200, Jiri Slaby wrote:
> >> I applied the patch and got another BUG:
> >
> > I don't think it applies on its own.. please use -tip or -next.
>
> Ok, it works in mmotm 2010-10-20-15-01.
Awesome, thanks for testing!
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: mmotm 2010-10-13-17-13 uploaded (leds)
2010-10-14 20:32 ` Randy Dunlap
@ 2010-10-26 10:14 ` Johannes Berg
0 siblings, 0 replies; 29+ messages in thread
From: Johannes Berg @ 2010-10-26 10:14 UTC (permalink / raw)
To: Randy Dunlap; +Cc: akpm, linux-kernel, rpurdie
On Thu, 2010-10-14 at 13:32 -0700, Randy Dunlap wrote:
> >> The patch does not apply cleanly to mmotm, but it seems
> >> like a good plan...
Here's a version that I prepared against mmotm from the 23rd.
johannes
Subject: leds: fix up dependencies
From: Johannes Berg <johannes.berg@intel.com>
It's not useful to build LED triggers when
there's no LEDs that can be triggered by
them. Therefore, fix up the dependencies
so that this cannot happen, and fix a few
users that select triggers to depend on
LEDS_CLASS as well (there is also one user
that also selects LEDS_CLASS, which is OK).
As a result, we can now make everything a
module again if desired (including the LED
triggers, which previously could only be
built in) -- and add back the warning in
rt2x00's Kconfig I previously removed.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
drivers/leds/Kconfig | 57 +++++++++++++++++++++++++++++-------
drivers/macintosh/Kconfig | 1
drivers/net/wireless/rt2x00/Kconfig | 3 +
net/mac80211/Kconfig | 2 -
4 files changed, 51 insertions(+), 12 deletions(-)
--- linux-older.orig/drivers/leds/Kconfig 2010-10-26 12:10:47.000000000 +0200
+++ linux-older/drivers/leds/Kconfig 2010-10-26 12:12:39.000000000 +0200
@@ -4,20 +4,20 @@ menuconfig NEW_LEDS
Say Y to enable Linux LED support. This allows control of supported
LEDs from both userspace and optionally, by kernel events (triggers).
-if NEW_LEDS
-
config LEDS_CLASS
- bool "LED Class Support"
+ tristate "LED Class Support"
+ depends on NEW_LEDS
help
This option enables the led sysfs class in /sys/class/leds. You'll
need this to do anything useful with LEDs. If unsure, say N.
-if LEDS_CLASS
+if NEW_LEDS
comment "LED drivers"
config LEDS_88PM860X
tristate "LED Support for Marvell 88PM860x PMIC"
+ depends on LEDS_CLASS
depends on MFD_88PM860X
help
This option enables support for on-chip LED drivers found on Marvell
@@ -33,6 +33,7 @@ config LEDS_INPUT
config LEDS_ATMEL_PWM
tristate "LED Support using Atmel PWM outputs"
+ depends on LEDS_CLASS
depends on ATMEL_PWM
help
This option enables support for LEDs driven using outputs
@@ -40,6 +41,7 @@ config LEDS_ATMEL_PWM
config LEDS_LOCOMO
tristate "LED Support for Locomo device"
+ depends on LEDS_CLASS
depends on SHARP_LOCOMO
help
This option enables support for the LEDs on Sharp Locomo.
@@ -47,6 +49,7 @@ config LEDS_LOCOMO
config LEDS_MIKROTIK_RB532
tristate "LED Support for Mikrotik Routerboard 532"
+ depends on LEDS_CLASS
depends on MIKROTIK_RB532
help
This option enables support for the so called "User LED" of
@@ -54,6 +57,7 @@ config LEDS_MIKROTIK_RB532
config LEDS_S3C24XX
tristate "LED Support for Samsung S3C24XX GPIO LEDs"
+ depends on LEDS_CLASS
depends on ARCH_S3C2410
help
This option enables support for LEDs connected to GPIO lines
@@ -61,12 +65,14 @@ config LEDS_S3C24XX
config LEDS_AMS_DELTA
tristate "LED Support for the Amstrad Delta (E3)"
+ depends on LEDS_CLASS
depends on MACH_AMS_DELTA
help
This option enables support for the LEDs on Amstrad Delta (E3).
config LEDS_NET48XX
tristate "LED Support for Soekris net48xx series Error LED"
+ depends on LEDS_CLASS
depends on SCx200_GPIO
help
This option enables support for the Soekris net4801 and net4826 error
@@ -84,18 +90,21 @@ config LEDS_NET5501
config LEDS_FSG
tristate "LED Support for the Freecom FSG-3"
+ depends on LEDS_CLASS
depends on MACH_FSG
help
This option enables support for the LEDs on the Freecom FSG-3.
config LEDS_WRAP
tristate "LED Support for the WRAP series LEDs"
+ depends on LEDS_CLASS
depends on SCx200_GPIO
help
This option enables support for the PCEngines WRAP programmable LEDs.
config LEDS_ALIX2
tristate "LED Support for ALIX.2 and ALIX.3 series"
+ depends on LEDS_CLASS
depends on X86 && !GPIO_CS5535 && !CS5535_GPIO
help
This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs.
@@ -103,12 +112,14 @@ config LEDS_ALIX2
config LEDS_H1940
tristate "LED Support for iPAQ H1940 device"
+ depends on LEDS_CLASS
depends on ARCH_H1940
help
This option enables support for the LEDs on the h1940.
config LEDS_COBALT_QUBE
tristate "LED Support for the Cobalt Qube series front LED"
+ depends on LEDS_CLASS
depends on MIPS_COBALT
help
This option enables support for the front LED on Cobalt Qube series
@@ -122,6 +133,7 @@ config LEDS_COBALT_RAQ
config LEDS_SUNFIRE
tristate "LED support for SunFire servers."
+ depends on LEDS_CLASS
depends on SPARC64
select LEDS_TRIGGERS
help
@@ -130,6 +142,7 @@ config LEDS_SUNFIRE
config LEDS_HP6XX
tristate "LED Support for the HP Jornada 6xx"
+ depends on LEDS_CLASS
depends on SH_HP6XX
help
This option enables LED support for the handheld
@@ -137,6 +150,7 @@ config LEDS_HP6XX
config LEDS_PCA9532
tristate "LED driver for PCA9532 dimmer"
+ depends on LEDS_CLASS
depends on I2C && INPUT && EXPERIMENTAL
help
This option enables support for NXP pca9532
@@ -145,6 +159,7 @@ config LEDS_PCA9532
config LEDS_GPIO
tristate "LED Support for GPIO connected LEDs"
+ depends on LEDS_CLASS
depends on GENERIC_GPIO
help
This option enables support for the LEDs connected to GPIO
@@ -155,6 +170,7 @@ config LEDS_GPIO
config LEDS_GPIO_PLATFORM
bool "Platform device bindings for GPIO LEDs"
+ depends on LEDS_CLASS
depends on LEDS_GPIO
default y
help
@@ -163,6 +179,7 @@ config LEDS_GPIO_PLATFORM
config LEDS_GPIO_OF
bool "OpenFirmware platform device bindings for GPIO LEDs"
+ depends on LEDS_CLASS
depends on LEDS_GPIO && OF_DEVICE
default y
help
@@ -172,6 +189,7 @@ config LEDS_GPIO_OF
config LEDS_LP3944
tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip"
+ depends on LEDS_CLASS
depends on I2C
help
This option enables support for LEDs connected to the National
@@ -201,6 +219,7 @@ config LEDS_LP5523
config LEDS_CLEVO_MAIL
tristate "Mail LED on Clevo notebook"
+ depends on LEDS_CLASS
depends on X86 && SERIO_I8042 && DMI
help
This driver makes the mail LED accessible from userspace
@@ -231,6 +250,7 @@ config LEDS_CLEVO_MAIL
config LEDS_PCA955X
tristate "LED Support for PCA955x I2C chips"
+ depends on LEDS_CLASS
depends on I2C
help
This option enables support for LEDs connected to PCA955x
@@ -239,6 +259,7 @@ config LEDS_PCA955X
config LEDS_WM831X_STATUS
tristate "LED support for status LEDs on WM831x PMICs"
+ depends on LEDS_CLASS
depends on MFD_WM831X
help
This option enables support for the status LEDs of the WM831x
@@ -246,6 +267,7 @@ config LEDS_WM831X_STATUS
config LEDS_WM8350
tristate "LED Support for WM8350 AudioPlus PMIC"
+ depends on LEDS_CLASS
depends on MFD_WM8350
help
This option enables support for LEDs driven by the Wolfson
@@ -253,6 +275,7 @@ config LEDS_WM8350
config LEDS_DA903X
tristate "LED Support for DA9030/DA9034 PMIC"
+ depends on LEDS_CLASS
depends on PMIC_DA903X
help
This option enables support for on-chip LED drivers found
@@ -260,6 +283,7 @@ config LEDS_DA903X
config LEDS_DAC124S085
tristate "LED Support for DAC124S085 SPI DAC"
+ depends on LEDS_CLASS
depends on SPI
help
This option enables support for DAC124S085 SPI DAC from NatSemi,
@@ -267,18 +291,21 @@ config LEDS_DAC124S085
config LEDS_PWM
tristate "PWM driven LED Support"
+ depends on LEDS_CLASS
depends on HAVE_PWM
help
This option enables support for pwm driven LEDs
config LEDS_REGULATOR
tristate "REGULATOR driven LED support"
+ depends on LEDS_CLASS
depends on REGULATOR
help
This option enables support for regulator driven LEDs.
config LEDS_BD2802
tristate "LED driver for BD2802 RGB LED"
+ depends on LEDS_CLASS
depends on I2C
help
This option enables support for BD2802GU RGB LED driver chips
@@ -286,6 +313,7 @@ config LEDS_BD2802
config LEDS_INTEL_SS4200
tristate "LED driver for Intel NAS SS4200 series"
+ depends on LEDS_CLASS
depends on PCI && DMI
help
This option enables support for the Intel SS4200 series of
@@ -295,6 +323,7 @@ config LEDS_INTEL_SS4200
config LEDS_LT3593
tristate "LED driver for LT3593 controllers"
+ depends on LEDS_CLASS
depends on GENERIC_GPIO
help
This option enables support for LEDs driven by a Linear Technology
@@ -303,6 +332,7 @@ config LEDS_LT3593
config LEDS_ADP5520
tristate "LED Support for ADP5520/ADP5501 PMIC"
+ depends on LEDS_CLASS
depends on PMIC_ADP5520
help
This option enables support for on-chip LED drivers found
@@ -313,6 +343,7 @@ config LEDS_ADP5520
config LEDS_DELL_NETBOOKS
tristate "External LED on Dell Business Netbooks"
+ depends on LEDS_CLASS
depends on X86 && ACPI_WMI
help
This adds support for the Latitude 2100 and similar
@@ -320,6 +351,7 @@ config LEDS_DELL_NETBOOKS
config LEDS_MC13783
tristate "LED Support for MC13783 PMIC"
+ depends on LEDS_CLASS
depends on MFD_MC13783
help
This option enable support for on-chip LED drivers found
@@ -327,6 +359,7 @@ config LEDS_MC13783
config LEDS_NS2
tristate "LED support for Network Space v2 GPIO LEDs"
+ depends on LEDS_CLASS
depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || MACH_NETSPACE_MAX_V2 || D2NET_V2
default y
help
@@ -336,6 +369,7 @@ config LEDS_NS2
config LEDS_NETXBIG
tristate "LED support for Big Network series LEDs"
+ depends on LEDS_CLASS
depends on MACH_NET2BIG_V2 || MACH_NET5BIG_V2
default y
help
@@ -344,18 +378,18 @@ config LEDS_NETXBIG
controlled through a GPIO extension bus.
config LEDS_TRIGGERS
- bool "LED Trigger support"
+ tristate "LED Trigger support"
+ depends on LEDS_CLASS
help
This option enables trigger support for the leds class.
These triggers allow kernel events to drive the LEDs and can
be configured via sysfs. If unsure, say Y.
-if LEDS_TRIGGERS
-
comment "LED Triggers"
config LEDS_TRIGGER_TIMER
tristate "LED Timer Trigger"
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled by a programmable timer
via sysfs. Some LED hardware can be programmed to start
@@ -367,12 +401,14 @@ config LEDS_TRIGGER_TIMER
config LEDS_TRIGGER_IDE_DISK
bool "LED IDE Disk Trigger"
depends on IDE_GD_ATA
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled by IDE disk activity.
If unsure, say Y.
config LEDS_TRIGGER_HEARTBEAT
tristate "LED Heartbeat Trigger"
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled by a CPU load average.
The flash frequency is a hyperbolic function of the 1-minute
@@ -381,6 +417,7 @@ config LEDS_TRIGGER_HEARTBEAT
config LEDS_TRIGGER_BACKLIGHT
tristate "LED backlight Trigger"
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be controlled as a backlight device: they
turn off and on when the display is blanked and unblanked.
@@ -389,6 +426,7 @@ config LEDS_TRIGGER_BACKLIGHT
config LEDS_TRIGGER_GPIO
tristate "LED GPIO Trigger"
+ depends on LEDS_TRIGGERS
depends on GPIOLIB
help
This allows LEDs to be controlled by gpio events. It's good
@@ -401,6 +439,7 @@ config LEDS_TRIGGER_GPIO
config LEDS_TRIGGER_DEFAULT_ON
tristate "LED Default ON Trigger"
+ depends on LEDS_TRIGGERS
help
This allows LEDs to be initialised in the ON state.
If unsure, say Y.
@@ -415,8 +454,4 @@ config LEDS_TRIGGER_INPUT
comment "iptables trigger is under Netfilter config (LED target)"
depends on LEDS_TRIGGERS
-endif # LEDS_TRIGGERS
-
-endif # LEDS_CLASS
-
endif # NEW_LEDS
--- linux-older.orig/drivers/macintosh/Kconfig 2010-10-26 12:10:25.000000000 +0200
+++ linux-older/drivers/macintosh/Kconfig 2010-10-26 12:11:20.000000000 +0200
@@ -102,6 +102,7 @@ config ADB_PMU_LED
config ADB_PMU_LED_IDE
bool "Use front LED as IDE LED by default"
depends on ADB_PMU_LED
+ depends on LEDS_CLASS=y
select LEDS_TRIGGERS
select LEDS_TRIGGER_IDE_DISK
help
--- linux-older.orig/net/mac80211/Kconfig 2010-10-26 12:06:11.000000000 +0200
+++ linux-older/net/mac80211/Kconfig 2010-10-26 12:11:20.000000000 +0200
@@ -92,7 +92,7 @@ config MAC80211_MESH
config MAC80211_LEDS
bool "Enable LED triggers"
depends on MAC80211
- select NEW_LEDS
+ depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211
select LEDS_TRIGGERS
---help---
This option enables a few LED triggers for different
--- linux-older.orig/drivers/net/wireless/rt2x00/Kconfig 2010-10-26 12:10:47.000000000 +0200
+++ linux-older/drivers/net/wireless/rt2x00/Kconfig 2010-10-26 12:11:20.000000000 +0200
@@ -221,6 +221,9 @@ config RT2X00_LIB_LEDS
boolean
default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)
+comment "rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00"
+ depends on RT2X00_LIB=y && LEDS_CLASS=m
+
config RT2X00_LIB_DEBUGFS
bool "Ralink debugfs support"
depends on RT2X00_LIB && MAC80211_DEBUGFS
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2010-10-26 10:14 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-14 0:13 mmotm 2010-10-13-17-13 uploaded akpm
2010-10-14 4:17 ` mmotm 2010-10-13-17-13 uploaded (staging/bcm) Randy Dunlap
2010-10-14 19:14 ` Greg KH
2010-10-14 20:38 ` Randy Dunlap
2010-10-14 4:29 ` mmotm 2010-10-13-17-13 uploaded (leds) Randy Dunlap
2010-10-14 11:38 ` Johannes Berg
2010-10-14 16:14 ` Randy Dunlap
2010-10-14 20:13 ` Johannes Berg
2010-10-14 20:32 ` Randy Dunlap
2010-10-26 10:14 ` Johannes Berg
2010-10-14 10:26 ` mmotm 2010-10-13-17-13 uploaded Zimny Lech
2010-10-14 19:16 ` Andrew Morton
2010-10-14 19:23 ` Zimny Lech
2010-10-14 20:06 ` mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken Valdis.Kletnieks
2010-10-15 8:45 ` Hans Verkuil
2010-10-15 9:05 ` Andrew Morton
2010-10-15 10:02 ` Hans Verkuil
2010-10-15 12:05 ` Mauro Carvalho Chehab
2010-10-15 12:23 ` Hans Verkuil
2010-10-18 19:00 ` Mauro Carvalho Chehab
2010-10-18 19:39 ` Hans Verkuil
2010-10-20 15:50 ` ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded] Jiri Slaby
2010-10-20 15:52 ` Peter Zijlstra
2010-10-20 15:54 ` Frederic Weisbecker
2010-10-20 16:03 ` Jiri Slaby
2010-10-20 16:13 ` Peter Zijlstra
2010-10-20 17:29 ` Jiri Slaby
2010-10-21 7:34 ` Jiri Slaby
2010-10-21 7:40 ` Peter Zijlstra
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.