summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/binfmt_elf32.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-01-18 00:34:51 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2007-01-18 00:34:51 +0100
commit9cdf083f981b8d37b3212400a359368661385099 (patch)
treeaa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/sparc64/kernel/binfmt_elf32.c
parent[JFFS2] debug.h: include <linux/sched.h> for current->pid (diff)
parentLinux v2.6.20-rc5 (diff)
downloadlinux-9cdf083f981b8d37b3212400a359368661385099.tar.xz
linux-9cdf083f981b8d37b3212400a359368661385099.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc64/kernel/binfmt_elf32.c')
-rw-r--r--arch/sparc64/kernel/binfmt_elf32.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/binfmt_elf32.c b/arch/sparc64/kernel/binfmt_elf32.c
index a98f3ae175a3..9ad84ff10a17 100644
--- a/arch/sparc64/kernel/binfmt_elf32.c
+++ b/arch/sparc64/kernel/binfmt_elf32.c
@@ -141,7 +141,6 @@ cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)
value->tv_sec = jiffies / HZ;
}
-#define elf_addr_t u32
#undef start_thread
#define start_thread start_thread32
#define init_elf_binfmt init_elf32_binfmt