From 59f339ce89e09c57908e9985005da181bb7910e7 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 16 Jun 2008 12:18:13 +0100
Subject: [PATCH] --- yaml --- r: 98139 b: refs/heads/master c:
 a9e0f5293d4999f93b469af4e70382db800a8204 h: refs/heads/master i:   98137:
 54808c921712736f2f7379435cf9de7a1ce8c1da   98135:
 415aeb2a7865ae82d979a5c5ef80dc6ac7147115 v: v3

---
 [refs]                | 2 +-
 trunk/fs/binfmt_elf.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 528868a4b412..9ed4cafcc596 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 702773b16e83fcddc41e0019b8214d3c3cecedbe
+refs/heads/master: a9e0f5293d4999f93b469af4e70382db800a8204
diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c
index 0fa95b198e6e..d48ff5f370f4 100644
--- a/trunk/fs/binfmt_elf.c
+++ b/trunk/fs/binfmt_elf.c
@@ -16,7 +16,6 @@
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
-#include <linux/a.out.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/binfmts.h>
@@ -548,7 +547,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	struct {
 		struct elfhdr elf_ex;
 		struct elfhdr interp_elf_ex;
-  		struct exec interp_ex;
 	} *loc;
 
 	loc = kmalloc(sizeof(*loc), GFP_KERNEL);
@@ -680,7 +678,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 			}
 
 			/* Get the exec headers */
-			loc->interp_ex = *((struct exec *)bprm->buf);
 			loc->interp_elf_ex = *((struct elfhdr *)bprm->buf);
 			break;
 		}