* + hugetlb-fix-sparse-warnings.patch added to -mm tree
@ 2008-11-26 21:03 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2008-11-26 21:03 UTC (permalink / raw)
To: mm-commits; +Cc: hannes, nacc
The patch titled
hugetlb: fix sparse warnings
has been added to the -mm tree. Its filename is
hugetlb-fix-sparse-warnings.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: hugetlb: fix sparse warnings
From: "Hannes Eder" <hannes@hanneseder.net>
Fix the following sparse warnings:
mm/hugetlb.c:375:3: warning: returning void-valued expression
mm/hugetlb.c:408:3: warning: returning void-valued expression
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Acked-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/hugetlb.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff -puN mm/hugetlb.c~hugetlb-fix-sparse-warnings mm/hugetlb.c
--- a/mm/hugetlb.c~hugetlb-fix-sparse-warnings
+++ a/mm/hugetlb.c
@@ -400,8 +400,10 @@ static void clear_huge_page(struct page
{
int i;
- if (unlikely(sz > MAX_ORDER_NR_PAGES))
- return clear_gigantic_page(page, addr, sz);
+ if (unlikely(sz > MAX_ORDER_NR_PAGES)) {
+ clear_gigantic_page(page, addr, sz);
+ return;
+ }
might_sleep();
for (i = 0; i < sz/PAGE_SIZE; i++) {
@@ -433,8 +435,10 @@ static void copy_huge_page(struct page *
int i;
struct hstate *h = hstate_vma(vma);
- if (unlikely(pages_per_huge_page(h) > MAX_ORDER_NR_PAGES))
- return copy_gigantic_page(dst, src, addr, vma);
+ if (unlikely(pages_per_huge_page(h) > MAX_ORDER_NR_PAGES)) {
+ copy_gigantic_page(dst, src, addr, vma);
+ return;
+ }
might_sleep();
for (i = 0; i < pages_per_huge_page(h); i++) {
_
Patches currently in -mm which might be from hannes@hanneseder.net are
linux-next.patch
hugetlb-fix-sparse-warnings.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-26 21:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-26 21:03 + hugetlb-fix-sparse-warnings.patch added to -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.