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
/
um
/
sys-i386
/
user-offsets.c
diff --git
a/arch/um/sys-i386/user-offsets.c
b/arch/um/sys-i386/user-offsets.c
index
26b6867
..
447306b
100644
(file)
--- a/
arch/um/sys-i386/user-offsets.c
+++ b/
arch/um/sys-i386/user-offsets.c
@@
-2,13
+2,14
@@
#include <signal.h>
#include <asm/ptrace.h>
#include <asm/user.h>
#include <signal.h>
#include <asm/ptrace.h>
#include <asm/user.h>
-#include <linux/stddef.h>
+#include <stddef.h>
+#include <sys/poll.h>
#define DEFINE(sym, val) \
#define DEFINE(sym, val) \
-
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+ asm volatile("\n->" #sym " %0 " #val : : "i" (val))
#define DEFINE_LONGS(sym, val) \
#define DEFINE_LONGS(sym, val) \
-
asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long)))
+ asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long)))
#define OFFSET(sym, str, mem) \
DEFINE(sym, offsetof(struct str, mem));
#define OFFSET(sym, str, mem) \
DEFINE(sym, offsetof(struct str, mem));
@@
-67,4
+68,9
@@
void foo(void)
DEFINE(HOST_ES, ES);
DEFINE(HOST_GS, GS);
DEFINE(UM_FRAME_SIZE, sizeof(struct user_regs_struct));
DEFINE(HOST_ES, ES);
DEFINE(HOST_GS, GS);
DEFINE(UM_FRAME_SIZE, sizeof(struct user_regs_struct));
+
+ /* XXX Duplicated between i386 and x86_64 */
+ DEFINE(UM_POLLIN, POLLIN);
+ DEFINE(UM_POLLPRI, POLLPRI);
+ DEFINE(UM_POLLOUT, POLLOUT);
}
}