Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[pandora-kernel.git] / arch / um / sys-i386 / ldt.c

diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index fe0877b..49057d8 100644 (file)
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -3,8 +3,6 @@
  * Licensed under the GPL
  */
 
-#include "linux/stddef.h"
-#include "linux/config.h"
 #include "linux/sched.h"
 #include "linux/slab.h"
 #include "linux/types.h"
@@ -424,9 +422,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);