microblaze: Rename kernel_mode to pt_mode in pt_regs

Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index d8e15434ba219b9da1aad432c2ca1f993c53da87..4bed76d0a6c48476e3b8734e52c664ad31fad59b 100644 (file)
--- 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,
 {
        regs->pc = pc;
        regs->r1 = usp;
-       regs->kernel_mode = 0;
+       regs->pt_mode = 0;
 }
 
 /* Free all resources held by a thread. */

diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h
index f1f03486428acf6bed29d6392dd3886cc58c57f7..55015bce5e47ed0c6ec9bc6fa2eef293ddcfbdbd 100644 (file)
--- a/arch/microblaze/include/asm/ptrace.h
+++ b/arch/microblaze/include/asm/ptrace.h
@@ -52,10 +52,10 @@ struct pt_regs {
        microblaze_reg_t ear;
        microblaze_reg_t esr;
        microblaze_reg_t fsr;
-       int kernel_mode;
+       int pt_mode;
 };
 
-#define kernel_mode(regs)              ((regs)->kernel_mode)
+#define kernel_mode(regs)              ((regs)->pt_mode)
 #define user_mode(regs)                        (!kernel_mode(regs))
 
 #define instruction_pointer(regs)      ((regs)->pc)

diff --git a/arch/microblaze/kernel/asm-offsets.c b/arch/microblaze/kernel/asm-offsets.c
index 38e1a2e8ad0c359e87834906bcca6425b6df097e..aabd9e9423a651103c4eb379460446ba82297833 100644 (file)
--- a/arch/microblaze/kernel/asm-offsets.c
+++ b/arch/microblaze/kernel/asm-offsets.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
        DEFINE(PT_R29, offsetof(struct pt_regs, r29));
        DEFINE(PT_R30, offsetof(struct pt_regs, r30));
        DEFINE(PT_R31, offsetof(struct pt_regs, r31));
-       DEFINE(PT_MODE, offsetof(struct pt_regs, kernel_mode));
+       DEFINE(PT_MODE, offsetof(struct pt_regs, pt_mode));
        BLANK();
 
        /* Magic offsets for PTRACE PEEK/POKE etc */

diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index bdc8b2c6c574e5e8c573349424806565c87b60a6..40cc1480810e32811971e0d93f23b73e535b41fd 100644 (file)
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -18,7 +18,7 @@
 
 void show_regs(struct pt_regs *regs)
 {
-       printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->kernel_mode);
+       printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->pt_mode);
        printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",
                                regs->r1, regs->r2, regs->r3, regs->r4);
        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)
        regs.r6 = (unsigned long)arg;
        local_save_flags(regs.msr);
        regs.pc = (unsigned long)kernel_thread_helper;
-       regs.kernel_mode = 1;
+       regs.pt_mode = 1;
 
        ret = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
                        &regs, 0, NULL, NULL);