[folded] pps-capture-monotonic_raw-timestamps-as-well-v7.patch removed from -mm tree

[folded] pps-capture-monotonic_raw-timestamps-as-well-v7.patch removed from -mm tree

[akpm]

The patch titled
     pps-capture-monotonic_raw-timestamps-as-well-v7
has been removed from the -mm tree.  Its filename was
     pps-capture-monotonic_raw-timestamps-as-well-v7.patch

This patch was dropped because it was folded into pps-capture-monotonic_raw-timestamps-as-well.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: pps-capture-monotonic_raw-timestamps-as-well-v7
From: Alexander Gordeev <lasaine@lvk.cs.msu.su>

Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/pps_kernel.h |   13 +++++++++++++
 kernel/time/timekeeping.c  |    4 ++++
 2 files changed, 17 insertions(+)

diff -puN include/linux/pps_kernel.h~pps-capture-monotonic_raw-timestamps-as-well-v7 include/linux/pps_kernel.h
--- a/include/linux/pps_kernel.h~pps-capture-monotonic_raw-timestamps-as-well-v7
+++ a/include/linux/pps_kernel.h
@@ -47,7 +47,9 @@ struct pps_source_info {
 };
 
 struct pps_event_time {
+#ifdef CONFIG_NTP_PPS
 	struct timespec ts_raw;
+#endif /* CONFIG_NTP_PPS */
 	struct timespec ts_real;
 };
 
@@ -98,10 +100,21 @@ static inline void timespec_to_pps_ktime
 	kt->nsec = ts.tv_nsec;
 }
 
+#ifdef CONFIG_NTP_PPS
+
 static inline void pps_get_ts(struct pps_event_time *ts)
 {
 	getnstime_raw_and_real(&ts->ts_raw, &ts->ts_real);
 }
 
+#else /* CONFIG_NTP_PPS */
+
+static inline void pps_get_ts(struct pps_event_time *ts)
+{
+	getnstimeofday(&ts->ts_real);
+}
+
+#endif /* CONFIG_NTP_PPS */
+
 #endif /* LINUX_PPS_KERNEL_H */
 
diff -puN kernel/time/timekeeping.c~pps-capture-monotonic_raw-timestamps-as-well-v7 kernel/time/timekeeping.c
--- a/kernel/time/timekeeping.c~pps-capture-monotonic_raw-timestamps-as-well-v7
+++ a/kernel/time/timekeeping.c
@@ -288,6 +288,8 @@ void ktime_get_ts(struct timespec *ts)
 }
 EXPORT_SYMBOL_GPL(ktime_get_ts);
 
+#ifdef CONFIG_NTP_PPS
+
 /**
  * getnstime_raw_and_real - get day and raw monotonic time in timespec format
  * @ts_raw:	pointer to the timespec to be set to raw monotonic time
@@ -327,6 +329,8 @@ void getnstime_raw_and_real(struct times
 }
 EXPORT_SYMBOL(getnstime_raw_and_real);
 
+#endif /* CONFIG_NTP_PPS */
+
 /**
  * do_gettimeofday - Returns the time of day in a timeval
  * @tv:		pointer to the timeval to be set
_

Patches currently in -mm which might be from lasaine@lvk.cs.msu.su are

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-make-idr-lock-a-mutex-and-protect-idr_pre_get.patch
pps-use-bug_on-for-kernel-api-safety-checks.patch
pps-simplify-conditions-a-bit.patch
pps-timestamp-is-always-passed-to-dcd_change.patch
ntp-add-hardpps-implementation.patch
pps-capture-monotonic_raw-timestamps-as-well.patch
pps-add-kernel-consumer-support.patch
pps-add-kernel-consumer-support-v7.patch
pps-add-parallel-port-pps-client.patch
pps-add-parallel-port-pps-client-v7.patch
pps-add-parallel-port-pps-signal-generator.patch
pps-add-parallel-port-pps-signal-generator-fix.patch
pps-add-parallel-port-pps-signal-generator-v7.patch