aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-07-08 19:01:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 13:33:26 -0400
commitc103a4dc4a32f53f095b66cd798d648c652f05b4 (patch)
tree4cc3cbd0007255ab708747b6a5b9c3669e1388a8
parentf7da04c9e363e479258135ac825734d78aecd2b0 (diff)
ipc/shmc.c: eliminate ugly 80-col tricks
Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--ipc/shm.c4
-rw-r--r--mm/mmap.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 7e199fa1960f..85dc001634b1 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -491,10 +491,10 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
491 491
492 sprintf (name, "SYSV%08x", key); 492 sprintf (name, "SYSV%08x", key);
493 if (shmflg & SHM_HUGETLB) { 493 if (shmflg & SHM_HUGETLB) {
494 struct hstate *hs = hstate_sizelog((shmflg >> SHM_HUGE_SHIFT) 494 struct hstate *hs;
495 & SHM_HUGE_MASK);
496 size_t hugesize; 495 size_t hugesize;
497 496
497 hs = hstate_sizelog((shmflg >> SHM_HUGE_SHIFT) & SHM_HUGE_MASK);
498 if (!hs) { 498 if (!hs) {
499 error = -EINVAL; 499 error = -EINVAL;
500 goto no_file; 500 goto no_file;
diff --git a/mm/mmap.c b/mm/mmap.c
index 0718c175db8f..f81311173b4d 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1368,9 +1368,9 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
1368 goto out_fput; 1368 goto out_fput;
1369 } else if (flags & MAP_HUGETLB) { 1369 } else if (flags & MAP_HUGETLB) {
1370 struct user_struct *user = NULL; 1370 struct user_struct *user = NULL;
1371 struct hstate *hs = hstate_sizelog((flags >> MAP_HUGE_SHIFT) & 1371 struct hstate *hs;
1372 SHM_HUGE_MASK);
1373 1372
1373 hs = hstate_sizelog((flags >> MAP_HUGE_SHIFT) & SHM_HUGE_MASK);
1374 if (!hs) 1374 if (!hs)
1375 return -EINVAL; 1375 return -EINVAL;
1376 1376