git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: S3C64XX: Change to using s3c_gpio_cfgpin_range()
[pandora-kernel.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index
1894dea
..
7c703ff
100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-2047,7
+2047,7
@@
SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
p->flags |= SWP_SOLIDSTATE;
p->cluster_next = 1 + (random32() % p->highest_bit);
}
- if (discard_swap(p) == 0)
+ if (discard_swap(p) == 0
&& (swap_flags & SWAP_FLAG_DISCARD)
)
p->flags |= SWP_DISCARDABLE;
}