Messages in this thread | | | Date | Tue, 28 Oct 2014 21:52:02 +0100 (CET) | From | Thomas Gleixner <> | Subject | Re: [PATCH v2] timekeeping: Added a function to return tv_sec portion of ktime_get_real_ts64() |
| |
On Tue, 28 Oct 2014, Arnd Bergmann wrote:
> On Tuesday 28 October 2014 21:31:32 Thomas Gleixner wrote: > > On Tue, 28 Oct 2014, Arnd Bergmann wrote: > > > On Tuesday 28 October 2014 18:13:09 Thomas Gleixner wrote: > > > I'd like to apply this patch to my y2038 branch and apply the > > > other patches that need it on top, unless you want to still submit > > > it for 3.18. > > > > I think I should take these patches for 3.18. We do not create users > > yet, but it makes it easier for submaintaners to apply stuff which you > > convert. And it lets me have the whole core lot together with other > > changes in that area. I create a seperate branch which you can pull > > from. > > Ok, sounds good. > > > > Regarding the names, should we then have > > > > > > time64_t ktime_get_real_seconds(void); > > > time64_t ktime_get_seconds(void); > > > > I like that one. Moving all the time interfaces to a ktime_ prefix and > > let the default implementation as CLOCK_MONOTONIC and the others with > > the added '_real', '_boot' ... describe their CLOCK_WHATEVER property > > makes it pretty clear. > > Good. So you can apply this patch as-is and Heena will get you the > other one.
Not so much.
Applying patch timekeeping-added-a-function-to-return-tv_sec-portion-of-ktime_get_real_ts64.patch patching file include/linux/timekeeping.h Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- rejects in file include/linux/timekeeping.h patching file kernel/time/timekeeping.c Hunk #1 FAILED at 673. 1 out of 1 hunk FAILED -- rejects in file kernel/time/timekeeping.c
That one depends on the other one. So I wait for a combo of both from Heena.
Thanks,
tglx
| |