Skip to content

Commit

Permalink
tools/include: Add _RET_IP_ and math definitions to kernel.h
Browse files Browse the repository at this point in the history
commit 5cf67a6 upstream.

Add max_t, min_t and clamp functions, together with _RET_IP_
definition, so they can be used in testing.

Signed-off-by: Karolina Drobnik <karolinadrobnik@gmail.com>
Signed-off-by: Mike Rapoport <rppt@kernel.org>
Link: https://lore.kernel.org/r/230fea382cb1e1659cdd52a55201854d38a0a149.1643796665.git.karolinadrobnik@gmail.com
[tyhicks: Backport around contextual differences due to the lack of v5.16 commit
 d6e6a27 ("tools: Fix math.h breakage"). That commit fixed a commit
 that was merged in v5.16-rc1 and, therefore, doesn't need to go back to
 the stable branches.]
Signed-off-by: Tyler Hicks (Microsoft) <code@tyhicks.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
drobnik authored and gregkh committed Dec 31, 2022
1 parent c885326 commit 6215904
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions tools/include/linux/kernel.h
Expand Up @@ -14,6 +14,8 @@
#define UINT_MAX (~0U)
#endif

#define _RET_IP_ ((unsigned long)__builtin_return_address(0))

#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))

#define PERF_ALIGN(x, a) __PERF_ALIGN_MASK(x, (typeof(x))(a)-1)
Expand Down Expand Up @@ -52,6 +54,10 @@
_min1 < _min2 ? _min1 : _min2; })
#endif

#define max_t(type, x, y) max((type)x, (type)y)
#define min_t(type, x, y) min((type)x, (type)y)
#define clamp(val, lo, hi) min((typeof(val))max(val, lo), hi)

#ifndef roundup
#define roundup(x, y) ( \
{ \
Expand Down

0 comments on commit 6215904

Please sign in to comment.