7 files changed, 25 insertions, 37 deletions

diff --git a/arch/frv/kernel/break.S b/arch/frv/kernel/break.S
index bd0bdf908d93..cbb6958a3147 100644
--- a/arch/frv/kernel/break.S
+++ b/arch/frv/kernel/break.S
@@ -21,7 +21,7 @@
 #
 # the break handler has its own stack
 #
-        .section        .bss.stack
+        .section        .bss..stack
         .globl          __break_user_context
         .balign         THREAD_SIZE
 __break_stack:
@@ -63,7 +63,7 @@ __break_trace_through_exceptions:
 # entry point for Break Exceptions/Interrupts
 #
 ###############################################################################
-        .section        .text.break
+        .section        .text..break
         .balign         4
         .globl          __entry_break
 __entry_break:
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index 189397ec012a..63d579bf1c29 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -38,7 +38,7 @@
 
 #define nr_syscalls ((syscall_table_size)/4)
 
-        .section        .text.entry
+        .section        .text..entry
         .balign         4
 
 .macro LEDS val
diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c
index 84d103c33c9c..a4dba6b20bd0 100644
--- a/arch/frv/kernel/gdb-stub.c
+++ b/arch/frv/kernel/gdb-stub.c
@@ -1789,6 +1789,12 @@ void gdbstub(int sigval)
                         flush_cache = 1;
                         break;
 
+                        /* pNN: Read value of reg N and return it */
+                case 'p':
+                        /* return no value, indicating that we don't support
+                         * this command and that gdb should use 'g' instead */
+                        break;
+
                         /* PNN,=RRRRRRRR: Write value R to reg N return OK */
                 case 'P':
                         ptr = &input_buffer[1];
diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S
index b825ef3f2d54..e9a8cc63ac94 100644
--- a/arch/frv/kernel/head.S
+++ b/arch/frv/kernel/head.S
@@ -542,7 +542,7 @@ __head_end:
         .size           _boot, .-_boot
 
         # provide a point for GDB to place a break
-        .section        .text.start,"ax"
+        .section        .text..start,"ax"
         .globl          _start
         .balign         4
 _start:
diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c
index 60eeed3694c0..fac028936a04 100644
--- a/arch/frv/kernel/ptrace.c
+++ b/arch/frv/kernel/ptrace.c
@@ -344,26 +344,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                              0, sizeof(child->thread.user->f),
                                              (const void __user *)data);
 
-        case PTRACE_GETFDPIC:
-                tmp = 0;
-                switch (addr) {
-                case PTRACE_GETFDPIC_EXEC:
-                        tmp = child->mm->context.exec_fdpic_loadmap;
-                        break;
-                case PTRACE_GETFDPIC_INTERP:
-                        tmp = child->mm->context.interp_fdpic_loadmap;
-                        break;
-                default:
-                        break;
-                }
-
-                ret = 0;
-                if (put_user(tmp, (unsigned long *) data)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                break;
-
         default:
                 ret = ptrace_request(child, request, addr, data);
                 break;
diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c
index 71abd1510a59..6c155d69da29 100644
--- a/arch/frv/kernel/sysctl.c
+++ b/arch/frv/kernel/sysctl.c
@@ -46,8 +46,9 @@ static void frv_change_dcache_mode(unsigned long newmode)
 /*
  * handle requests to dynamically switch the write caching mode delivered by /proc
  */
-static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,
-                                 void __user *buffer, size_t *lenp, loff_t *ppos)
+static int procctl_frv_cachemode(ctl_table *table, int write,
+                                 void __user *buffer, size_t *lenp,
+                                 loff_t *ppos)
 {
         unsigned long hsr0;
         char buff[8];
@@ -84,7 +85,7 @@ static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,
         }
 
         /* read the state */
-        if (filp->f_pos > 0) {
+        if (*ppos > 0) {
                 *lenp = 0;
                 return 0;
         }
@@ -110,7 +111,7 @@ static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,
                 return -EFAULT;
 
         *lenp = len;
-        filp->f_pos = len;
+        *ppos = len;
         return 0;
 
 } /* end procctl_frv_cachemode() */
@@ -120,8 +121,9 @@ static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,
  * permit the mm_struct the nominated process is using have its MMU context ID pinned
  */
 #ifdef CONFIG_MMU
-static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
-                                void __user *buffer, size_t *lenp, loff_t *ppos)
+static int procctl_frv_pin_cxnr(ctl_table *table, int write,
+                                void __user *buffer, size_t *lenp,
+                                loff_t *ppos)
 {
         pid_t pid;
         char buff[16], *p;
@@ -150,7 +152,7 @@ static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
         }
 
         /* read the currently pinned CXN */
-        if (filp->f_pos > 0) {
+        if (*ppos > 0) {
                 *lenp = 0;
                 return 0;
         }
@@ -163,7 +165,7 @@ static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
                 return -EFAULT;
 
         *lenp = len;
-        filp->f_pos = len;
+        *ppos = len;
         return 0;
 
 } /* end procctl_frv_pin_cxnr() */
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index cbe811fccfcc..8b973f3cc90e 100644
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -57,10 +57,10 @@ SECTIONS
   _text = .;
   _stext = .;
   .text : {
-        *(.text.start)
-        *(.text.entry)
-        *(.text.break)
-        *(.text.tlbmiss)
+        *(.text..start)
+        *(.text..entry)
+        *(.text..break)
+        *(.text..tlbmiss)
         TEXT_TEXT
         SCHED_TEXT
         LOCK_TEXT
@@ -114,7 +114,7 @@ SECTIONS
 
   .sbss         : { *(.sbss .sbss.*) }
   .bss          : { *(.bss .bss.*) }
-  .bss.stack    : { *(.bss) }
+  .bss..stack   : { *(.bss) }
 
   __bss_stop = .;
   _end = . ;