Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (80 commits)
  [MIPS] tlbex.c: Cleanup __init usage.
  [MIPS] WRPPMC serial support move to platform device
  [MIPS] R1: Fix hazard barriers to make kernels work on R2 also.
  [MIPS] VPE: reimplement ELF loader.
  [MIPS] cleanup WRPPMC include files
  [MIPS] Add BUG_ON assertion for attempt to run kernel on the wrong CPU type.
  [MIPS] SMP: Use ISO C struct initializer for local structs.
  [MIPS] SMP: Kill useless casts.
  [MIPS] Kill num_online_cpus() loops.
  [MIPS] SMP: Implement smp_call_function_mask().
  [MIPS] Make facility to convert CPU types to strings generally available.
  [MIPS] Convert list of CPU types from #define to enum.
  [MIPS] Optimize get_unaligned / put_unaligned implementations.
  [MIPS] checkfiles: Fix "need space after that ','" errors.
  [MIPS] Fix "no space between function name and open parenthesis" warnings.
  [MIPS] Allow hardwiring of the CPU type to a single type for optimization.
  [MIPS] tlbex: Size optimize code by declaring a few functions inline.
  [MIPS] pg-r4k.c: Dump the generated code
  [MIPS] Cobalt: Remove cobalt_machine_power_off()
  [MIPS] Cobalt: Move reset port definition to arch/mips/cobalt/reset.c
  ...

1 files changed, 12 insertions, 35 deletions

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 3c09b9785f4c..61b729fa0548 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -936,8 +936,18 @@ static int vpe_elfload(struct vpe * v)
 
                 }
         } else {
-                for (i = 0; i < hdr->e_shnum; i++) {
+                struct elf_phdr *phdr = (struct elf_phdr *) ((char *)hdr + hdr->e_phoff);
 
+                for (i = 0; i < hdr->e_phnum; i++) {
+                        if (phdr->p_type != PT_LOAD)
+                                continue;
+
+                        memcpy((void *)phdr->p_vaddr, (char *)hdr + phdr->p_offset, phdr->p_filesz);
+                        memset((void *)phdr->p_vaddr + phdr->p_filesz, 0, phdr->p_memsz - phdr->p_filesz);
+                        phdr++;
+                }
+
+                for (i = 0; i < hdr->e_shnum; i++) {
                         /* Internal symbols and strings. */
                         if (sechdrs[i].sh_type == SHT_SYMTAB) {
                                 symindex = i;
@@ -948,39 +958,6 @@ static int vpe_elfload(struct vpe * v)
                                    magic symbols */
                                 sechdrs[i].sh_addr = (size_t) hdr + sechdrs[i].sh_offset;
                         }
-
-                        /* filter sections we dont want in the final image */
-                        if (!(sechdrs[i].sh_flags & SHF_ALLOC) ||
-                            (sechdrs[i].sh_type == SHT_MIPS_REGINFO)) {
-                                printk( KERN_DEBUG " ignoring section, "
-                                        "name %s type %x address 0x%x \n",
-                                        secstrings + sechdrs[i].sh_name,
-                                        sechdrs[i].sh_type, sechdrs[i].sh_addr);
-                                continue;
-                        }
-
-                        if (sechdrs[i].sh_addr < (unsigned int)v->load_addr) {
-                                printk( KERN_WARNING "VPE loader: "
-                                        "fully linked image has invalid section, "
-                                        "name %s type %x address 0x%x, before load "
-                                        "address of 0x%x\n",
-                                        secstrings + sechdrs[i].sh_name,
-                                        sechdrs[i].sh_type, sechdrs[i].sh_addr,
-                                        (unsigned int)v->load_addr);
-                                return -ENOEXEC;
-                        }
-
-                        printk(KERN_DEBUG " copying section sh_name %s, sh_addr 0x%x "
-                               "size 0x%x0 from x%p\n",
-                               secstrings + sechdrs[i].sh_name, sechdrs[i].sh_addr,
-                               sechdrs[i].sh_size, hdr + sechdrs[i].sh_offset);
-
-                        if (sechdrs[i].sh_type != SHT_NOBITS)
-                                memcpy((void *)sechdrs[i].sh_addr,
-                                       (char *)hdr + sechdrs[i].sh_offset,
-                                       sechdrs[i].sh_size);
-                        else
-                                memset((void *)sechdrs[i].sh_addr, 0, sechdrs[i].sh_size);
                 }
         }
 
@@ -1044,7 +1021,7 @@ static int getcwd(char *buff, int size)
         old_fs = get_fs();
         set_fs(KERNEL_DS);
 
-        ret = sys_getcwd(buff,size);
+        ret = sys_getcwd(buff, size);
 
         set_fs(old_fs);