mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
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. [[email protected]: fix include/asm-x86_64/Kbuild] Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: David S. Miller <[email protected]> Cc: Andi Kleen <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
8e39c933b1
commit
6df95fd7ad
13 changed files with 13 additions and 34 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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) */
|
||||
|
|
@ -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*/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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).
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue