The patch titled markers-dont-risk-null-deref-in-marker-checkpatch-fixes has been removed from the -mm tree. Its filename was markers-dont-risk-null-deref-in-marker-checkpatch-fixes.patch This patch was dropped because it was folded into markers-dont-risk-null-deref-in-marker.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: markers-dont-risk-null-deref-in-marker-checkpatch-fixes From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> WARNING: braces {} are not necessary for single statement blocks #34: FILE: kernel/marker.c:715: + if (!entry) { + goto end; + } total: 0 errors, 1 warnings, 29 lines checked ./patches/markers-dont-risk-null-deref-in-marker.patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Jesper Juhl <jesper.juhl@xxxxxxxxx> Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/marker.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN kernel/marker.c~markers-dont-risk-null-deref-in-marker-checkpatch-fixes kernel/marker.c --- a/kernel/marker.c~markers-dont-risk-null-deref-in-marker-checkpatch-fixes +++ a/kernel/marker.c @@ -702,9 +702,8 @@ int marker_probe_unregister(const char * mutex_lock(&markers_mutex); entry = get_marker(name); - if (!entry) { + if (!entry) goto end; - } if (entry->rcu_pending) rcu_barrier(); old = marker_entry_remove_probe(entry, probe, probe_private); @@ -712,9 +711,8 @@ int marker_probe_unregister(const char * marker_update_probes(); /* may update entry */ mutex_lock(&markers_mutex); entry = get_marker(name); - if (!entry) { + if (!entry) goto end; - } entry->oldptr = old; entry->rcu_pending = 1; /* write rcu_pending before calling the RCU callback */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch rtc-add-support-for-the-s-35390a-rtc-chip.patch zlc_setup-handle-jiffies-wraparound.patch documentation-atomic_add_unless-doesnt-imply-mb-on-failure-fix.patch tridentfb-resource-management-fixes-in-probe-function.patch add-noinline_for_stack.patch ndelay-switch-to-c-function-to-avoid-64-bit-division.patch sm501-add-support-for-the-sm502-programmable-pll.patch markers-dont-risk-null-deref-in-marker.patch markers-dont-risk-null-deref-in-marker-checkpatch-fixes.patch iommu-parisc-pass-struct-device-to-iommu_alloc_range-checkpatch-fixes.patch iommu-parisc-make-the-iommus-respect-the-segment-boundary-limits-checkpatch-fixes.patch git-x86.patch arch-x86-kernel-ptracec-fix-defined-but-unused-warnings.patch git-acpi-fixup.patch acpi-enable-c3-power-state-on-dell-inspiron-8200.patch git-alsa.patch git-alsa-fix-git-conflicts.patch git-alsa-build-fix.patch revert-gregkh-driver-video-add-the-go7007-driver.patch driver-core-debug-for-bad-dev_attr_show-return-value.patch git-drm.patch git-dvb.patch git-hwmon.patch git-hrt.patch drivers-input-touchscreen-ads7846c-fix-uninitialized-var-warning.patch maple-add-driver-for-sega-dreamcast-controller-update-checkpatch-fixes.patch git-kvm.patch pata-i-do-not-think-it-means-what-you-think-it-means-checkpatch-fixes.patch git-md-accel.patch git-ubi.patch update-smc91x-driver-with-arm-versatile-board-info.patch git-nfsd.patch fs-ocfs2-dlm-dlmdomainc-fix-printk-warning.patch sh-export-copy-page-to-modules.patch scsi-aic94xx-cleanups.patch git-block-git-rejects.patch git-unionfs.patch drivers-usb-storage-sddr55c-fix-uninitialized-var-warnings.patch git-v9fs.patch git-semaphore-git-rejects.patch remove-sparse-warning-for-mmzoneh-checkpatch-fixes.patch fix-invalidate_inode_pages2_range-to-not-clear-ret-checkpatch-fixes.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch capabilities-implement-per-process-securebits-warning-fix.patch lsm-introduce-inode_getsecid-and-ipc_getsecid-hooks-checkpatch-fixes.patch lsm-audit-introduce-generic-audit-lsm-hooks-checkpatch-fixes.patch selinux-use-new-audit-hooks-remove-redundant-exports-checkpatch-fixes.patch audit-final-renamings-and-cleanup-checkpatch-fixes.patch make-dev-kmem-a-config-option-fix.patch misc-phantom-add-compat-ioctl-checkpatch-fixes.patch kernel-add-clamp-and-clamp_t-macros-checkpatch-fixes.patch kernel-add-clamp-and-clamp_t-macros-fix.patch r-o-bind-mounts-elevate-write-count-for-callers-of-vfs_mkdir-fix.patch r-o-bind-mounts-elevate-write-count-for-xattr_permission-callers-fix.patch r-o-bind-mounts-get-write-access-for-vfs_rename-callers-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix-2.patch r-o-bind-mounts-get-callers-of-vfs_mknod-create-fix.patch fs-inodec-use-hlist_for_each_entry-checkpatch-fixes.patch add-rcu_assign_index-if-ever-needed-fix.patch oprofile-change-cpu_buffer-from-array-to-per_cpu-variable-checkpatch-fixes.patch vt-notifier-extension-for-accessibility-checkpatch-fixes.patch kprobes-prevent-probing-of-preempt_schedule-fix.patch kprobes-prevent-probing-of-preempt_schedule-checkpatch-fixes.patch rtc-isl1208-new-style-conversion-and-minor-bug-fixes-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes-fix.patch rtc-x1205-new-style-conversion-checkpatch-fixes.patch fb-add-support-for-foreign-endianness-force-it-on.patch fbcon-replace-mono_col-macro-with-static-inline-fix.patch fat_valid_media-remove-pointless-test.patch cgroup-api-files-update-cpusets-to-use-cgroup-structured-file-api-fix.patch workqueues-shrink-cpu_populated_map-when-cpu-dies-fix.patch ext4-is-broken.patch ipc-use-ipc_buildid-directly-from-ipc_addid-cleanup.patch ipmi-run-to-completion-fixes-checkpatch-fixes.patch ipmi-style-fixes-in-the-system-interface-code-checkpatch-fixes.patch elf-fix-shadowed-variables-in-fs-binfmt_elfc.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix-2.patch epcac-static-functions-and-integer-as-null-pointer-fixes-checkpatch-fixes.patch keys-add-keyctl-function-to-get-a-security-label-fix.patch procfs-task-exe-symlink-fix.patch edd-add-default-mode-config_edd_off=n-override-with-edd=onoff-fix.patch mm-bdi-export-bdi-attributes-in-sysfs-ia64-fix.patch basic-braille-screen-reader-support-ppc-fix.patch reiser4.patch jens-broke-reiser4patch-added-to-mm-tree.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch profile-likely-unlikely-macros.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch w1-build-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html