projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
power
/
swap.c
diff --git
a/kernel/power/swap.c
b/kernel/power/swap.c
index 7c33ed200410843a97dc39f59da4080f270832e2..8c9a4819f798c8b41d74972dae361dc8d2c6eeb1 100644
(file)
--- a/
kernel/power/swap.c
+++ b/
kernel/power/swap.c
@@
-101,7
+101,7
@@
struct swsusp_header {
unsigned int flags; /* Flags to pass to the "boot" kernel */
char orig_sig[10];
char sig[10];
-} __
attribute__((packed))
;
+} __
packed
;
static struct swsusp_header *swsusp_header;