Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)
  ARM: DMA: add support for DMA debugging
  ARM: PL011: add DMA burst threshold support for ST variants
  ARM: PL011: Add support for transmit DMA
  ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
  ARM: PL011: Separate hardware FIFO size from TTY FIFO size
  ARM: PL011: Allow better handling of vendor data
  ARM: PL011: Ensure error flags are clear at startup
  ARM: PL011: include revision number in boot-time port printk
  ARM: vexpress: add sched_clock() for Versatile Express
  ARM i.MX53: Make MX53 EVK bootable
  ARM i.MX53: Some bug fix about MX53 MSL code
  ARM: 6607/1: sa1100: Update platform device registration
  ARM: 6606/1: sa1100: Fix platform device registration
  ARM i.MX51: rename IPU irqs
  ARM i.MX51: Add ipu clock support
  ARM: imx/mx27_3ds: Add PMIC support
  ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
  mx51: fix usb clock support
  MX51: Add support for usb host 2
  arch/arm/plat-mxc/ehci.c: fix errors/typos
  ...

2 files changed, 8 insertions, 4 deletions

diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index f2f32eee2c5b..038b3d1e2981 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -38,6 +38,7 @@ static void *ehdr_curr; /* current ElfXX_Ehdr *  for resource cleanup */
 static char gpfx;       /* prefix for global symbol name (sometimes '_') */
 static struct stat sb;  /* Remember .st_size, etc. */
 static jmp_buf jmpenv;  /* setjmp/longjmp per-file error escape */
+static const char *altmcount;   /* alternate mcount symbol name */
 
 /* setjmp() return values */
 enum {
@@ -299,7 +300,9 @@ do_file(char const *const fname)
                 fail_file();
         } break;
         case EM_386:     reltype = R_386_32;                   break;
-        case EM_ARM:     reltype = R_ARM_ABS32;                break;
+        case EM_ARM:     reltype = R_ARM_ABS32;
+                         altmcount = "__gnu_mcount_nc";
+                         break;
         case EM_IA_64:   reltype = R_IA64_IMM64;   gpfx = '_'; break;
         case EM_MIPS:    /* reltype: e_class    */ gpfx = '_'; break;
         case EM_PPC:     reltype = R_PPC_ADDR32;   gpfx = '_'; break;
@@ -357,7 +360,7 @@ do_file(char const *const fname)
 int
 main(int argc, char const *argv[])
 {
-        const char ftrace[] = "kernel/trace/ftrace.o";
+        const char ftrace[] = "/ftrace.o";
         int ftrace_size = sizeof(ftrace) - 1;
         int n_error = 0;  /* gcc-4.3.0 false positive complaint */
 
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index 39667174971d..baf187bee983 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -275,11 +275,12 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
                         Elf_Sym const *const symp =
                                 &sym0[Elf_r_sym(relp)];
                         char const *symname = &str0[w(symp->st_name)];
+                        char const *mcount = '_' == gpfx ? "_mcount" : "mcount";
 
                         if ('.' == symname[0])
                                 ++symname;  /* ppc64 hack */
-                        if (0 == strcmp((('_' == gpfx) ? "_mcount" : "mcount"),
-                                        symname))
+                        if (0 == strcmp(mcount, symname) ||
+                            (altmcount && 0 == strcmp(altmcount, symname)))
                                 mcountsym = Elf_r_sym(relp);
                 }