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

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

include/asm-sparc64/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -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/asm-sparc64/const.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/* 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-sparc64/lsu.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE