Merge branch 'master' into for-next

13 files changed, 103 insertions, 85 deletions

diff --git a/arch/frv/include/asm/gdb-stub.h b/arch/frv/include/asm/gdb-stub.h
index 2da716407ff2..e6bedd0cd9a5 100644
--- a/arch/frv/include/asm/gdb-stub.h
+++ b/arch/frv/include/asm/gdb-stub.h
@@ -12,6 +12,7 @@
 #ifndef __ASM_GDB_STUB_H
 #define __ASM_GDB_STUB_H
 
+#undef GDBSTUB_DEBUG_IO
 #undef GDBSTUB_DEBUG_PROTOCOL
 
 #include <asm/ptrace.h>
@@ -108,6 +109,12 @@ extern void gdbstub_printk(const char *fmt, ...);
 extern void debug_to_serial(const char *p, int n);
 extern void console_set_baud(unsigned baud);
 
+#ifdef GDBSTUB_DEBUG_IO
+#define gdbstub_io(FMT,...) gdbstub_printk(FMT, ##__VA_ARGS__)
+#else
+#define gdbstub_io(FMT,...) ({ 0; })
+#endif
+
 #ifdef GDBSTUB_DEBUG_PROTOCOL
 #define gdbstub_proto(FMT,...) gdbstub_printk(FMT,##__VA_ARGS__)
 #else
diff --git a/arch/frv/include/asm/mem-layout.h b/arch/frv/include/asm/mem-layout.h
index 2947764fc0e0..ccae981876fa 100644
--- a/arch/frv/include/asm/mem-layout.h
+++ b/arch/frv/include/asm/mem-layout.h
@@ -35,8 +35,8 @@
  * the slab must be aligned such that load- and store-double instructions don't
  * fault if used
  */
-#define ARCH_KMALLOC_MINALIGN           8
-#define ARCH_SLAB_MINALIGN              8
+#define ARCH_KMALLOC_MINALIGN           L1_CACHE_BYTES
+#define ARCH_SLAB_MINALIGN              L1_CACHE_BYTES
 
 /*****************************************************************************/
 /*
diff --git a/arch/frv/include/asm/scatterlist.h b/arch/frv/include/asm/scatterlist.h
index 4bca8a28546c..1614bfd7e3a4 100644
--- a/arch/frv/include/asm/scatterlist.h
+++ b/arch/frv/include/asm/scatterlist.h
@@ -1,45 +1,7 @@
 #ifndef _ASM_SCATTERLIST_H
 #define _ASM_SCATTERLIST_H
 
-#include <asm/types.h>
-
-/*
- * Drivers must set either ->address or (preferred) page and ->offset
- * to indicate where data must be transferred to/from.
- *
- * Using page is recommended since it handles highmem data as well as
- * low mem. ->address is restricted to data which has a virtual mapping, and
- * it will go away in the future. Updating to page can be automated very
- * easily -- something like
- *
- * sg->address = some_ptr;
- *
- * can be rewritten as
- *
- * sg_set_buf(sg, some_ptr, length);
- *
- * and that's it. There's no excuse for not highmem enabling YOUR driver. /jens
- */
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-        unsigned long   sg_magic;
-#endif
-        unsigned long   page_link;
-        unsigned int    offset;         /* for highmem, page offset */
-
-        dma_addr_t      dma_address;
-        unsigned int    length;
-};
-
-/*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
+#include <asm-generic/scatterlist.h>
 
 #define ISA_DMA_THRESHOLD (0xffffffffUL)
 
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-io.c b/arch/frv/kernel/gdb-io.c
index c997bccb9221..2ca641d199f8 100644
--- a/arch/frv/kernel/gdb-io.c
+++ b/arch/frv/kernel/gdb-io.c
@@ -171,11 +171,11 @@ int gdbstub_rx_char(unsigned char *_ch, int nonblock)
                 return -EINTR;
         }
         else if (st & (UART_LSR_FE|UART_LSR_OE|UART_LSR_PE)) {
-                gdbstub_proto("### GDB Rx Error (st=%02x) ###\n",st);
+                gdbstub_io("### GDB Rx Error (st=%02x) ###\n",st);
                 return -EIO;
         }
         else {
-                gdbstub_proto("### GDB Rx %02x (st=%02x) ###\n",ch,st);
+                gdbstub_io("### GDB Rx %02x (st=%02x) ###\n",ch,st);
                 *_ch = ch & 0x7f;
                 return 0;
         }
diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c
index 7ca8a6b19ac9..a4dba6b20bd0 100644
--- a/arch/frv/kernel/gdb-stub.c
+++ b/arch/frv/kernel/gdb-stub.c
@@ -1344,6 +1344,44 @@ void gdbstub_get_mmu_state(void)
 
 } /* end gdbstub_get_mmu_state() */
 
