consolidate asm/const.h to linux/const.h
PATCH 1/1 consolidate asm/const.h to linux/const.h
From: Randy Dunlap <[email protected]>
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.
Signed-off-by Randy Dunlap <[email protected]>
--- include/asm-sparc64/Kbuild | 1 - include/asm-sparc64/const.h | 19 ------------------- include/asm-sparc64/lsu.h | 2 +- include/asm-sparc64/mmu.h | 2 +- include/asm-sparc64/page.h | 2 +- include/asm-sparc64/pgtable.h | 2 +- include/asm-sparc64/pstate.h | 2 +- include/asm-sparc64/sfafsr.h | 2 +- include/asm-x86_64/const.h | 20 -------------------- include/asm-x86_64/page.h | 2 +- include/asm-x86_64/pgtable.h | 2 +- include/linux/Kbuild | 1 + include/linux/const.h | 19 +++++++++++++++++++ 13 files changed, 28 insertions(+), 48 deletions(-)
include/asm-sparc64/const.h deleted +0 -19
@@ -1,19 +0,0 @@ -/* 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) */
include/asm-x86_64/const.h deleted +0 -20
@@ -1,20 +0,0 @@ -/* const.h: Macros for dealing with constants. */ - -#ifndef _X86_64_CONST_H -#define _X86_64_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) -#define _AC (X ,Y ) __AC(X,Y) -#endif - - -#endif /* !(_X86_64_CONST_H) */
include/linux/const.h new file +19 -0
@@ -0,0 +1,19 @@ +/* const.h: Macros for dealing with constants. */ + +#ifndef _LINUX_CONST_H +#define _LINUX_CONST_H + +/* Some constant macros are used in both assembler and +* C code. Therefore we cannot annotate them always with +* 'UL' and other type specifiers unilaterally. We +* use the following macros to deal with this. +*/ + +#ifdef __ASSEMBLY__ +#define _AC (X ,Y ) X +#else +#define __AC (X ,Y ) (X##Y) +#define _AC (X ,Y ) __AC(X,Y) +#endif + +#endif /* !(_LINUX_CONST_H) */
include/asm-x86_64/page.h +1 -1
@@ -1,7 +1,7 @@#ifndef _X86_64_PAGE_H#define _X86_64_PAGE_H -#include <asm/const.h> +#include <linux/const.h> /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12
include/asm-x86_64/pgtable.h +1 -1
@@ -1,7 +1,7 @@#ifndef _X86_64_PGTABLE_H#define _X86_64_PGTABLE_H -#include <asm/const.h> +#include <linux/const.h> #ifndef __ASSEMBLY__/*
include/asm-sparc64/lsu.h +1 -1
@@ -2,7 +2,7 @@#ifndef _SPARC64_LSU_H#define _SPARC64_LSU_H -#include <asm/const.h> +#include <linux/const.h> /* LSU Control Register */ #define LSU_CONTROL_PM _AC(0x000001fe00000000,UL)/* Phys-watchpoint byte mask*/
include/asm-sparc64/mmu.h +1 -1
@@ -1,8 +1,8 @@#ifndef __MMU_H#define __MMU_H +#include <linux/const.h> #include <asm/page.h> -#include <asm/const.h> #include <asm/hypervisor.h> #define CTX_NR_BITS 13
include/asm-sparc64/page.h +1 -1
@@ -5,7 +5,7 @@#ifdef __KERNEL__ -#include <asm/const.h> +#include <linux/const.h> #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB )#define PAGE_SHIFT 13
include/asm-sparc64/pgtable.h +1 -1
@@ -15,13 +15,13 @@#include <asm-generic/pgtable-nopud.h> #include <linux/compiler.h> +#include <linux/const.h> #include <asm/types.h> #include <asm/spitfire.h> #include <asm/asi.h> #include <asm/system.h> #include <asm/page.h> #include <asm/processor.h> -#include <asm/const.h> /* The kernel image occupies 0x4000000 to 0x1000000 (4MB --> 32MB). * The page copy blockops can use 0x2000000 to 0x4000000.
include/asm-sparc64/pstate.h +1 -1
@@ -2,7 +2,7 @@#ifndef _SPARC64_PSTATE_H#define _SPARC64_PSTATE_H -#include <asm/const.h> +#include <linux/const.h> /* The V9 PSTATE Register (with SpitFire extensions). *
include/asm-sparc64/sfafsr.h +1 -1
@@ -1,7 +1,7 @@#ifndef _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 */
include/asm-sparc64/Kbuild +0 -1
@@ -8,7 +8,6 @@ header-y += apb.h header-y += asi.h header-y += bbc.h header-y += bpp.h -header-y += const.h header-y += display7seg.h header-y += envctrl.h header-y += ipc.h
include/linux/Kbuild +1 -0
@@ -46,6 +46,7 @@ header-y += coda_psdev.h header-y += coff.h header-y += comstats.h header-y += consolemap.h +header-y += const.h header-y += cycx_cfm.h header-y += dlm_device.h header-y += dm-ioctl.h
From: Randy Dunlap <[email protected]>
Date: Thu, 26 Apr 2007 20:50:08 -0700
Quoted 9 lines
From: Randy Dunlap <[email protected]>
Make a global
linux/const.hheader file instead of having multiple, per-arch files, and convert current users ofasm/const.hto uselinux/const.h.Built on
x86_64and sparc64.Signed-off-by Randy Dunlap <[email protected]>
Signed-off-by David S. Miller <[email protected]>