Merge branch 'master' into gfs2

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index fe0877b3509c..69971b78beaf 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -424,9 +424,8 @@ void ldt_get_host_info(void)
                         size++;
         }
 
-        if(size < sizeof(dummy_list)/sizeof(dummy_list[0])) {
+        if(size < ARRAY_SIZE(dummy_list))
                 host_ldt_entries = dummy_list;
-        }
         else {
                 size = (size + 1) * sizeof(dummy_list[0]);
                 host_ldt_entries = (short *)kmalloc(size, GFP_KERNEL);