diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-01-27 07:54:38 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 03:33:16 -0500 |
commit | 61a50101638254d38e3f4281265b44de0f2cba4e (patch) | |
tree | c57b88b903c3b5d01b2742b63e02e98aa1d91225 /arch/x86/power | |
parent | acd4c048728814505fae8e224cf9074bd1ad291e (diff) |
x86/boot/e820: Rename everything to e820_table
No change in functionality.
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/power')
-rw-r--r-- | arch/x86/power/hibernate_64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index c1a245e64ed1..8fe5be0e90b2 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c | |||
@@ -201,7 +201,7 @@ struct restore_data_record { | |||
201 | * @map: the e820 map to be calculated | 201 | * @map: the e820 map to be calculated |
202 | * @buf: the md5 result to be stored to | 202 | * @buf: the md5 result to be stored to |
203 | */ | 203 | */ |
204 | static int get_e820_md5(struct e820_array *map, void *buf) | 204 | static int get_e820_md5(struct e820_table *map, void *buf) |
205 | { | 205 | { |
206 | struct scatterlist sg; | 206 | struct scatterlist sg; |
207 | struct crypto_ahash *tfm; | 207 | struct crypto_ahash *tfm; |
@@ -214,7 +214,7 @@ static int get_e820_md5(struct e820_array *map, void *buf) | |||
214 | 214 | ||
215 | { | 215 | { |
216 | AHASH_REQUEST_ON_STACK(req, tfm); | 216 | AHASH_REQUEST_ON_STACK(req, tfm); |
217 | size = offsetof(struct e820_array, map) | 217 | size = offsetof(struct e820_table, map) |
218 | + sizeof(struct e820_entry) * map->nr_map; | 218 | + sizeof(struct e820_entry) * map->nr_map; |
219 | ahash_request_set_tfm(req, tfm); | 219 | ahash_request_set_tfm(req, tfm); |
220 | sg_init_one(&sg, (u8 *)map, size); | 220 | sg_init_one(&sg, (u8 *)map, size); |
@@ -232,7 +232,7 @@ static int get_e820_md5(struct e820_array *map, void *buf) | |||
232 | 232 | ||
233 | static void hibernation_e820_save(void *buf) | 233 | static void hibernation_e820_save(void *buf) |
234 | { | 234 | { |
235 | get_e820_md5(e820_array_saved, buf); | 235 | get_e820_md5(e820_table_saved, buf); |
236 | } | 236 | } |
237 | 237 | ||
238 | static bool hibernation_e820_mismatch(void *buf) | 238 | static bool hibernation_e820_mismatch(void *buf) |
@@ -245,7 +245,7 @@ static bool hibernation_e820_mismatch(void *buf) | |||
245 | if (!memcmp(result, buf, MD5_DIGEST_SIZE)) | 245 | if (!memcmp(result, buf, MD5_DIGEST_SIZE)) |
246 | return false; | 246 | return false; |
247 | 247 | ||
248 | ret = get_e820_md5(e820_array_saved, result); | 248 | ret = get_e820_md5(e820_table_saved, result); |
249 | if (ret) | 249 | if (ret) |
250 | return true; | 250 | return true; |
251 | 251 | ||