Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5934d33f authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Alistair Delva
Browse files

BACKPORT: linux/kernel.h: split *_MAX and *_MIN macros into <linux/limits.h> 

<linux/kernel.h> tends to be cluttered because we often put various sort
of unrelated stuff in it.  So, we have split out a sensible chunk of
code into a separate header from time to time.

This commit splits out the *_MAX and *_MIN defines.

The standard header <limits.h> contains various MAX, MIN constants
including numerial limits.  [1]

I think it makes sense to move in-kernel MAX, MIN constants into
include/linux/limits.h.

We already have include/uapi/linux/limits.h to contain some user-space
constants.  I changed its include guard to _UAPI_LINUX_LIMITS_H.  This
change has no impact to the user-space because
scripts/headers_install.sh rips off the '_UAPI' prefix from the include
guards of exported headers.

[1] http://pubs.opengroup.org/onlinepubs/009604499/basedefs/limits.h.html

Link: http://lkml.kernel.org/r/1549156242-20806-2-git-send-email-yamada.masahiro@socionext.com


Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Cc: Alex Elder <elder@linaro.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Zhang Yanmin <yanmin.zhang@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 54d50897d544c874562253e2a8f70dfcad22afe8)
[ salyzyn: moved include of linux/limits.h to solve module CRC differences ]
Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Bug: 154668398
Change-Id: Iae4259d122e289d6854edb221440a45be95ca015
parent a75454a7

include/linux/kernel.h

+1 −29
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef _LINUX_KERNEL_H

#define _LINUX_KERNEL_H





#include <stdarg.h>

#include <linux/linkage.h>

#include <linux/stddef.h>
@@ -15,34 +14,7 @@ 
#include <linux/build_bug.h>

#include <asm/byteorder.h>

#include <uapi/linux/kernel.h>



#define USHRT_MAX	((u16)(~0U))

#define SHRT_MAX	((s16)(USHRT_MAX>>1))

#define SHRT_MIN	((s16)(-SHRT_MAX - 1))

#define INT_MAX		((int)(~0U>>1))

#define INT_MIN		(-INT_MAX - 1)

#define UINT_MAX	(~0U)

#define LONG_MAX	((long)(~0UL>>1))

#define LONG_MIN	(-LONG_MAX - 1)

#define ULONG_MAX	(~0UL)

#define LLONG_MAX	((long long)(~0ULL>>1))

#define LLONG_MIN	(-LLONG_MAX - 1)

#define ULLONG_MAX	(~0ULL)

#define SIZE_MAX	(~(size_t)0)

#define PHYS_ADDR_MAX	(~(phys_addr_t)0)



#define U8_MAX		((u8)~0U)

#define S8_MAX		((s8)(U8_MAX>>1))

#define S8_MIN		((s8)(-S8_MAX - 1))

#define U16_MAX		((u16)~0U)

#define S16_MAX		((s16)(U16_MAX>>1))

#define S16_MIN		((s16)(-S16_MAX - 1))

#define U32_MAX		((u32)~0U)

#define S32_MAX		((s32)(U32_MAX>>1))

#define S32_MIN		((s32)(-S32_MAX - 1))

#define U64_MAX		((u64)~0ULL)

#define S64_MAX		((s64)(U64_MAX>>1))

#define S64_MIN		((s64)(-S64_MAX - 1))

#include <linux/limits.h>



#define STACK_MAGIC	0xdeadbeef

include/linux/limits.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _LINUX_LIMITS_H

#define _LINUX_LIMITS_H



#include <uapi/linux/limits.h>

#include <linux/types.h>



#define USHRT_MAX	((unsigned short)~0U)

#define SHRT_MAX	((short)(USHRT_MAX >> 1))

#define SHRT_MIN	((short)(-SHRT_MAX - 1))

#define INT_MAX		((int)(~0U >> 1))

#define INT_MIN		(-INT_MAX - 1)

#define UINT_MAX	(~0U)

#define LONG_MAX	((long)(~0UL >> 1))

#define LONG_MIN	(-LONG_MAX - 1)

#define ULONG_MAX	(~0UL)

#define LLONG_MAX	((long long)(~0ULL >> 1))

#define LLONG_MIN	(-LLONG_MAX - 1)

#define ULLONG_MAX	(~0ULL)

#define SIZE_MAX	(~(size_t)0)

#define PHYS_ADDR_MAX	(~(phys_addr_t)0)



#define U8_MAX		((u8)~0U)

#define S8_MAX		((s8)(U8_MAX >> 1))

#define S8_MIN		((s8)(-S8_MAX - 1))

#define U16_MAX		((u16)~0U)

#define S16_MAX		((s16)(U16_MAX >> 1))

#define S16_MIN		((s16)(-S16_MAX - 1))

#define U32_MAX		((u32)~0U)

#define S32_MAX		((s32)(U32_MAX >> 1))

#define S32_MIN		((s32)(-S32_MAX - 1))

#define U64_MAX		((u64)~0ULL)

#define S64_MAX		((s64)(U64_MAX >> 1))

#define S64_MIN		((s64)(-S64_MAX - 1))



#endif /* _LINUX_LIMITS_H */

include/uapi/linux/limits.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _LINUX_LIMITS_H

#define _LINUX_LIMITS_H

#ifndef _UAPI_LINUX_LIMITS_H

#define _UAPI_LINUX_LIMITS_H



#define NR_OPEN	        1024