From: Andrew Morton <akpm@linux-foundation.org>

Be more conventional (and readable).

Signed-off-by: David Fries <david@fries.net>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/acct.h |   10 +++++-----
 kernel/time.c        |   20 +++++++++-----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff -puN include/linux/acct.h~system-timer-fix-crash-in-100hz-system-timer-cleanup include/linux/acct.h
--- a/include/linux/acct.h~system-timer-fix-crash-in-100hz-system-timer-cleanup
+++ a/include/linux/acct.h
@@ -173,11 +173,11 @@ typedef struct acct acct_t;
 static inline u32 jiffies_to_AHZ(unsigned long x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / AHZ)) == 0
-	#if HZ < AHZ
-		return x * (AHZ / HZ);
-	#else
-		return x / (HZ / AHZ);
-	#endif
+# if HZ < AHZ
+	return x * (AHZ / HZ);
+# else
+	return x / (HZ / AHZ);
+# endif
 #else
         u64 tmp = (u64)x * TICK_NSEC;
         do_div(tmp, (NSEC_PER_SEC / AHZ));
diff -puN kernel/time.c~system-timer-fix-crash-in-100hz-system-timer-cleanup kernel/time.c
--- a/kernel/time.c~system-timer-fix-crash-in-100hz-system-timer-cleanup
+++ a/kernel/time.c
@@ -565,11 +565,11 @@ EXPORT_SYMBOL(jiffies_to_timeval);
 clock_t jiffies_to_clock_t(long x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
-	#if HZ < USER_HZ
+# if HZ < USER_HZ
 	return x * (USER_HZ / HZ);
-	#else
+# else
 	return x / (HZ / USER_HZ);
-	#endif
+# endif
 #else
 	u64 tmp = (u64)x * TICK_NSEC;
 	do_div(tmp, (NSEC_PER_SEC / USER_HZ));
@@ -602,12 +602,12 @@ EXPORT_SYMBOL(clock_t_to_jiffies);
 u64 jiffies_64_to_clock_t(u64 x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
-	#if HZ < USER_HZ
-		x *= USER_HZ;
-		do_div(x, HZ);
-	#else
-		do_div(x, HZ / USER_HZ);
-	#endif
+# if HZ < USER_HZ
+	x *= USER_HZ;
+	do_div(x, HZ);
+# else
+	do_div(x, HZ / USER_HZ);
+# endif
 #else
 	/*
 	 * There are better ways that don't overflow early,
@@ -619,7 +619,6 @@ u64 jiffies_64_to_clock_t(u64 x)
 #endif
 	return x;
 }
-
 EXPORT_SYMBOL(jiffies_64_to_clock_t);
 
 u64 nsec_to_clock_t(u64 x)
@@ -654,7 +653,6 @@ u64 get_jiffies_64(void)
 	} while (read_seqretry(&xtime_lock, seq));
 	return ret;
 }
-
 EXPORT_SYMBOL(get_jiffies_64);
 #endif
 
_