Messages in this thread | | | Date | Fri, 17 May 2013 16:31:52 -0400 | From | KOSAKI Motohiro <> | Subject | Re: [PATCH] ipc/shm.c: don't use auto variable hs in newseg() |
| |
> From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> > Date: Wed, 8 May 2013 11:48:01 -0400 > Subject: [PATCH] ipc/shm.c: don't use auto variable hs in newseg() > > This patch fixes "warning: unused variable 'hs'" when !CONFIG_HUGETLB_PAGE > introduced by commit af73e4d9506d "hugetlbfs: fix mmap failure in unaligned > size request". > > Reported-by: Borislav Petkov <bp@alien8.de> > Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> > --- > ipc/shm.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/ipc/shm.c b/ipc/shm.c > index e316cb9..9ff741a 100644 > --- a/ipc/shm.c > +++ b/ipc/shm.c > @@ -491,9 +491,8 @@ 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); > - size_t hugesize = ALIGN(size, huge_page_size(hs)); > + size_t hugesize = ALIGN(size, huge_page_size(hstate_sizelog( > + (shmflg >> SHM_HUGE_SHIFT) & SHM_HUGE_MASK)));
NAK. This is uglier than before. You should change !CONFIG_HUGETLB_PAGE specific code instead.
| |