2 files changed, 5 insertions, 2 deletions

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 9d42393c16c0..0ef1cd329096 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -72,6 +72,9 @@ ToDo/Notes:
           runlist.  This allows us to find runlist elements with the runlist
           lock already held without having to drop and reacquire it around the
           call.  Adapt all callers.
+        - Change time to u64 time.h::ntfs2utc() as it otherwise generates a
+          warning in the do_div() call on sparc32.  Thanks to Meelis Roos for
+          the report and analysis of the warning.
 
 2.1.22 - Many bug and race fixes and error handling improvements.
 
diff --git a/fs/ntfs/time.h b/fs/ntfs/time.h
index a09a51dabe4e..01233989d5d1 100644
--- a/fs/ntfs/time.h
+++ b/fs/ntfs/time.h
@@ -1,7 +1,7 @@
 /*
  * time.h - NTFS time conversion functions.  Part of the Linux-NTFS project.
  *
- * Copyright (c) 2001-2004 Anton Altaparmakov
+ * Copyright (c) 2001-2005 Anton Altaparmakov
  *
  * This program/include file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as published
@@ -87,7 +87,7 @@ static inline struct timespec ntfs2utc(const sle64 time)
         struct timespec ts;
 
         /* Subtract the NTFS time offset. */
-        s64 t = sle64_to_cpu(time) - NTFS_TIME_OFFSET;
+        u64 t = (u64)(sle64_to_cpu(time) - NTFS_TIME_OFFSET);
         /*
          * Convert the time to 1-second intervals and the remainder to
          * 1-nano-second intervals.