Commit 6df95fd7 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

consolidate asm/const.h to linux/const.h

Make a global linux/const.h header file instead of having multiple,
per-arch files, and convert current users of asm/const.h to use
linux/const.h.

Built on x86_64 and sparc64.

[akpm@linux-foundation.org: fix include/asm-x86_64/Kbuild]
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e39c933
...@@ -8,7 +8,6 @@ header-y += apb.h ...@@ -8,7 +8,6 @@ header-y += apb.h
header-y += asi.h header-y += asi.h
header-y += bbc.h header-y += bbc.h
header-y += bpp.h header-y += bpp.h
header-y += const.h
header-y += display7seg.h header-y += display7seg.h
header-y += envctrl.h header-y += envctrl.h
header-y += ipc.h header-y += ipc.h
......
/* const.h: Macros for dealing with constants. */
#ifndef _SPARC64_CONST_H
#define _SPARC64_CONST_H
/* Some constant macros are used in both assembler and
* C code. Therefore we cannot annotate them always with
* 'UL' and other type specificers unilaterally. We
* use the following macros to deal with this.
*/
#ifdef __ASSEMBLY__
#define _AC(X,Y) X
#else
#define _AC(X,Y) (X##Y)
#endif
#endif /* !(_SPARC64_CONST_H) */
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#ifndef _SPARC64_LSU_H #ifndef _SPARC64_LSU_H
#define _SPARC64_LSU_H #define _SPARC64_LSU_H
#include <asm/const.h> #include <linux/const.h>
/* LSU Control Register */ /* LSU Control Register */
#define LSU_CONTROL_PM _AC(0x000001fe00000000,UL) /* Phys-watchpoint byte mask*/ #define LSU_CONTROL_PM _AC(0x000001fe00000000,UL) /* Phys-watchpoint byte mask*/
......
#ifndef __MMU_H #ifndef __MMU_H
#define __MMU_H #define __MMU_H
#include <linux/const.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/const.h>
#include <asm/hypervisor.h> #include <asm/hypervisor.h>
#define CTX_NR_BITS 13 #define CTX_NR_BITS 13
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/const.h> #include <linux/const.h>
#if defined(CONFIG_SPARC64_PAGE_SIZE_8KB) #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB)
#define PAGE_SHIFT 13 #define PAGE_SHIFT 13
......
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
#include <asm-generic/pgtable-nopud.h> #include <asm-generic/pgtable-nopud.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/const.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/spitfire.h> #include <asm/spitfire.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/const.h>
/* The kernel image occupies 0x4000000 to 0x1000000 (4MB --> 32MB). /* The kernel image occupies 0x4000000 to 0x1000000 (4MB --> 32MB).
* The page copy blockops can use 0x2000000 to 0x4000000. * The page copy blockops can use 0x2000000 to 0x4000000.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#ifndef _SPARC64_PSTATE_H #ifndef _SPARC64_PSTATE_H
#define _SPARC64_PSTATE_H #define _SPARC64_PSTATE_H
#include <asm/const.h> #include <linux/const.h>
/* The V9 PSTATE Register (with SpitFire extensions). /* The V9 PSTATE Register (with SpitFire extensions).
* *
......
#ifndef _SPARC64_SFAFSR_H #ifndef _SPARC64_SFAFSR_H
#define _SPARC64_SFAFSR_H #define _SPARC64_SFAFSR_H
#include <asm/const.h> #include <linux/const.h>
/* Spitfire Asynchronous Fault Status register, ASI=0x4C VA<63:0>=0x0 */ /* Spitfire Asynchronous Fault Status register, ASI=0x4C VA<63:0>=0x0 */
......
...@@ -19,4 +19,3 @@ unifdef-y += mce.h ...@@ -19,4 +19,3 @@ unifdef-y += mce.h
unifdef-y += msr.h unifdef-y += msr.h
unifdef-y += mtrr.h unifdef-y += mtrr.h
unifdef-y += vsyscall.h unifdef-y += vsyscall.h
unifdef-y += const.h
#ifndef _X86_64_PAGE_H #ifndef _X86_64_PAGE_H
#define _X86_64_PAGE_H #define _X86_64_PAGE_H
#include <asm/const.h> #include <linux/const.h>
/* PAGE_SHIFT determines the page size */ /* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12 #define PAGE_SHIFT 12
......
#ifndef _X86_64_PGTABLE_H #ifndef _X86_64_PGTABLE_H
#define _X86_64_PGTABLE_H #define _X86_64_PGTABLE_H
#include <asm/const.h> #include <linux/const.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* /*
......
...@@ -45,6 +45,7 @@ header-y += coda_psdev.h ...@@ -45,6 +45,7 @@ header-y += coda_psdev.h
header-y += coff.h header-y += coff.h
header-y += comstats.h header-y += comstats.h
header-y += consolemap.h header-y += consolemap.h
header-y += const.h
header-y += cycx_cfm.h header-y += cycx_cfm.h
header-y += dlm_device.h header-y += dlm_device.h
header-y += dm-ioctl.h header-y += dm-ioctl.h
......
/* const.h: Macros for dealing with constants. */ /* const.h: Macros for dealing with constants. */
#ifndef _X86_64_CONST_H #ifndef _LINUX_CONST_H
#define _X86_64_CONST_H #define _LINUX_CONST_H
/* Some constant macros are used in both assembler and /* Some constant macros are used in both assembler and
* C code. Therefore we cannot annotate them always with * C code. Therefore we cannot annotate them always with
* 'UL' and other type specificers unilaterally. We * 'UL' and other type specifiers unilaterally. We
* use the following macros to deal with this. * use the following macros to deal with this.
*/ */
...@@ -16,5 +16,4 @@ ...@@ -16,5 +16,4 @@
#define _AC(X,Y) __AC(X,Y) #define _AC(X,Y) __AC(X,Y)
#endif #endif
#endif /* !(_LINUX_CONST_H) */
#endif /* !(_X86_64_CONST_H) */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment