The patch titled
time-x86_64-split-x86_64-kernel-timec-up-fix
has been removed from the -mm tree. Its filename was
time-x86_64-split-x86_64-kernel-timec-up-fix.patch
This patch was dropped because it was folded into time-x86_64-split-x86_64-kernel-timec-up.patch
------------------------------------------------------
Subject: time-x86_64-split-x86_64-kernel-timec-up-fix
From: Andrew Morton <akpm@xxxxxxxx>
kernel/tsacct.c:26:1: warning: "USEC_PER_TICK" redefined
In file included from include/linux/timex.h:187,
from include/linux/sched.h:50,
from kernel/tsacct.c:20:
include/asm/timex.h:47:1: warning: this is the location of the previous definition
Cc: John Stultz <johnstul@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/tsacct.c | 2 --
1 file changed, 2 deletions(-)
Index: linux-2.6.20-rc6-mm/kernel/tsacct.c
===================================================================
--- linux-2.6.20-rc6-mm.orig/kernel/tsacct.c
+++ linux-2.6.20-rc6-mm/kernel/tsacct.c
@@ -22,8 +22,6 @@
#include <linux/acct.h>
#include <linux/jiffies.h>
-
-#define USEC_PER_TICK (USEC_PER_SEC/HZ)
/*
* fill in basic accounting fields
*/
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
vmi-versus-hrtimers.patch
add-a-functions-to-handle-interrupt-affinity-setting.patch
i386-use-gtod-persistent-clock-support.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-cleanup-locking.patch
hrtimers-add-state-tracking.patch
clockevents-i383-drivers.patch
generic-vsyscall-gtod-support-for-generic_time.patch
time-x86_64-split-x86_64-kernel-timec-up-fix.patch
reapply-x86_64-mm-ignore-long-smi-interrupts-in-clock-calibration.patch
time-x86_64-convert-x86_64-to-use-generic_time-fix.patch
time-x86_64-convert-x86_64-to-use-generic_time-tidy.patch
time-x86_64-re-enable-vsyscall-support-for-x86_64-tidy.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
