git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
s390
/
kernel
/
binfmt_elf32.c
diff --git
a/arch/s390/kernel/binfmt_elf32.c
b/arch/s390/kernel/binfmt_elf32.c
index
1f451c2
..
5c46054
100644
(file)
--- a/
arch/s390/kernel/binfmt_elf32.c
+++ b/
arch/s390/kernel/binfmt_elf32.c
@@
-135,7
+135,6
@@
static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
#include <asm/processor.h>
#include <linux/module.h>
#include <asm/processor.h>
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/elfcore.h>
#include <linux/binfmts.h>
#include <linux/compat.h>
#include <linux/elfcore.h>
#include <linux/binfmts.h>
#include <linux/compat.h>
@@
-177,12
+176,6
@@
struct elf_prpsinfo32
#include <linux/highuid.h>
#include <linux/highuid.h>
-#undef NEW_TO_OLD_UID
-#undef NEW_TO_OLD_GID
-#define NEW_TO_OLD_UID(uid) ((uid) > 65535) ? (u16)overflowuid : (u16)(uid)
-#define NEW_TO_OLD_GID(gid) ((gid) > 65535) ? (u16)overflowgid : (u16)(gid)
-
-#define elf_addr_t u32
/*
#define init_elf_binfmt init_elf32_binfmt
*/
/*
#define init_elf_binfmt init_elf32_binfmt
*/