The patch titled
fix-kerneldoc-comments-in-kernel-timerc fix
has been added to the -mm tree. Its filename is
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix-kerneldoc-comments-in-kernel-timerc fix
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Fix function description + definition so that a #macro does not come
between them and interfere with the kernel-doc.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Cc: Rolf Eike Beer <eike-kernel@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
diff -puN kernel/timer.c~fix-kerneldoc-comments-in-kernel-timerc-fix kernel/timer.c
--- a/kernel/timer.c~fix-kerneldoc-comments-in-kernel-timerc-fix
+++ a/kernel/timer.c
@@ -406,6 +406,8 @@ static int cascade(tvec_base_t *base, tv
return index;
}
+#define INDEX(N) ((base->timer_jiffies >> (TVR_BITS + (N) * TVN_BITS)) & TVN_MASK)
+
/**
* __run_timers - run all expired timers (if any) on this CPU.
* @base: the timer vector to be processed.
@@ -413,8 +415,6 @@ static int cascade(tvec_base_t *base, tv
* This function cascades all vectors and executes all expired timer
* vectors.
*/
-#define INDEX(N) ((base->timer_jiffies >> (TVR_BITS + (N) * TVN_BITS)) & TVN_MASK)
-
static inline void __run_timers(tvec_base_t *base)
{
struct timer_list *timer;
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
acpi-handle-firmware_register-init-errors.patch
acpi-scan-handle-kset-kobject-errors.patch
acpi-fix-printk-format-warnings.patch
sysfs_remove_bin_file-no-return-value-dump_stack-on.patch
kobject-must_check-fixes.patch
drivers-base-check-errors.patch
sysfs-add-proper-sysfs_init-prototype.patch
bttv-must_check-fixes.patch
git-lxdialog.patch
pcmcia-ds-must_check-fixes.patch
pcie-check-and-return-bus_register-errors.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
add-kerneldocs-for-some-functions-in-mm-memoryc.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.patch
kernel-params-must_check-fixes.patch
blockdevc-check-errors.patch
block-handle-subsystem_register-init-errors.patch
fs-namespace-handle-init-registration-errors.patch
kernel-doc-for-relay-interface.patch
kernel-doc-fixes-for-debugfs.patch
kernel-doc-move-filesystems-together.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
ecryptfs-fix-printk-format-warnings.patch
ide-core-must_check-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
