From 49d48e8560b06935fe20eeef523de9e1b7471652 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@sandeen.net>
Date: Thu, 16 Aug 2007 16:25:10 +1000
Subject: [PATCH] --- yaml --- r: 70822 b: refs/heads/master c:
 6385f4d5579ccada7bd1d9fefbdea5515457b10d h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_globals.c | 5 -----
 trunk/fs/xfs/linux-2.6/xfs_globals.h | 1 -
 trunk/fs/xfs/linux-2.6/xfs_super.c   | 4 ----
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 114a0fcf02ad..81d1ac434e66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 425f9ddd534573f58df8e7b633a534fcfc16d44d
+refs/heads/master: 6385f4d5579ccada7bd1d9fefbdea5515457b10d
diff --git a/trunk/fs/xfs/linux-2.6/xfs_globals.c b/trunk/fs/xfs/linux-2.6/xfs_globals.c
index 81565dea9af7..9febf9dc999d 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_globals.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_globals.c
@@ -19,11 +19,6 @@
 #include "xfs_cred.h"
 #include "xfs_sysctl.h"
 
-/*
- * System memory size - used to scale certain data structures in XFS.
- */
-unsigned long xfs_physmem;
-
 /*
  * Tunable XFS parameters.  xfs_params is required even when CONFIG_SYSCTL=n,
  * other XFS code uses these values.  Times are measured in centisecs (i.e.
diff --git a/trunk/fs/xfs/linux-2.6/xfs_globals.h b/trunk/fs/xfs/linux-2.6/xfs_globals.h
index e1a22bfcf865..2770b0085ee8 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_globals.h
+++ b/trunk/fs/xfs/linux-2.6/xfs_globals.h
@@ -19,7 +19,6 @@
 #define __XFS_GLOBALS_H__
 
 extern uint64_t	xfs_panic_mask;		/* set to cause more panics */
-extern unsigned long xfs_physmem;
 extern struct cred *sys_cred;
 
 #endif	/* __XFS_GLOBALS_H__ */
diff --git a/trunk/fs/xfs/linux-2.6/xfs_super.c b/trunk/fs/xfs/linux-2.6/xfs_super.c
index 17ad5e463710..2fbf24a6cf58 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_super.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_super.c
@@ -907,15 +907,11 @@ STATIC int __init
 init_xfs_fs( void )
 {
 	int			error;
-	struct sysinfo		si;
 	static char		message[] __initdata = KERN_INFO \
 		XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled\n";
 
 	printk(message);
 
-	si_meminfo(&si);
-	xfs_physmem = si.totalram;
-
 	ktrace_init(64);
 
 	error = xfs_init_zones();