/[linux-patches]/genpatches-2.6/tags/2.6.15-11/1055_linux-2.6.15.6.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.15-11/1055_linux-2.6.15.6.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 351 - (show annotations) (download)
Wed Mar 29 11:55:38 2006 UTC (11 years, 9 months ago) by dsd
File size: 2201 byte(s)
2.6.15-11 release
1 diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
2 index 43b45b6..f2bc971 100644
3 --- a/arch/ia64/kernel/unaligned.c
4 +++ b/arch/ia64/kernel/unaligned.c
5 @@ -24,7 +24,7 @@
6 #include <asm/uaccess.h>
7 #include <asm/unaligned.h>
8
9 -extern void die_if_kernel(char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn));
10 +extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
11
12 #undef DEBUG_UNALIGNED_TRAP
13
14 diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
15 index 3ebb06e..96c104b 100644
16 --- a/fs/nfs/direct.c
17 +++ b/fs/nfs/direct.c
18 @@ -57,6 +57,7 @@
19 #define NFSDBG_FACILITY NFSDBG_VFS
20 #define MAX_DIRECTIO_SIZE (4096UL << PAGE_SHIFT)
21
22 +static void nfs_free_user_pages(struct page **pages, int npages, int do_dirty);
23 static kmem_cache_t *nfs_direct_cachep;
24
25 /*
26 @@ -106,12 +107,16 @@ nfs_get_user_pages(int rw, unsigned long
27 result = get_user_pages(current, current->mm, user_addr,
28 page_count, (rw == READ), 0,
29 *pages, NULL);
30 + up_read(&current->mm->mmap_sem);
31 + /*
32 + * If we got fewer pages than expected from get_user_pages(),
33 + * the user buffer runs off the end of a mapping; return EFAULT.
34 + */
35 if (result >= 0 && result < page_count) {
36 nfs_free_user_pages(*pages, result, 0);
37 *pages = NULL;
38 result = -EFAULT;
39 }
40 - up_read(&current->mm->mmap_sem);
41 }
42 return result;
43 }
44 diff --git a/include/linux/types.h b/include/linux/types.h
45 index 21b9ce8..f5a4572 100644
46 --- a/include/linux/types.h
47 +++ b/include/linux/types.h
48 @@ -8,6 +8,7 @@
49 (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
50 #define DECLARE_BITMAP(name,bits) \
51 unsigned long name[BITS_TO_LONGS(bits)]
52 +#define BITS_PER_BYTE 8
53 #endif
54
55 #include <linux/posix_types.h>
56 diff --git a/net/core/request_sock.c b/net/core/request_sock.c
57 index b8203de..98f0fc9 100644
58 --- a/net/core/request_sock.c
59 +++ b/net/core/request_sock.c
60 @@ -52,7 +52,6 @@ int reqsk_queue_alloc(struct request_soc
61 get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd));
62 rwlock_init(&queue->syn_wait_lock);
63 queue->rskq_accept_head = queue->rskq_accept_head = NULL;
64 - queue->rskq_defer_accept = 0;
65 lopt->nr_table_entries = nr_table_entries;
66
67 write_lock_bh(&queue->syn_wait_lock);

  ViewVC Help
Powered by ViewVC 1.1.20