mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
linux/const.h: move UL() macro to include/linux/const.h
commit 2dd8a62c64
upstream.
ARM, ARM64 and UniCore32 duplicate the definition of UL():
#define UL(x) _AC(x, UL)
This is not actually arch-specific, so it will be useful to move it to a
common header. Currently, we only have the uapi variant for
linux/const.h, so I am creating include/linux/const.h.
I also added _UL(), _ULL() and ULL() because _AC() is mostly used in
the form either _AC(..., UL) or _AC(..., ULL). I expect they will be
replaced in follow-up cleanups. The underscore-prefixed ones should
be used for exported headers.
Link: http://lkml.kernel.org/r/1519301715-31798-4-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Cc: David Howells <dhowells@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0ad721c293
commit
6bd6be6884
5 changed files with 12 additions and 18 deletions
|
@ -22,12 +22,6 @@
|
||||||
#include <mach/memory.h>
|
#include <mach/memory.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* Allow for constants defined here to be used from assembly code
|
|
||||||
* by prepending the UL suffix only with actual C code compilation.
|
|
||||||
*/
|
|
||||||
#define UL(x) _AC(x, UL)
|
|
||||||
|
|
||||||
/* PAGE_OFFSET - the virtual address of the start of the kernel image */
|
/* PAGE_OFFSET - the virtual address of the start of the kernel image */
|
||||||
#define PAGE_OFFSET UL(CONFIG_PAGE_OFFSET)
|
#define PAGE_OFFSET UL(CONFIG_PAGE_OFFSET)
|
||||||
|
|
||||||
|
|
|
@ -28,12 +28,6 @@
|
||||||
#include <asm/page-def.h>
|
#include <asm/page-def.h>
|
||||||
#include <asm/sizes.h>
|
#include <asm/sizes.h>
|
||||||
|
|
||||||
/*
|
|
||||||
* Allow for constants defined here to be used from assembly code
|
|
||||||
* by prepending the UL suffix only with actual C code compilation.
|
|
||||||
*/
|
|
||||||
#define UL(x) _AC(x, UL)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Size of the PCI I/O space. This must remain a power of two so that
|
* Size of the PCI I/O space. This must remain a power of two so that
|
||||||
* IO_SPACE_LIMIT acts as a mask for the low bits of I/O addresses.
|
* IO_SPACE_LIMIT acts as a mask for the low bits of I/O addresses.
|
||||||
|
|
|
@ -19,12 +19,6 @@
|
||||||
#include <asm/sizes.h>
|
#include <asm/sizes.h>
|
||||||
#include <mach/memory.h>
|
#include <mach/memory.h>
|
||||||
|
|
||||||
/*
|
|
||||||
* Allow for constants defined here to be used from assembly code
|
|
||||||
* by prepending the UL suffix only with actual C code compilation.
|
|
||||||
*/
|
|
||||||
#define UL(x) _AC(x, UL)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* PAGE_OFFSET - the virtual address of the start of the kernel image
|
* PAGE_OFFSET - the virtual address of the start of the kernel image
|
||||||
* TASK_SIZE - the maximum size of a user space task.
|
* TASK_SIZE - the maximum size of a user space task.
|
||||||
|
|
9
include/linux/const.h
Normal file
9
include/linux/const.h
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
#ifndef _LINUX_CONST_H
|
||||||
|
#define _LINUX_CONST_H
|
||||||
|
|
||||||
|
#include <uapi/linux/const.h>
|
||||||
|
|
||||||
|
#define UL(x) (_UL(x))
|
||||||
|
#define ULL(x) (_ULL(x))
|
||||||
|
|
||||||
|
#endif /* _LINUX_CONST_H */
|
|
@ -22,6 +22,9 @@
|
||||||
#define _AT(T,X) ((T)(X))
|
#define _AT(T,X) ((T)(X))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define _UL(x) (_AC(x, UL))
|
||||||
|
#define _ULL(x) (_AC(x, ULL))
|
||||||
|
|
||||||
#define _BITUL(x) (_AC(1,UL) << (x))
|
#define _BITUL(x) (_AC(1,UL) << (x))
|
||||||
#define _BITULL(x) (_AC(1,ULL) << (x))
|
#define _BITULL(x) (_AC(1,ULL) << (x))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue