Subject: + kernel-time-ntpc-convert-simple_strtol-to-kstrtol.patch added to -mm tree To: fabf@xxxxxxxxx,john.stultz@xxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 09 May 2014 12:06:45 -0700 The patch titled Subject: kernel/time/ntp.c: convert simple_strtol to kstrtol has been added to the -mm tree. Its filename is kernel-time-ntpc-convert-simple_strtol-to-kstrtol.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/kernel-time-ntpc-convert-simple_strtol-to-kstrtol.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/kernel-time-ntpc-convert-simple_strtol-to-kstrtol.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Fabian Frederick <fabf@xxxxxxxxx> Subject: kernel/time/ntp.c: convert simple_strtol to kstrtol Replace obsolete function. Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> Cc: John Stultz <john.stultz@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/time/ntp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN kernel/time/ntp.c~kernel-time-ntpc-convert-simple_strtol-to-kstrtol kernel/time/ntp.c --- a/kernel/time/ntp.c~kernel-time-ntpc-convert-simple_strtol-to-kstrtol +++ a/kernel/time/ntp.c @@ -926,7 +926,10 @@ void __hardpps(const struct timespec *ph static int __init ntp_tick_adj_setup(char *str) { - ntp_tick_adj = simple_strtol(str, NULL, 0); + int rc = kstrtol(str, 0, (long *)&ntp_tick_adj); + + if (rc) + return rc; ntp_tick_adj <<= NTP_SCALE_SHIFT; return 1; _ Patches currently in -mm which might be from fabf@xxxxxxxxx are origin.patch fs-ceph-replace-pr_warning-by-pr_warn.patch fs-ceph-debugfsc-replace-seq_printf-by-seq_puts.patch fs-cifs-remove-obsolete-__constant.patch fs-jfs-jfs_logmgrc-remove-null-assignment-on-static.patch fs-jfs-superc-remove-0-assignement-to-static-code-clean-up.patch fs-fscache-convert-printk-to-pr_foo.patch fs-fscache-replace-seq_printf-by-seq_puts.patch kernel-posix-timersc-code-clean-up.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch ntfs-remove-null-value-assignments.patch fs-squashfs-squashfsh-replace-pr_warning-by-pr_warn.patch arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1.patch arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1-fix.patch fs-configs-itemc-kernel-doc-fixes-clean-up.patch ocfs2-remove-null-assignments-on-static.patch fs-ocfs2-superc-use-ocfs2_max_vol_label_len-and-strlcpy.patch fs-9p-v9fsc-add-__init-to-v9fs_sysfs_init.patch fs-9p-kerneldoc-fixes.patch mm-slubc-convert-printk-to-pr_foo.patch mm-slubc-convert-vnsprintf-static-to-va_format.patch mm-memory_hotplugc-use-pfn_down.patch mm-memblockc-use-pfn_down.patch mm-memcontrolc-remove-null-assignment-on-static.patch mm-vmallocc-replace-seq_printf-by-seq_puts.patch mm-mempolicyc-parameter-doc-uniformization.patch mm-zbudc-make-size-unsigned-like-unique-callsite.patch sys_sgetmask-sys_ssetmask-add-config_sgetmask_syscall.patch kernel-cpuc-convert-printk-to-pr_foo.patch kernel-backtracetestc-replace-no-level-printk-by-pr_info.patch kernel-capabilityc-code-clean-up.patch kernel-exec_domainc-code-clean-up.patch kernel-latencytopc-convert-seq_printf-to-seq_puts.patch kernel-stop_machinec-kernel-doc-warning-fix.patch kernel-tracepointc-kernel-doc-fixes.patch kernel-res_counterc-replace-simple_strtoull-by-kstrtoull.patch kernel-res_counterc-replace-simple_strtoull-by-kstrtoull-fix.patch documentation-expand-clarify-debug-documentation.patch lib-libcrc32cc-use-ptr_err_or_zero.patch lib-vsprintfc-fix-comparison-to-bool.patch kernel-compatc-use-sizeof-instead-of-sizeof.patch fs-binfmt_elfc-fix-bool-assignements.patch fs-autofs4-dev-ioctlc-add-__init-to-autofs_dev_ioctl_init.patch fs-befs-linuxvfsc-replace-strncpy-by-strlcpy.patch fs-befs-btreec-replace-strncpy-by-strlcpy-coding-style-fixing.patch fs-befs-linuxvfsc-remove-positive-test-on-sector_t.patch fs-befs-kernel-doc-fixes.patch fs-isofs-logging-clean-up.patch fs-ufs-ballocc-remove-err-parameter-in-ufs_add_fragments.patch fs-reiserfs-bitmapc-coding-style-fixes.patch fs-reiserfs-streec-remove-obsolete-__constant.patch kernel-kexecc-convert-printk-to-pr_foo.patch fs-affs-filec-remove-unnecessary-function-parameters.patch fs-affs-convert-printk-to-pr_foo.patch fs-affs-pr_debug-cleanup.patch kernel-profilec-convert-printk-to-pr_foo.patch kernel-profilec-use-static-const-char-instead-of-static-char.patch fs-pstore-logging-clean-up.patch fs-pstore-logging-clean-up-fix.patch kernel-seccompc-kernel-doc-warning-fix.patch linux-next.patch init-mainc-code-clean-up.patch kernel-rcu-treec-make-rcu-node-arrays-static-const-char-const.patch kernel-kprobesc-convert-printk-to-pr_foo.patch ufs-sb-mutex-merge-mutex_destroy.patch kernel-rebootc-convert-simple_strtoul-to-kstrtoint.patch kernel-time-ntpc-convert-simple_strtol-to-kstrtol.patch kernel-watchdogc-convert-printk-pr_warning-to-pr_foo.patch kernel-utsname_sysctlc-replace-obsolete-__initcall-by-device_initcall.patch kernel-user_namespacec-kernel-doc-checkpatch-fixes.patch kernel-power-hibernatec-convert-simple_strtoul-to-kstrtoul.patch kernel-hung_taskc-convert-simple_strtoul-to-kstrtouint.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