5 files changed, 17 insertions, 9 deletions

diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index acad32eb4290..53165c97336b 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -13,6 +13,7 @@
  */
 
 #include "boot.h"
+#include <linux/kernel.h>
 
 #define SMAP    0x534d4150      /* ASCII "SMAP" */
 
@@ -53,7 +54,7 @@ static int detect_memory_e820(void)
 
                 count++;
                 desc++;
-        } while (next && count < E820MAX);
+        } while (next && count < ARRAY_SIZE(boot_params.e820_map));
 
         return boot_params.e820_entries = count;
 }
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 2cb686f60d0d..2396b9da8027 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -95,7 +95,7 @@ void __init add_memory_region(u64 start, u64 size, int type)
 {
         int x = e820.nr_map;
 
-        if (x == E820MAX) {
+        if (x == ARRAY_SIZE(e820.map)) {
                 printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
                 return;
         }
@@ -142,7 +142,8 @@ void __init e820_print_map(char *who)
  * replaces the original e820 map with a new one, removing overlaps.
  *
  */
-int __init sanitize_e820_map(struct e820entry *biosmap, char *pnr_map)
+int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,
+                                char *pnr_map)
 {
         struct change_member {
                 struct e820entry *pbios; /* pointer to original bios entry */
@@ -314,7 +315,7 @@ int __init sanitize_e820_map(struct e820entry *biosmap, char *pnr_map)
                                          * no more space left for new
                                          * bios entries ?
                                          */
-                                        if (++new_bios_entry >= E820MAX)
+                                        if (++new_bios_entry >= max_nr_map)
                                                 break;
                         }
                         if (current_type != 0)  {
@@ -403,7 +404,7 @@ void __init update_e820(void)
         u8 nr_map;
 
         nr_map = e820.nr_map;
-        if (sanitize_e820_map(e820.map, &nr_map))
+        if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &nr_map))
                 return;
         e820.nr_map = nr_map;
         printk(KERN_INFO "modified physical RAM map:\n");
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index c10b4aece5e4..58dc6eee4d4f 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -413,7 +413,9 @@ char *__init machine_specific_memory_setup(void)
          * Otherwise fake a memory map; one section from 0k->640k,
          * the next section from 1mb->appropriate_mem_k
          */
-        sanitize_e820_map(boot_params.e820_map, &boot_params.e820_entries);
+        sanitize_e820_map(boot_params.e820_map,
+                        ARRAY_SIZE(boot_params.e820_map),
+                        &boot_params.e820_entries);
         if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries) < 0)
                 early_panic("Cannot find a valid memory map");
         printk(KERN_INFO "BIOS-provided physical RAM map:\n");
@@ -484,7 +486,7 @@ void __init finish_e820_parsing(void)
         if (userdef) {
                 char nr = e820.nr_map;
 
-                if (sanitize_e820_map(e820.map, &nr) < 0)
+                if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &nr) < 0)
                         early_panic("Invalid user supplied memory map");
                 e820.nr_map = nr;
 
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 0c28a071824c..38a856c4fc07 100644
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -163,7 +163,9 @@ char * __init machine_specific_memory_setup(void)
          * Otherwise fake a memory map; one section from 0k->640k,
          * the next section from 1mb->appropriate_mem_k
          */
-        sanitize_e820_map(boot_params.e820_map, &boot_params.e820_entries);
+        sanitize_e820_map(boot_params.e820_map,
+                        ARRAY_SIZE(boot_params.e820_map),
+                        &boot_params.e820_entries);
         if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries)
             < 0) {
                 unsigned long mem_size;
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
index 5ae5466b9eb9..662b5c0a77d6 100644
--- a/arch/x86/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
@@ -111,7 +111,9 @@ char *__init machine_specific_memory_setup(void)
          * Otherwise fake a memory map; one section from 0k->640k,
          * the next section from 1mb->appropriate_mem_k
          */
-        sanitize_e820_map(boot_params.e820_map, &boot_params.e820_entries);
+        sanitize_e820_map(boot_params.e820_map,
+                        ARRAY_SIZE(boot_params.e820_map),
+                        &boot_params.e820_entries);
         if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries)
             < 0) {
                 unsigned long mem_size;