diff options
author | Michal Simek <monstr@monstr.eu> | 2009-04-16 04:58:47 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2009-04-23 10:09:17 -0400 |
commit | ac3efab50621bd6d01e5b40f3134dc7824788390 (patch) | |
tree | ddca584e69e6e1b726695169c8d5cec8e8160482 /arch | |
parent | ceb8944b3a3dd3ec4094a476a44802cc32c4fc02 (diff) |
microblaze: Rename kernel_mode to pt_mode in pt_regs
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/include/asm/processor.h | 2 | ||||
-rw-r--r-- | arch/microblaze/include/asm/ptrace.h | 4 | ||||
-rw-r--r-- | arch/microblaze/kernel/asm-offsets.c | 2 | ||||
-rw-r--r-- | arch/microblaze/kernel/process.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h index d8e15434ba21..4bed76d0a6c4 100644 --- a/arch/microblaze/include/asm/processor.h +++ b/arch/microblaze/include/asm/processor.h | |||
@@ -62,7 +62,7 @@ static inline void start_thread(struct pt_regs *regs, | |||
62 | { | 62 | { |
63 | regs->pc = pc; | 63 | regs->pc = pc; |
64 | regs->r1 = usp; | 64 | regs->r1 = usp; |
65 | regs->kernel_mode = 0; | 65 | regs->pt_mode = 0; |
66 | } | 66 | } |
67 | 67 | ||
68 | /* Free all resources held by a thread. */ | 68 | /* Free all resources held by a thread. */ |
diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h index f1f03486428a..55015bce5e47 100644 --- a/arch/microblaze/include/asm/ptrace.h +++ b/arch/microblaze/include/asm/ptrace.h | |||
@@ -52,10 +52,10 @@ struct pt_regs { | |||
52 | microblaze_reg_t ear; | 52 | microblaze_reg_t ear; |
53 | microblaze_reg_t esr; | 53 | microblaze_reg_t esr; |
54 | microblaze_reg_t fsr; | 54 | microblaze_reg_t fsr; |
55 | int kernel_mode; | 55 | int pt_mode; |
56 | }; | 56 | }; |
57 | 57 | ||
58 | #define kernel_mode(regs) ((regs)->kernel_mode) | 58 | #define kernel_mode(regs) ((regs)->pt_mode) |
59 | #define user_mode(regs) (!kernel_mode(regs)) | 59 | #define user_mode(regs) (!kernel_mode(regs)) |
60 | 60 | ||
61 | #define instruction_pointer(regs) ((regs)->pc) | 61 | #define instruction_pointer(regs) ((regs)->pc) |
diff --git a/arch/microblaze/kernel/asm-offsets.c b/arch/microblaze/kernel/asm-offsets.c index 38e1a2e8ad0c..aabd9e9423a6 100644 --- a/arch/microblaze/kernel/asm-offsets.c +++ b/arch/microblaze/kernel/asm-offsets.c | |||
@@ -57,7 +57,7 @@ int main(int argc, char *argv[]) | |||
57 | DEFINE(PT_R29, offsetof(struct pt_regs, r29)); | 57 | DEFINE(PT_R29, offsetof(struct pt_regs, r29)); |
58 | DEFINE(PT_R30, offsetof(struct pt_regs, r30)); | 58 | DEFINE(PT_R30, offsetof(struct pt_regs, r30)); |
59 | DEFINE(PT_R31, offsetof(struct pt_regs, r31)); | 59 | DEFINE(PT_R31, offsetof(struct pt_regs, r31)); |
60 | DEFINE(PT_MODE, offsetof(struct pt_regs, kernel_mode)); | 60 | DEFINE(PT_MODE, offsetof(struct pt_regs, pt_mode)); |
61 | BLANK(); | 61 | BLANK(); |
62 | 62 | ||
63 | /* Magic offsets for PTRACE PEEK/POKE etc */ | 63 | /* Magic offsets for PTRACE PEEK/POKE etc */ |
diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c index bdc8b2c6c574..40cc1480810e 100644 --- a/arch/microblaze/kernel/process.c +++ b/arch/microblaze/kernel/process.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | void show_regs(struct pt_regs *regs) | 19 | void show_regs(struct pt_regs *regs) |
20 | { | 20 | { |
21 | printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->kernel_mode); | 21 | printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->pt_mode); |
22 | printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n", | 22 | printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n", |
23 | regs->r1, regs->r2, regs->r3, regs->r4); | 23 | regs->r1, regs->r2, regs->r3, regs->r4); |
24 | printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n", | 24 | printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n", |
@@ -169,7 +169,7 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | |||
169 | regs.r6 = (unsigned long)arg; | 169 | regs.r6 = (unsigned long)arg; |
170 | local_save_flags(regs.msr); | 170 | local_save_flags(regs.msr); |
171 | regs.pc = (unsigned long)kernel_thread_helper; | 171 | regs.pc = (unsigned long)kernel_thread_helper; |
172 | regs.kernel_mode = 1; | 172 | regs.pt_mode = 1; |
173 | 173 | ||
174 | ret = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, | 174 | ret = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, |
175 | ®s, 0, NULL, NULL); | 175 | ®s, 0, NULL, NULL); |