2 files changed, 6 insertions, 5 deletions

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 6bf2306be7d6..f0c9b2e7542d 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -526,8 +526,8 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
         BUG_ON(group != audit_watch_group);
 
         switch (event->data_type) {
-        case (FSNOTIFY_EVENT_FILE):
-                inode = event->file->f_path.dentry->d_inode;
+        case (FSNOTIFY_EVENT_PATH):
+                inode = event->path.dentry->d_inode;
                 break;
         case (FSNOTIFY_EVENT_INODE):
                 inode = event->inode;
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index e960d824263f..49010d822f72 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -710,9 +710,10 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
         /* Accumulate raw time */
         raw_nsecs = timekeeper.raw_interval << shift;
         raw_nsecs += raw_time.tv_nsec;
-        while (raw_nsecs >= NSEC_PER_SEC) {
-                raw_nsecs -= NSEC_PER_SEC;
-                raw_time.tv_sec++;
+        if (raw_nsecs >= NSEC_PER_SEC) {
+                u64 raw_secs = raw_nsecs;
+                raw_nsecs = do_div(raw_secs, NSEC_PER_SEC);
+                raw_time.tv_sec += raw_secs;
         }
         raw_time.tv_nsec = raw_nsecs;