The patch titled
Subject: kernel/resource: fix use of ternary condition in release_mem_region_adjustable
has been removed from the -mm tree. Its filename was
kernel-resource-make-release_mem_region_adjustable-never-fail-fix.patch
This patch was dropped because it was folded into kernel-resource-make-release_mem_region_adjustable-never-fail.patch
------------------------------------------------------
From: Nathan Chancellor <natechancellor@xxxxxxxxx>
Subject: kernel/resource: fix use of ternary condition in release_mem_region_adjustable
Clang warns:
kernel/resource.c:1281:53: warning: operator '?:' has lower precedence
than '|'; '|' will be evaluated first
[-Wbitwise-conditional-parentheses]
new_res = alloc_resource(GFP_KERNEL | alloc_nofail ? __GFP_NOFAIL : 0);
~~~~~~~~~~~~~~~~~~~~~~~~~ ^
kernel/resource.c:1281:53: note: place parentheses around the '|'
expression to silence this warning
new_res = alloc_resource(GFP_KERNEL | alloc_nofail ? __GFP_NOFAIL : 0);
~~~~~~~~~~~~~~~~~~~~~~~~~ ^
kernel/resource.c:1281:53: note: place parentheses around the '?:'
expression to evaluate it first
new_res = alloc_resource(GFP_KERNEL | alloc_nofail ? __GFP_NOFAIL : 0);
^
( )
1 warning generated.
Add the parentheses as it was clearly intended for the ternary condition
to be evaluated first.
Link: https://lkml.kernel.org/r/20200922060748.2452056-1-natechancellor@xxxxxxxxx
Fixes: 5fd23bd0d739 ("kernel/resource: make release_mem_region_adjustable() never fail")
Link: https://github.com/ClangBuiltLinux/linux/issues/1159
Signed-off-by: Nathan Chancellor <natechancellor@xxxxxxxxx>
Reviewed-by: David Hildenbrand <david@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/resource.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/kernel/resource.c~kernel-resource-make-release_mem_region_adjustable-never-fail-fix
+++ a/kernel/resource.c
@@ -1279,7 +1279,7 @@ void release_mem_region_adjustable(struc
* similarly).
*/
retry:
- new_res = alloc_resource(GFP_KERNEL | alloc_nofail ? __GFP_NOFAIL : 0);
+ new_res = alloc_resource(GFP_KERNEL | (alloc_nofail ? __GFP_NOFAIL : 0));
p = &parent->child;
write_lock(&resource_lock);
_
Patches currently in -mm which might be from natechancellor@xxxxxxxxx are
kernel-resource-make-release_mem_region_adjustable-never-fail.patch
