diff options
| author | Andrew Morton | 2013-07-09 01:01:08 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-07-09 19:33:26 +0200 |
| commit | c103a4dc4a32f53f095b66cd798d648c652f05b4 (patch) | |
| tree | 4cc3cbd0007255ab708747b6a5b9c3669e1388a8 | |
| parent | ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug regis... (diff) | |
| download | kernel-qcow2-linux-c103a4dc4a32f53f095b66cd798d648c652f05b4.tar.gz kernel-qcow2-linux-c103a4dc4a32f53f095b66cd798d648c652f05b4.tar.xz kernel-qcow2-linux-c103a4dc4a32f53f095b66cd798d648c652f05b4.zip | |
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.c | 4 | ||||
| -rw-r--r-- | mm/mmap.c | 4 |
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) sprintf (name, "SYSV%08x", key); if (shmflg & SHM_HUGETLB) { - struct hstate *hs = hstate_sizelog((shmflg >> SHM_HUGE_SHIFT) - & SHM_HUGE_MASK); + struct hstate *hs; size_t hugesize; + hs = hstate_sizelog((shmflg >> SHM_HUGE_SHIFT) & SHM_HUGE_MASK); if (!hs) { error = -EINVAL; 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, goto out_fput; } else if (flags & MAP_HUGETLB) { struct user_struct *user = NULL; - struct hstate *hs = hstate_sizelog((flags >> MAP_HUGE_SHIFT) & - SHM_HUGE_MASK); + struct hstate *hs; + hs = hstate_sizelog((flags >> MAP_HUGE_SHIFT) & SHM_HUGE_MASK); if (!hs) return -EINVAL; |