+/*
+ * handle general query commands of the form 'qXXXXX'
+ */
+static void gdbstub_handle_query(void)
+{
+        if (strcmp(input_buffer, "qAttached") == 0) {
+                /* return current thread ID */
+                sprintf(output_buffer, "1");
+                return;
+        }
+
+        if (strcmp(input_buffer, "qC") == 0) {
+                /* return current thread ID */
+                sprintf(output_buffer, "QC 0");
+                return;
+        }
+
+        if (strcmp(input_buffer, "qOffsets") == 0) {
+                /* return relocation offset of text and data segments */
+                sprintf(output_buffer, "Text=0;Data=0;Bss=0");
+                return;
+        }
+
+        if (strcmp(input_buffer, "qSymbol::") == 0) {
+                sprintf(output_buffer, "OK");
+                return;
+        }
+
+        if (strcmp(input_buffer, "qSupported") == 0) {
+                /* query of supported features */
+                sprintf(output_buffer, "PacketSize=%u;ReverseContinue-;ReverseStep-",
+                        sizeof(input_buffer));
+                return;
+        }
+
+        gdbstub_strcpy(output_buffer,"E01");
+}
+
 /*****************************************************************************/
 /*
  * handle event interception and GDB remote protocol processing
@@ -1751,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];
@@ -1840,6 +1884,10 @@ void gdbstub(int sigval)
                 case 'k' :
                         goto done;      /* just continue */
 
+                        /* detach */
+                case 'D':
+                        gdbstub_strcpy(output_buffer, "OK");
+                        break;
 
                         /* reset the whole machine (FIXME: system dependent) */
                 case 'r':
@@ -1852,6 +1900,14 @@ void gdbstub(int sigval)
                         __debug_status.dcr |= DCR_SE;
                         goto done;
 
+                        /* extended command */
+                case 'v':
+                        if (strcmp(input_buffer, "vCont?") == 0) {
+                                output_buffer[0] = 0;
+                                break;
+                        }
+                        goto unsupported_cmd;
+
                         /* set baud rate (bBB) */
                 case 'b':
                         ptr = &input_buffer[1];
@@ -1923,8 +1979,19 @@ void gdbstub(int sigval)
                         gdbstub_strcpy(output_buffer,"OK");
                         break;
 
+                        /* Thread-setting packet */
+                case 'H':
+                        gdbstub_strcpy(output_buffer, "OK");
+                        break;
+
+                case 'q':
+                        gdbstub_handle_query();
+                        break;
+
                 default:
+                unsupported_cmd:
                         gdbstub_proto("### GDB Unsupported Cmd '%s'\n",input_buffer);
+                        gdbstub_strcpy(output_buffer,"E01");
                         break;
                 }
 
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 = . ;
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c
index 30f5d100a81c..a325d57a83d5 100644
--- a/arch/frv/mm/fault.c
+++ b/arch/frv/mm/fault.c
@@ -257,10 +257,10 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
  */
  out_of_memory:
         up_read(&mm->mmap_sem);
-        printk("VM: killing process %s\n", current->comm);
-        if (user_mode(__frame))
-                do_group_exit(SIGKILL);
-        goto no_context;
+        if (!user_mode(__frame))
+                goto no_context;
+        pagefault_out_of_memory();
+        return;
 
  do_sigbus:
         up_read(&mm->mmap_sem);
diff --git a/arch/frv/mm/tlb-miss.S b/arch/frv/mm/tlb-miss.S
index 7f392bc651a3..f3ac019bb18b 100644
--- a/arch/frv/mm/tlb-miss.S
+++ b/arch/frv/mm/tlb-miss.S
@@ -15,7 +15,7 @@
 #include <asm/pgtable.h>
 #include <asm/spr-regs.h>
 
-        .section        .text.tlbmiss
+        .section        .text..tlbmiss
         .balign         4
 
         .globl          __entry_insn_mmu_miss