uml: use PAGE_SIZE in linker scripts
This patch includes page.h header into linker scripts that allow us to use PAGE_SIZE macro instead of numeric constant. To be able to include page.h into linker scripts page.h is needed for some modification - i.e. we need to use __ASSEMBLY__ and _AC macro [jdike@linux.intel.com - fixed conflict with as-layout.h] Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
6d0742426c
commit
a7dfa9403b
@ -23,16 +23,16 @@
|
||||
*/
|
||||
|
||||
#ifdef __ASSEMBLY__
|
||||
#define _AC(X, Y) (Y)
|
||||
#define _UML_AC(X, Y) (Y)
|
||||
#else
|
||||
#define __AC(X, Y) (X (Y))
|
||||
#define _AC(X, Y) __AC(X, Y)
|
||||
#define __UML_AC(X, Y) (X(Y))
|
||||
#define _UML_AC(X, Y) __UML_AC(X, Y)
|
||||
#endif
|
||||
|
||||
#define STUB_START _AC(, 0x100000)
|
||||
#define STUB_CODE _AC((unsigned long), STUB_START)
|
||||
#define STUB_DATA _AC((unsigned long), STUB_CODE + UM_KERN_PAGE_SIZE)
|
||||
#define STUB_END _AC((unsigned long), STUB_DATA + UM_KERN_PAGE_SIZE)
|
||||
#define STUB_START _UML_AC(, 0x100000)
|
||||
#define STUB_CODE _UML_AC((unsigned long), STUB_START)
|
||||
#define STUB_DATA _UML_AC((unsigned long), STUB_CODE + UM_KERN_PAGE_SIZE)
|
||||
#define STUB_END _UML_AC((unsigned long), STUB_DATA + UM_KERN_PAGE_SIZE)
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
|
Reference in New Issue
Block a user