Commit 2dd8a62c authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Torvalds
Browse files

linux/const.h: move UL() macro to include/linux/const.h 

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarGuan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarRussell 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a6cc8a6

arch/arm/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -22,12 +22,6 @@ 
#include <mach/memory.h>

#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 */

#define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)

arch/arm64/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ 
#include <asm/page-def.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

 * IO_SPACE_LIMIT acts as a mask for the low bits of I/O addresses.

arch/unicore32/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ 
#include <asm/sizes.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

 * TASK_SIZE - the maximum size of a user space task.

include/linux/const.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#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 */

include/uapi/linux/const.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#define _AT(T,X)	((T)(X))

#endif



#define _UL(x)		(_AC(x, UL))

#define _ULL(x)		(_AC(x, ULL))



#define _BITUL(x)	(_AC(1,UL) << (x))

#define _BITULL(x)	(_AC(1,ULL) << (x))

CRA Git | Maintained and supported by SUSTech CRA and CCSE