linux-next: build failure after merge of the tip tree

[Stephen Rothwell]

Hi all,

After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

arch/x86/power/hibernate_64.c: In function 'hibernation_e820_save':
arch/x86/power/hibernate_64.c:236:15: error: passing argument 1 of 
'get_e820_md5' from incompatible pointer type 
[-Werror=incompatible-pointer-types]
  get_e820_md5(&e820_saved, buf);
               ^
arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *' but 
argument is of type 'struct e820map **'
 static int get_e820_md5(struct e820map *map, void *buf)
            ^
arch/x86/power/hibernate_64.c: In function 'hibernation_e820_mismatch':
arch/x86/power/hibernate_64.c:249:21: error: passing argument 1 of 
'get_e820_md5' from incompatible pointer type 
[-Werror=incompatible-pointer-types]
  ret = get_e820_md5(&e820_saved, result);
                     ^
arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *' but 
argument is of type 'struct e820map **'
 static int get_e820_md5(struct e820map *map, void *buf)
            ^

Caused by commit

  475339684ef1 ("x86/e820: Prepare e280 code for switch to dynamic storage")

interacting with commit

  6f95ad2b6162 ("PM / hibernate: Verify e820 memory map by MD5 digest")

from the pm tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Thu, 29 Sep 2016 13:13:45 +1000
Subject: [PATCH] pm/hibernate: merge fix for type of e820_saved changing

Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
 arch/x86/power/hibernate_64.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index 72f2c9531b03..904048f7a9c9 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -233,7 +233,7 @@ static int get_e820_md5(struct e820map *map, void *buf)
 
 static void hibernation_e820_save(void *buf)
 {
-       get_e820_md5(&e820_saved, buf);
+       get_e820_md5(e820_saved, buf);
 }
 
 static bool hibernation_e820_mismatch(void *buf)
@@ -246,7 +246,7 @@ static bool hibernation_e820_mismatch(void *buf)
        if (!memcmp(result, buf, MD5_DIGEST_SIZE))
                return false;
 
-       ret = get_e820_md5(&e820_saved, result);
+       ret = get_e820_md5(e820_saved, result);
        if (ret)
                return true;
 
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell