diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
| commit | 86579dd06deecfa6ac88d5e84e4d63c397cd6f6d (patch) | |
| tree | b4475d3ccde53015ad84a06e4e55e64591171b75 /fs/binfmt_elf_fdpic.c | |
| parent | 7ea9ea832212c4a755650f7c7cc1ff0b63292a41 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/binfmt_elf_fdpic.c')
| -rw-r--r-- | fs/binfmt_elf_fdpic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 5b3076e8ee90..a2e48c999c24 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c | |||
| @@ -572,8 +572,7 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, | |||
| 572 | csp -= sizeof(unsigned long); | 572 | csp -= sizeof(unsigned long); |
| 573 | __put_user(bprm->argc, (unsigned long *) csp); | 573 | __put_user(bprm->argc, (unsigned long *) csp); |
| 574 | 574 | ||
| 575 | if (csp != sp) | 575 | BUG_ON(csp != sp); |
| 576 | BUG(); | ||
| 577 | 576 | ||
| 578 | /* fill in the argv[] array */ | 577 | /* fill in the argv[] array */ |
| 579 | #ifdef CONFIG_MMU | 578 | #ifdef CONFIG_MMU |