Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c

driver due to the Origin A64 hacks.

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c
index 046153362..289f9417c 100644
--- a/fs/coda/sysctl.c
+++ b/fs/coda/sysctl.c
@@ -109,7 +109,8 @@ char *coda_upcall_names[] = {
 	"open_by_path",   /* 31 */
 	"resolve     ",   /* 32 */
 	"reintegrate ",   /* 33 */
-	"statfs      "    /* 34 */
+	"statfs      ",   /* 34 */
+	"make_cinode "    /* 35 */
 };
 
 
@@ -214,8 +215,8 @@ unsigned long get_time_std_deviation( const struct coda_upcall_stats_entry * pen
 		return 0;
   
 	time_avg = get_time_average( pentry );
-	return 
-	        sqr_root( (pentry->time_squared_sum / pentry->count) - 
+
+	return sqr_root( (pentry->time_squared_sum / pentry->count) - 
 			    time_avg * time_avg );
 }