/[linux-patches]/genpatches-2.6/trunk/2.6.12-pre/1007_linux-2.6.11.8.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12-pre/1007_linux-2.6.11.8.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 4 - (show annotations) (download) (as text)
Sat Jun 11 23:20:41 2005 UTC (15 years, 5 months ago) by dsd
File MIME type: text/x-diff
File size: 11041 byte(s)
Create 2.6.12 branch
1 diff -Nru a/Makefile b/Makefile
2 --- a/Makefile 2005-04-29 18:34:37 -07:00
3 +++ b/Makefile 2005-04-29 18:34:37 -07:00
4 @@ -1,8 +1,8 @@
5 VERSION = 2
6 PATCHLEVEL = 6
7 SUBLEVEL = 11
8 -EXTRAVERSION = .7
9 -NAME=Woozy Numbat
10 +EXTRAVERSION = .8
11 +NAME=Woozy Beaver
12
13 # *DOCUMENTATION*
14 # To see a list of typical targets execute "make help"
15 diff -Nru a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
16 --- a/arch/sparc/kernel/ptrace.c 2005-04-29 18:34:37 -07:00
17 +++ b/arch/sparc/kernel/ptrace.c 2005-04-29 18:34:37 -07:00
18 @@ -531,18 +531,6 @@
19 pt_error_return(regs, EIO);
20 goto out_tsk;
21 }
22 - if (addr != 1) {
23 - if (addr & 3) {
24 - pt_error_return(regs, EINVAL);
25 - goto out_tsk;
26 - }
27 -#ifdef DEBUG_PTRACE
28 - printk ("Original: %08lx %08lx\n", child->thread.kregs->pc, child->thread.kregs->npc);
29 - printk ("Continuing with %08lx %08lx\n", addr, addr+4);
30 -#endif
31 - child->thread.kregs->pc = addr;
32 - child->thread.kregs->npc = addr + 4;
33 - }
34
35 if (request == PTRACE_SYSCALL)
36 set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
37 diff -Nru a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
38 --- a/arch/sparc64/kernel/ptrace.c 2005-04-29 18:34:37 -07:00
39 +++ b/arch/sparc64/kernel/ptrace.c 2005-04-29 18:34:37 -07:00
40 @@ -514,25 +514,6 @@
41 pt_error_return(regs, EIO);
42 goto out_tsk;
43 }
44 - if (addr != 1) {
45 - unsigned long pc_mask = ~0UL;
46 -
47 - if ((child->thread_info->flags & _TIF_32BIT) != 0)
48 - pc_mask = 0xffffffff;
49 -
50 - if (addr & 3) {
51 - pt_error_return(regs, EINVAL);
52 - goto out_tsk;
53 - }
54 -#ifdef DEBUG_PTRACE
55 - printk ("Original: %016lx %016lx\n",
56 - child->thread_info->kregs->tpc,
57 - child->thread_info->kregs->tnpc);
58 - printk ("Continuing with %016lx %016lx\n", addr, addr+4);
59 -#endif
60 - child->thread_info->kregs->tpc = (addr & pc_mask);
61 - child->thread_info->kregs->tnpc = ((addr + 4) & pc_mask);
62 - }
63
64 if (request == PTRACE_SYSCALL) {
65 set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
66 diff -Nru a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
67 --- a/arch/sparc64/kernel/signal32.c 2005-04-29 18:34:37 -07:00
68 +++ b/arch/sparc64/kernel/signal32.c 2005-04-29 18:34:38 -07:00
69 @@ -192,9 +192,12 @@
70 err |= __put_user(from->si_uid, &to->si_uid);
71 break;
72 case __SI_FAULT >> 16:
73 - case __SI_POLL >> 16:
74 err |= __put_user(from->si_trapno, &to->si_trapno);
75 err |= __put_user((unsigned long)from->si_addr, &to->si_addr);
76 + break;
77 + case __SI_POLL >> 16:
78 + err |= __put_user(from->si_band, &to->si_band);
79 + err |= __put_user(from->si_fd, &to->si_fd);
80 break;
81 case __SI_RT >> 16: /* This is not generated by the kernel as of now. */
82 case __SI_MESGQ >> 16:
83 diff -Nru a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
84 --- a/arch/sparc64/kernel/systbls.S 2005-04-29 18:34:37 -07:00
85 +++ b/arch/sparc64/kernel/systbls.S 2005-04-29 18:34:37 -07:00
86 @@ -75,7 +75,7 @@
87 /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
88 .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
89 /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
90 - .word sys_mq_timedsend, sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
91 + .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
92 /*280*/ .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl
93
94 #endif /* CONFIG_COMPAT */
95 diff -Nru a/arch/um/include/sysdep-i386/syscalls.h b/arch/um/include/sysdep-i386/syscalls.h
96 --- a/arch/um/include/sysdep-i386/syscalls.h 2005-04-29 18:34:37 -07:00
97 +++ b/arch/um/include/sysdep-i386/syscalls.h 2005-04-29 18:34:37 -07:00
98 @@ -23,6 +23,9 @@
99 unsigned long prot, unsigned long flags,
100 unsigned long fd, unsigned long pgoff);
101
102 +/* On i386 they choose a meaningless naming.*/
103 +#define __NR_kexec_load __NR_sys_kexec_load
104 +
105 #define ARCH_SYSCALLS \
106 [ __NR_waitpid ] = (syscall_handler_t *) sys_waitpid, \
107 [ __NR_break ] = (syscall_handler_t *) sys_ni_syscall, \
108 @@ -101,15 +104,12 @@
109 [ 223 ] = (syscall_handler_t *) sys_ni_syscall, \
110 [ __NR_set_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
111 [ __NR_get_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
112 - [ __NR_fadvise64 ] = (syscall_handler_t *) sys_fadvise64, \
113 [ 251 ] = (syscall_handler_t *) sys_ni_syscall, \
114 - [ __NR_remap_file_pages ] = (syscall_handler_t *) sys_remap_file_pages, \
115 - [ __NR_utimes ] = (syscall_handler_t *) sys_utimes, \
116 - [ __NR_vserver ] = (syscall_handler_t *) sys_ni_syscall,
117 -
118 + [ 285 ] = (syscall_handler_t *) sys_ni_syscall,
119 +
120 /* 222 doesn't yet have a name in include/asm-i386/unistd.h */
121
122 -#define LAST_ARCH_SYSCALL __NR_vserver
123 +#define LAST_ARCH_SYSCALL 285
124
125 /*
126 * Overrides for Emacs so that we follow Linus's tabbing style.
127 diff -Nru a/arch/um/include/sysdep-x86_64/syscalls.h b/arch/um/include/sysdep-x86_64/syscalls.h
128 --- a/arch/um/include/sysdep-x86_64/syscalls.h 2005-04-29 18:34:37 -07:00
129 +++ b/arch/um/include/sysdep-x86_64/syscalls.h 2005-04-29 18:34:37 -07:00
130 @@ -71,12 +71,7 @@
131 [ __NR_iopl ] = (syscall_handler_t *) sys_ni_syscall, \
132 [ __NR_set_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
133 [ __NR_get_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
134 - [ __NR_remap_file_pages ] = (syscall_handler_t *) sys_remap_file_pages, \
135 [ __NR_semtimedop ] = (syscall_handler_t *) sys_semtimedop, \
136 - [ __NR_fadvise64 ] = (syscall_handler_t *) sys_fadvise64, \
137 - [ 223 ] = (syscall_handler_t *) sys_ni_syscall, \
138 - [ __NR_utimes ] = (syscall_handler_t *) sys_utimes, \
139 - [ __NR_vserver ] = (syscall_handler_t *) sys_ni_syscall, \
140 [ 251 ] = (syscall_handler_t *) sys_ni_syscall,
141
142 #define LAST_ARCH_SYSCALL 251
143 diff -Nru a/arch/um/kernel/sys_call_table.c b/arch/um/kernel/sys_call_table.c
144 --- a/arch/um/kernel/sys_call_table.c 2005-04-29 18:34:37 -07:00
145 +++ b/arch/um/kernel/sys_call_table.c 2005-04-29 18:34:37 -07:00
146 @@ -48,7 +48,6 @@
147 extern syscall_handler_t old_select;
148 extern syscall_handler_t sys_modify_ldt;
149 extern syscall_handler_t sys_rt_sigsuspend;
150 -extern syscall_handler_t sys_vserver;
151 extern syscall_handler_t sys_mbind;
152 extern syscall_handler_t sys_get_mempolicy;
153 extern syscall_handler_t sys_set_mempolicy;
154 @@ -242,6 +241,7 @@
155 [ __NR_epoll_create ] = (syscall_handler_t *) sys_epoll_create,
156 [ __NR_epoll_ctl ] = (syscall_handler_t *) sys_epoll_ctl,
157 [ __NR_epoll_wait ] = (syscall_handler_t *) sys_epoll_wait,
158 + [ __NR_remap_file_pages ] = (syscall_handler_t *) sys_remap_file_pages,
159 [ __NR_set_tid_address ] = (syscall_handler_t *) sys_set_tid_address,
160 [ __NR_timer_create ] = (syscall_handler_t *) sys_timer_create,
161 [ __NR_timer_settime ] = (syscall_handler_t *) sys_timer_settime,
162 @@ -252,12 +252,10 @@
163 [ __NR_clock_gettime ] = (syscall_handler_t *) sys_clock_gettime,
164 [ __NR_clock_getres ] = (syscall_handler_t *) sys_clock_getres,
165 [ __NR_clock_nanosleep ] = (syscall_handler_t *) sys_clock_nanosleep,
166 - [ __NR_statfs64 ] = (syscall_handler_t *) sys_statfs64,
167 - [ __NR_fstatfs64 ] = (syscall_handler_t *) sys_fstatfs64,
168 [ __NR_tgkill ] = (syscall_handler_t *) sys_tgkill,
169 [ __NR_utimes ] = (syscall_handler_t *) sys_utimes,
170 - [ __NR_fadvise64_64 ] = (syscall_handler_t *) sys_fadvise64_64,
171 - [ __NR_vserver ] = (syscall_handler_t *) sys_vserver,
172 + [ __NR_fadvise64 ] = (syscall_handler_t *) sys_fadvise64,
173 + [ __NR_vserver ] = (syscall_handler_t *) sys_ni_syscall,
174 [ __NR_mbind ] = (syscall_handler_t *) sys_mbind,
175 [ __NR_get_mempolicy ] = (syscall_handler_t *) sys_get_mempolicy,
176 [ __NR_set_mempolicy ] = (syscall_handler_t *) sys_set_mempolicy,
177 @@ -267,9 +265,8 @@
178 [ __NR_mq_timedreceive ] = (syscall_handler_t *) sys_mq_timedreceive,
179 [ __NR_mq_notify ] = (syscall_handler_t *) sys_mq_notify,
180 [ __NR_mq_getsetattr ] = (syscall_handler_t *) sys_mq_getsetattr,
181 - [ __NR_sys_kexec_load ] = (syscall_handler_t *) sys_ni_syscall,
182 + [ __NR_kexec_load ] = (syscall_handler_t *) sys_ni_syscall,
183 [ __NR_waitid ] = (syscall_handler_t *) sys_waitid,
184 - [ 285 ] = (syscall_handler_t *) sys_ni_syscall,
185 [ __NR_add_key ] = (syscall_handler_t *) sys_add_key,
186 [ __NR_request_key ] = (syscall_handler_t *) sys_request_key,
187 [ __NR_keyctl ] = (syscall_handler_t *) sys_keyctl,
188 diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
189 --- a/drivers/i2c/chips/it87.c 2005-04-29 18:34:37 -07:00
190 +++ b/drivers/i2c/chips/it87.c 2005-04-29 18:34:37 -07:00
191 @@ -631,7 +631,7 @@
192 struct it87_data *data = it87_update_device(dev);
193 return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
194 }
195 -static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL);
196 +static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
197
198 static ssize_t
199 show_vrm_reg(struct device *dev, char *buf)
200 diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c
201 --- a/drivers/i2c/chips/via686a.c 2005-04-29 18:34:37 -07:00
202 +++ b/drivers/i2c/chips/via686a.c 2005-04-29 18:34:37 -07:00
203 @@ -554,7 +554,7 @@
204 struct via686a_data *data = via686a_update_device(dev);
205 return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
206 }
207 -static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL);
208 +static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
209
210 /* The driver. I choose to use type i2c_driver, as at is identical to both
211 smbus_driver and isa_driver, and clients could be of either kind */
212 diff -Nru a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
213 --- a/drivers/media/video/bttv-cards.c 2005-04-29 18:34:37 -07:00
214 +++ b/drivers/media/video/bttv-cards.c 2005-04-29 18:34:37 -07:00
215 @@ -2718,8 +2718,6 @@
216 }
217 btv->pll.pll_current = -1;
218
219 - bttv_reset_audio(btv);
220 -
221 /* tuner configuration (from card list / autodetect / insmod option) */
222 if (UNSET != bttv_tvcards[btv->c.type].tuner_type)
223 if(UNSET == btv->tuner_type)
224 diff -Nru a/fs/partitions/msdos.c b/fs/partitions/msdos.c
225 --- a/fs/partitions/msdos.c 2005-04-29 18:34:37 -07:00
226 +++ b/fs/partitions/msdos.c 2005-04-29 18:34:37 -07:00
227 @@ -114,6 +114,9 @@
228 */
229 for (i=0; i<4; i++, p++) {
230 u32 offs, size, next;
231 +
232 + if (SYS_IND(p) == 0)
233 + continue;
234 if (!NR_SECTS(p) || is_extended_partition(p))
235 continue;
236
237 @@ -430,6 +433,8 @@
238 for (slot = 1 ; slot <= 4 ; slot++, p++) {
239 u32 start = START_SECT(p)*sector_size;
240 u32 size = NR_SECTS(p)*sector_size;
241 + if (SYS_IND(p) == 0)
242 + continue;
243 if (!size)
244 continue;
245 if (is_extended_partition(p)) {
246 diff -Nru a/security/keys/key.c b/security/keys/key.c
247 --- a/security/keys/key.c 2005-04-29 18:34:37 -07:00
248 +++ b/security/keys/key.c 2005-04-29 18:34:37 -07:00
249 @@ -57,9 +57,10 @@
250 {
251 struct key_user *candidate = NULL, *user;
252 struct rb_node *parent = NULL;
253 - struct rb_node **p = &key_user_tree.rb_node;
254 + struct rb_node **p;
255
256 try_again:
257 + p = &key_user_tree.rb_node;
258 spin_lock(&key_user_lock);
259
260 /* search the tree for a user record with a matching UID */

  ViewVC Help
Powered by ViewVC 1.1.20