projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull xpc-disengage into release branch
[powerpc.git]
/
include
/
asm-ppc64
/
processor.h
diff --git
a/include/asm-ppc64/processor.h
b/include/asm-ppc64/processor.h
index
06aa07c
..
4146189
100644
(file)
--- a/
include/asm-ppc64/processor.h
+++ b/
include/asm-ppc64/processor.h
@@
-268,6
+268,7
@@
#define PV_970FX 0x003C
#define PV_630 0x0040
#define PV_630p 0x0041
#define PV_970FX 0x003C
#define PV_630 0x0040
#define PV_630p 0x0041
+#define PV_970MP 0x0044
#define PV_BE 0x0070
/* Platforms supported by PPC64 */
#define PV_BE 0x0070
/* Platforms supported by PPC64 */
@@
-310,6
+311,20
@@
name: \
.type GLUE(.,name),@function; \
GLUE(.,name):
.type GLUE(.,name),@function; \
GLUE(.,name):
+#define _KPROBE(name) \
+ .section ".kprobes.text","a"; \
+ .align 2 ; \
+ .globl name; \
+ .globl GLUE(.,name); \
+ .section ".opd","aw"; \
+name: \
+ .quad GLUE(.,name); \
+ .quad .TOC.@tocbase; \
+ .quad 0; \
+ .previous; \
+ .type GLUE(.,name),@function; \
+GLUE(.,name):
+
#define _STATIC(name) \
.section ".text"; \
.align 2 ; \
#define _STATIC(name) \
.section ".text"; \
.align 2 ; \
@@
-382,8
+397,8
@@
extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
extern struct task_struct *last_task_used_math;
extern struct task_struct *last_task_used_altivec;
extern struct task_struct *last_task_used_math;
extern struct task_struct *last_task_used_altivec;
-/* 64-bit user address space is 4
1-bits (2TBs
user VM) */
-#define TASK_SIZE_USER64 (0x0000
02
0000000000UL)
+/* 64-bit user address space is 4
4-bits (16TB
user VM) */
+#define TASK_SIZE_USER64 (0x0000
10
0000000000UL)
/*
* 32-bit user address space is 4GB - 1 page
/*
* 32-bit user address space is 4GB - 1 page
@@
-418,6
+433,7
@@
struct thread_struct {
unsigned long start_tb; /* Start purr when proc switched in */
unsigned long accum_tb; /* Total accumilated purr for process */
unsigned long vdso_base; /* base of the vDSO library */
unsigned long start_tb; /* Start purr when proc switched in */
unsigned long accum_tb; /* Total accumilated purr for process */
unsigned long vdso_base; /* base of the vDSO library */
+ unsigned long dabr; /* Data address breakpoint register */
#ifdef CONFIG_ALTIVEC
/* Complete AltiVec register set */
vector128 vr[32] __attribute((aligned(16)));
#ifdef CONFIG_ALTIVEC
/* Complete AltiVec register set */
vector128 vr[32] __attribute((aligned(16)));
@@
-524,6
+540,15
@@
static inline void ppc64_runlatch_off(void)
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */
+#ifdef __KERNEL__
+#define RUNLATCH_ON(REG) \
+BEGIN_FTR_SECTION \
+ mfspr (REG),SPRN_CTRLF; \
+ ori (REG),(REG),CTRL_RUNLATCH; \
+ mtspr SPRN_CTRLT,(REG); \
+END_FTR_SECTION_IFSET(CPU_FTR_CTRL)
+#endif
+
/*
* Number of entries in the SLB. If this ever changes we should handle
* it with a use a cpu feature fixup.
/*
* Number of entries in the SLB. If this ever changes we should handle
* it with a use a cpu feature fixup.