diff options
| author | James Simmons <jsimmons@kozmo.(none)> | 2002-12-26 06:51:17 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@kozmo.(none)> | 2002-12-26 06:51:17 -0800 |
| commit | 5f1c1289fcb061b2cd9025de01474aab0bef6444 (patch) | |
| tree | 93eaaaa9c64a9923ce0c6e83d719e5585819d061 | |
| parent | d140e20186256063e935376010b4a0a85a5e3513 (diff) | |
| parent | 99a6e15b856ffd9a91f6d85dfaa09d3a38857d7f (diff) | |
Merge kozmo.(none):/usr/src/linus-2.5
into kozmo.(none):/usr/src/fbdev-2.5
| -rw-r--r-- | arch/i386/kernel/suspend_asm.S | 3 | ||||
| -rw-r--r-- | fs/select.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/i386/kernel/suspend_asm.S b/arch/i386/kernel/suspend_asm.S index e454ec55b824..6fe892675869 100644 --- a/arch/i386/kernel/suspend_asm.S +++ b/arch/i386/kernel/suspend_asm.S @@ -64,9 +64,10 @@ ENTRY(do_magic) jb .L1455 .p2align 4,,7 .L1453: - movl $104,%eax + movl $__USER_DS,%eax movw %ax, %ds + movw %ax, %es movl saved_context_esp, %esp movl saved_context_ebp, %ebp movl saved_context_eax, %eax diff --git a/fs/select.c b/fs/select.c index 456465510c09..510e1defe964 100644 --- a/fs/select.c +++ b/fs/select.c @@ -471,7 +471,7 @@ asmlinkage long sys_poll(struct pollfd * ufds, unsigned int nfds, long timeout) walk->next = pp; walk = pp; - if (copy_from_user(pp+1, ufds + nfds-i, + if (copy_from_user(pp->entries, ufds + nfds-i, sizeof(struct pollfd)*pp->len)) { err = -EFAULT; goto out_fds; |