Imported Upstream version 0.6.2

[mirror_spl-debian.git] / include / sys / vmsystm.h

diff --git a/include/sys/vmsystm.h b/include/sys/vmsystm.h
index 9c52d282432d32830f0a5df01c342eafe77262a6..909749103bcfc7fabf2a6003ad718b2ca594dba5 100644 (file)
--- a/include/sys/vmsystm.h
+++ b/include/sys/vmsystm.h
@@ -41,7 +41,7 @@
  */
 #define membar_producer()              smp_wmb()
 
-#define physmem                                num_physpages
+#define physmem                                totalram_pages
 #define freemem                                nr_free_pages()
 #define availrmem                      spl_kmem_availrmem()
 
@@ -74,10 +74,12 @@ extern size_t vmem_size(vmem_t *vmp, int typemask);
 #ifndef HAVE_GET_VMALLOC_INFO
 #ifdef CONFIG_MMU
 
+#ifndef HAVE_VMALLOC_INFO
 struct vmalloc_info {
        unsigned long used;
        unsigned long largest_chunk;
 };
+#endif
 
 typedef void (*get_vmalloc_info_t)(struct vmalloc_info *);
 extern get_vmalloc_info_t get_vmalloc_info_fn;