From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org, lkp@intel.com, elver@google.com,
andreyknvl@google.com, akpm@linux-foundation.org,
akpm@linux-foundation.org
Subject: [folded-merged] kasan-improve-vmalloc-tests-fix-3-fix.patch removed from -mm tree
Date: Thu, 24 Mar 2022 17:33:12 -0700 [thread overview]
Message-ID: <20220325003313.65AB1C340EC@smtp.kernel.org> (raw)
The patch titled
Subject: kasan-improve-vmalloc-tests-fix-3-fix
has been removed from the -mm tree. Its filename was
kasan-improve-vmalloc-tests-fix-3-fix.patch
This patch was dropped because it was folded into kasan-improve-vmalloc-tests.patch
------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: kasan-improve-vmalloc-tests-fix-3-fix
fix build
lib/test_kasan.c: In function 'vmalloc_helpers_tags':
lib/test_kasan.c:1073:13: error: unused variable 'rv' [-Werror=unused-variable]
1073 | int rv;
| ^~
cc1: all warnings being treated as errors
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Marco Elver <elver@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
lib/test_kasan.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
--- a/lib/test_kasan.c~kasan-improve-vmalloc-tests-fix-3-fix
+++ a/lib/test_kasan.c
@@ -1066,7 +1066,6 @@ static void kmalloc_double_kzfree(struct
static void vmalloc_helpers_tags(struct kunit *test)
{
void *ptr;
- int rv;
/* This test is intended for tag-based modes. */
KASAN_TEST_NEEDS_CONFIG_OFF(test, CONFIG_KASAN_GENERIC);
@@ -1085,11 +1084,15 @@ static void vmalloc_helpers_tags(struct
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vmalloc_to_page(ptr));
#if !IS_MODULE(CONFIG_KASAN_KUNIT_TEST)
- /* Make sure vmalloc'ed memory permissions can be changed. */
- rv = set_memory_ro((unsigned long)ptr, 1);
- KUNIT_ASSERT_GE(test, rv, 0);
- rv = set_memory_rw((unsigned long)ptr, 1);
- KUNIT_ASSERT_GE(test, rv, 0);
+ {
+ int rv;
+
+ /* Make sure vmalloc'ed memory permissions can be changed. */
+ rv = set_memory_ro((unsigned long)ptr, 1);
+ KUNIT_ASSERT_GE(test, rv, 0);
+ rv = set_memory_rw((unsigned long)ptr, 1);
+ KUNIT_ASSERT_GE(test, rv, 0);
+ }
#endif
vfree(ptr);
_
Patches currently in -mm which might be from akpm@linux-foundation.org are
kasan-improve-vmalloc-tests.patch
mm-slightly-clarify-ksm-logic-in-do_swap_page-fix.patch
mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd-fix.patch
mm.patch
mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch
mutex-subsystem-synchro-test-module-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
reply other threads:[~2022-03-25 0:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220325003313.65AB1C340EC@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=elver@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mm-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.