Commit 15820091 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s/exception: move paca save area offsets into exception-64s.S 



No generated code change.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent d064151f

arch/powerpc/include/asm/exception-64s.h

+3 −14
Original line number Diff line number Diff line
@@ -36,22 +36,11 @@ 
 */

#include <asm/feature-fixups.h>



/* PACA save area offsets (exgen, exmc, etc) */

#define EX_R9		0

#define EX_R10		8

#define EX_R11		16

#define EX_R12		24

#define EX_R13		32

#define EX_DAR		40

#define EX_DSISR	48

#define EX_CCR		52

#define EX_CFAR		56

#define EX_PPR		64

/* PACA save area size in u64 units (exgen, exmc, etc) */

#if defined(CONFIG_RELOCATABLE)

#define EX_CTR		72

#define EX_SIZE		10	/* size in u64 units */

#define EX_SIZE		10

#else

#define EX_SIZE		9	/* size in u64 units */

#define EX_SIZE		9

#endif



/*

arch/powerpc/kernel/exceptions-64s.S

+22 −0
Original line number Diff line number Diff line
@@ -21,6 +21,28 @@ 
#include <asm/feature-fixups.h>

#include <asm/kup.h>



/* PACA save area offsets (exgen, exmc, etc) */

#define EX_R9		0

#define EX_R10		8

#define EX_R11		16

#define EX_R12		24

#define EX_R13		32

#define EX_DAR		40

#define EX_DSISR	48

#define EX_CCR		52

#define EX_CFAR		56

#define EX_PPR		64

#if defined(CONFIG_RELOCATABLE)

#define EX_CTR		72

.if EX_SIZE != 10

	.error "EX_SIZE is wrong"

.endif

#else

.if EX_SIZE != 9

	.error "EX_SIZE is wrong"

.endif

#endif



/*

 * We're short on space and time in the exception prolog, so we can't

 * use the normal LOAD_REG_IMMEDIATE macro to load the address of label.