Merge remote-tracking branch 'oneiric-ubuntu/pandaboard' into pandaboard-litmus

Remote branch is from Ubuntu Oneiric (tag Ubuntu-3.0.0-1215.27) with
minor patch to the TWL-RTC code. Trying to pull this into LITMUS^RT
staging (as of 9/20/2012) to get LITMUS^RT running on the PandaBoard.

Conflicts:
	Makefile
	fs/exec.c
	include/linux/fs.h
	kernel/fork.c

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 99845622986..4e20f0dea7e 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -58,6 +58,8 @@
 
 #include <litmus/litmus.h>
 
+#include <trace/events/fs.h>
+
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 #include <asm/tlb.h>
@@ -791,6 +793,8 @@ struct file *open_exec(const char *name)
 
         fsnotify_open(file);
 
+        trace_open_exec(name);
+
         err = deny_write_access(file);
         if (err)
                 goto exit;
@@ -1413,6 +1417,8 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
                             printable(bprm->buf[2]) &&
                             printable(bprm->buf[3]))
                                 break; /* -ENOEXEC */
+                        if (try)
+                                break; /* -ENOEXEC */
                         request_module("binfmt-%04x", *(unsigned short *)(&bprm->buf[2]));
 #endif
                 }