diff options
-rw-r--r-- | fs/xfs/linux-2.6/xfs_globals.c | 5 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_globals.h | 1 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/fs/xfs/linux-2.6/xfs_globals.c b/fs/xfs/linux-2.6/xfs_globals.c index 81565dea9af7..9febf9dc999d 100644 --- a/fs/xfs/linux-2.6/xfs_globals.c +++ b/fs/xfs/linux-2.6/xfs_globals.c | |||
@@ -20,11 +20,6 @@ | |||
20 | #include "xfs_sysctl.h" | 20 | #include "xfs_sysctl.h" |
21 | 21 | ||
22 | /* | 22 | /* |
23 | * System memory size - used to scale certain data structures in XFS. | ||
24 | */ | ||
25 | unsigned long xfs_physmem; | ||
26 | |||
27 | /* | ||
28 | * Tunable XFS parameters. xfs_params is required even when CONFIG_SYSCTL=n, | 23 | * Tunable XFS parameters. xfs_params is required even when CONFIG_SYSCTL=n, |
29 | * other XFS code uses these values. Times are measured in centisecs (i.e. | 24 | * other XFS code uses these values. Times are measured in centisecs (i.e. |
30 | * 100ths of a second). | 25 | * 100ths of a second). |
diff --git a/fs/xfs/linux-2.6/xfs_globals.h b/fs/xfs/linux-2.6/xfs_globals.h index e1a22bfcf865..2770b0085ee8 100644 --- a/fs/xfs/linux-2.6/xfs_globals.h +++ b/fs/xfs/linux-2.6/xfs_globals.h | |||
@@ -19,7 +19,6 @@ | |||
19 | #define __XFS_GLOBALS_H__ | 19 | #define __XFS_GLOBALS_H__ |
20 | 20 | ||
21 | extern uint64_t xfs_panic_mask; /* set to cause more panics */ | 21 | extern uint64_t xfs_panic_mask; /* set to cause more panics */ |
22 | extern unsigned long xfs_physmem; | ||
23 | extern struct cred *sys_cred; | 22 | extern struct cred *sys_cred; |
24 | 23 | ||
25 | #endif /* __XFS_GLOBALS_H__ */ | 24 | #endif /* __XFS_GLOBALS_H__ */ |
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 17ad5e463710..2fbf24a6cf58 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -907,15 +907,11 @@ STATIC int __init | |||
907 | init_xfs_fs( void ) | 907 | init_xfs_fs( void ) |
908 | { | 908 | { |
909 | int error; | 909 | int error; |
910 | struct sysinfo si; | ||
911 | static char message[] __initdata = KERN_INFO \ | 910 | static char message[] __initdata = KERN_INFO \ |
912 | XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled\n"; | 911 | XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled\n"; |
913 | 912 | ||
914 | printk(message); | 913 | printk(message); |
915 | 914 | ||
916 | si_meminfo(&si); | ||
917 | xfs_physmem = si.totalram; | ||
918 | |||
919 | ktrace_init(64); | 915 | ktrace_init(64); |
920 | 916 | ||
921 | error = xfs_init_zones(); | 917 | error = xfs_init_zones(); |