-
Notifications
You must be signed in to change notification settings - Fork 0
/
kernel.patch
2514 lines (2279 loc) · 96.3 KB
/
kernel.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -urpN linux-2.6.35.8/Makefile linux-2.6.35.9/Makefile
--- linux-2.6.35.8/Makefile 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/Makefile 2010-11-23 04:01:26.000000000 +0900
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 35
-EXTRAVERSION = .8
+EXTRAVERSION = .9
NAME = Yokohama
# *DOCUMENTATION*
diff -urpN linux-2.6.35.8/arch/arm/mach-cns3xxx/include/mach/debug-macro.S linux-2.6.35.9/arch/arm/mach-cns3xxx/include/mach/debug-macro.S
--- linux-2.6.35.8/arch/arm/mach-cns3xxx/include/mach/debug-macro.S 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/arm/mach-cns3xxx/include/mach/debug-macro.S 2010-11-23 04:01:26.000000000 +0900
@@ -10,7 +10,7 @@
* published by the Free Software Foundation.
*/
- .macro addruart,rx
+ .macro addruart,rx,rtmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #0x10000000
diff -urpN linux-2.6.35.8/arch/powerpc/kernel/ppc970-pmu.c linux-2.6.35.9/arch/powerpc/kernel/ppc970-pmu.c
--- linux-2.6.35.8/arch/powerpc/kernel/ppc970-pmu.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/powerpc/kernel/ppc970-pmu.c 2010-11-23 04:01:26.000000000 +0900
@@ -169,9 +169,11 @@ static int p970_marked_instr_event(u64 e
switch (unit) {
case PM_VPU:
mask = 0x4c; /* byte 0 bits 2,3,6 */
+ break;
case PM_LSU0:
/* byte 2 bits 0,2,3,4,6; all of byte 1 */
mask = 0x085dff00;
+ break;
case PM_LSU1L:
mask = 0x50 << 24; /* byte 3 bits 4,6 */
break;
diff -urpN linux-2.6.35.8/arch/x86/include/asm/cpufeature.h linux-2.6.35.9/arch/x86/include/asm/cpufeature.h
--- linux-2.6.35.8/arch/x86/include/asm/cpufeature.h 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/include/asm/cpufeature.h 2010-11-23 04:01:26.000000000 +0900
@@ -150,7 +150,7 @@
#define X86_FEATURE_3DNOWPREFETCH (6*32+ 8) /* 3DNow prefetch instructions */
#define X86_FEATURE_OSVW (6*32+ 9) /* OS Visible Workaround */
#define X86_FEATURE_IBS (6*32+10) /* Instruction Based Sampling */
-#define X86_FEATURE_SSE5 (6*32+11) /* SSE-5 */
+#define X86_FEATURE_XOP (6*32+11) /* extended AVX instructions */
#define X86_FEATURE_SKINIT (6*32+12) /* SKINIT/STGI instructions */
#define X86_FEATURE_WDT (6*32+13) /* Watchdog timer */
#define X86_FEATURE_NODEID_MSR (6*32+19) /* NodeId MSR */
diff -urpN linux-2.6.35.8/arch/x86/include/asm/io.h linux-2.6.35.9/arch/x86/include/asm/io.h
--- linux-2.6.35.8/arch/x86/include/asm/io.h 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/include/asm/io.h 2010-11-23 04:01:26.000000000 +0900
@@ -206,6 +206,7 @@ static inline void __iomem *ioremap(reso
extern void iounmap(volatile void __iomem *addr);
+extern void set_iounmap_nonlazy(void);
#ifdef __KERNEL__
diff -urpN linux-2.6.35.8/arch/x86/include/asm/kvm_emulate.h linux-2.6.35.9/arch/x86/include/asm/kvm_emulate.h
--- linux-2.6.35.8/arch/x86/include/asm/kvm_emulate.h 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/include/asm/kvm_emulate.h 2010-11-23 04:01:26.000000000 +0900
@@ -143,7 +143,15 @@ struct x86_emulate_ops {
struct operand {
enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type;
unsigned int bytes;
- unsigned long val, orig_val, *ptr;
+ union {
+ unsigned long orig_val;
+ u64 orig_val64;
+ };
+ unsigned long *ptr;
+ union {
+ unsigned long val;
+ u64 val64;
+ };
};
struct fetch_cache {
diff -urpN linux-2.6.35.8/arch/x86/include/asm/smp.h linux-2.6.35.9/arch/x86/include/asm/smp.h
--- linux-2.6.35.8/arch/x86/include/asm/smp.h 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/include/asm/smp.h 2010-11-23 04:01:26.000000000 +0900
@@ -50,7 +50,7 @@ struct smp_ops {
void (*smp_prepare_cpus)(unsigned max_cpus);
void (*smp_cpus_done)(unsigned max_cpus);
- void (*smp_send_stop)(void);
+ void (*stop_other_cpus)(int wait);
void (*smp_send_reschedule)(int cpu);
int (*cpu_up)(unsigned cpu);
@@ -73,7 +73,12 @@ extern struct smp_ops smp_ops;
static inline void smp_send_stop(void)
{
- smp_ops.smp_send_stop();
+ smp_ops.stop_other_cpus(0);
+}
+
+static inline void stop_other_cpus(void)
+{
+ smp_ops.stop_other_cpus(1);
}
static inline void smp_prepare_boot_cpu(void)
diff -urpN linux-2.6.35.8/arch/x86/kernel/apic/io_apic.c linux-2.6.35.9/arch/x86/kernel/apic/io_apic.c
--- linux-2.6.35.8/arch/x86/kernel/apic/io_apic.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/apic/io_apic.c 2010-11-23 04:01:26.000000000 +0900
@@ -1397,6 +1397,7 @@ int setup_ioapic_entry(int apic_id, int
irte.dlvry_mode = apic->irq_delivery_mode;
irte.vector = vector;
irte.dest_id = IRTE_DEST(destination);
+ irte.redir_hint = 1;
/* Set source-id of interrupt request */
set_ioapic_sid(&irte, apic_id);
@@ -3348,6 +3349,7 @@ static int msi_compose_msg(struct pci_de
irte.dlvry_mode = apic->irq_delivery_mode;
irte.vector = cfg->vector;
irte.dest_id = IRTE_DEST(dest);
+ irte.redir_hint = 1;
/* Set source-id of interrupt request */
if (pdev)
diff -urpN linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/cleanup.c linux-2.6.35.9/arch/x86/kernel/cpu/mtrr/cleanup.c
--- linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/cleanup.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/cpu/mtrr/cleanup.c 2010-11-23 04:01:26.000000000 +0900
@@ -827,7 +827,7 @@ int __init amd_special_default_mtrr(void
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
return 0;
- if (boot_cpu_data.x86 < 0xf || boot_cpu_data.x86 > 0x11)
+ if (boot_cpu_data.x86 < 0xf)
return 0;
/* In case some hypervisor doesn't pass SYSCFG through: */
if (rdmsr_safe(MSR_K8_SYSCFG, &l, &h) < 0)
diff -urpN linux-2.6.35.8/arch/x86/kernel/cpu/perf_event_amd.c linux-2.6.35.9/arch/x86/kernel/cpu/perf_event_amd.c
--- linux-2.6.35.8/arch/x86/kernel/cpu/perf_event_amd.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/cpu/perf_event_amd.c 2010-11-23 04:01:26.000000000 +0900
@@ -52,7 +52,7 @@ static __initconst const u64 amd_hw_cach
[ C(DTLB) ] = {
[ C(OP_READ) ] = {
[ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses */
- [ C(RESULT_MISS) ] = 0x0046, /* L1 DTLB and L2 DLTB Miss */
+ [ C(RESULT_MISS) ] = 0x0746, /* L1_DTLB_AND_L2_DLTB_MISS.ALL */
},
[ C(OP_WRITE) ] = {
[ C(RESULT_ACCESS) ] = 0,
@@ -66,7 +66,7 @@ static __initconst const u64 amd_hw_cach
[ C(ITLB) ] = {
[ C(OP_READ) ] = {
[ C(RESULT_ACCESS) ] = 0x0080, /* Instruction fecthes */
- [ C(RESULT_MISS) ] = 0x0085, /* Instr. fetch ITLB misses */
+ [ C(RESULT_MISS) ] = 0x0385, /* L1_ITLB_AND_L2_ITLB_MISS.ALL */
},
[ C(OP_WRITE) ] = {
[ C(RESULT_ACCESS) ] = -1,
diff -urpN linux-2.6.35.8/arch/x86/kernel/crash_dump_64.c linux-2.6.35.9/arch/x86/kernel/crash_dump_64.c
--- linux-2.6.35.8/arch/x86/kernel/crash_dump_64.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/crash_dump_64.c 2010-11-23 04:01:26.000000000 +0900
@@ -34,7 +34,7 @@ ssize_t copy_oldmem_page(unsigned long p
if (!csize)
return 0;
- vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);
+ vaddr = ioremap_cache(pfn << PAGE_SHIFT, PAGE_SIZE);
if (!vaddr)
return -ENOMEM;
@@ -46,6 +46,7 @@ ssize_t copy_oldmem_page(unsigned long p
} else
memcpy(buf, vaddr + offset, csize);
+ set_iounmap_nonlazy();
iounmap(vaddr);
return csize;
}
diff -urpN linux-2.6.35.8/arch/x86/kernel/olpc.c linux-2.6.35.9/arch/x86/kernel/olpc.c
--- linux-2.6.35.8/arch/x86/kernel/olpc.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/olpc.c 2010-11-23 04:01:26.000000000 +0900
@@ -117,6 +117,7 @@ int olpc_ec_cmd(unsigned char cmd, unsig
unsigned long flags;
int ret = -EIO;
int i;
+ int restarts = 0;
spin_lock_irqsave(&ec_lock, flags);
@@ -173,7 +174,9 @@ restart:
if (wait_on_obf(0x6c, 1)) {
printk(KERN_ERR "olpc-ec: timeout waiting for"
" EC to provide data!\n");
- goto restart;
+ if (restarts++ < 10)
+ goto restart;
+ goto err;
}
outbuf[i] = inb(0x68);
printk(KERN_DEBUG "olpc-ec: received 0x%x\n",
diff -urpN linux-2.6.35.8/arch/x86/kernel/reboot.c linux-2.6.35.9/arch/x86/kernel/reboot.c
--- linux-2.6.35.8/arch/x86/kernel/reboot.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/reboot.c 2010-11-23 04:01:26.000000000 +0900
@@ -641,7 +641,7 @@ void native_machine_shutdown(void)
/* O.K Now that I'm on the appropriate processor,
* stop all of the others.
*/
- smp_send_stop();
+ stop_other_cpus();
#endif
lapic_shutdown();
diff -urpN linux-2.6.35.8/arch/x86/kernel/smp.c linux-2.6.35.9/arch/x86/kernel/smp.c
--- linux-2.6.35.8/arch/x86/kernel/smp.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/smp.c 2010-11-23 04:01:26.000000000 +0900
@@ -159,10 +159,10 @@ asmlinkage void smp_reboot_interrupt(voi
irq_exit();
}
-static void native_smp_send_stop(void)
+static void native_stop_other_cpus(int wait)
{
unsigned long flags;
- unsigned long wait;
+ unsigned long timeout;
if (reboot_force)
return;
@@ -179,9 +179,12 @@ static void native_smp_send_stop(void)
if (num_online_cpus() > 1) {
apic->send_IPI_allbutself(REBOOT_VECTOR);
- /* Don't wait longer than a second */
- wait = USEC_PER_SEC;
- while (num_online_cpus() > 1 && wait--)
+ /*
+ * Don't wait longer than a second if the caller
+ * didn't ask us to wait.
+ */
+ timeout = USEC_PER_SEC;
+ while (num_online_cpus() > 1 && (wait || timeout--))
udelay(1);
}
@@ -227,7 +230,7 @@ struct smp_ops smp_ops = {
.smp_prepare_cpus = native_smp_prepare_cpus,
.smp_cpus_done = native_smp_cpus_done,
- .smp_send_stop = native_smp_send_stop,
+ .stop_other_cpus = native_stop_other_cpus,
.smp_send_reschedule = native_smp_send_reschedule,
.cpu_up = native_cpu_up,
diff -urpN linux-2.6.35.8/arch/x86/kernel/traps.c linux-2.6.35.9/arch/x86/kernel/traps.c
--- linux-2.6.35.8/arch/x86/kernel/traps.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/traps.c 2010-11-23 04:01:26.000000000 +0900
@@ -568,6 +568,7 @@ dotraplinkage void __kprobes do_debug(st
if (regs->flags & X86_VM_MASK) {
handle_vm86_trap((struct kernel_vm86_regs *) regs,
error_code, 1);
+ preempt_conditional_cli(regs);
return;
}
diff -urpN linux-2.6.35.8/arch/x86/kernel/vm86_32.c linux-2.6.35.9/arch/x86/kernel/vm86_32.c
--- linux-2.6.35.8/arch/x86/kernel/vm86_32.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kernel/vm86_32.c 2010-11-23 04:01:26.000000000 +0900
@@ -551,8 +551,14 @@ cannot_handle:
int handle_vm86_trap(struct kernel_vm86_regs *regs, long error_code, int trapno)
{
if (VMPI.is_vm86pus) {
- if ((trapno == 3) || (trapno == 1))
- return_to_32bit(regs, VM86_TRAP + (trapno << 8));
+ if ((trapno == 3) || (trapno == 1)) {
+ KVM86->regs32->ax = VM86_TRAP + (trapno << 8);
+ /* setting this flag forces the code in entry_32.S to
+ call save_v86_state() and change the stack pointer
+ to KVM86->regs32 */
+ set_thread_flag(TIF_IRET);
+ return 0;
+ }
do_int(regs, trapno, (unsigned char __user *) (regs->pt.ss << 4), SP(regs));
return 0;
}
diff -urpN linux-2.6.35.8/arch/x86/kvm/emulate.c linux-2.6.35.9/arch/x86/kvm/emulate.c
--- linux-2.6.35.8/arch/x86/kvm/emulate.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kvm/emulate.c 2010-11-23 04:01:26.000000000 +0900
@@ -1712,17 +1712,16 @@ static inline int emulate_grp9(struct x8
struct x86_emulate_ops *ops)
{
struct decode_cache *c = &ctxt->decode;
- u64 old = c->dst.orig_val;
+ u64 old = c->dst.orig_val64;
if (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) ||
((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) {
-
c->regs[VCPU_REGS_RAX] = (u32) (old >> 0);
c->regs[VCPU_REGS_RDX] = (u32) (old >> 32);
ctxt->eflags &= ~EFLG_ZF;
} else {
- c->dst.val = ((u64)c->regs[VCPU_REGS_RCX] << 32) |
- (u32) c->regs[VCPU_REGS_RBX];
+ c->dst.val64 = ((u64)c->regs[VCPU_REGS_RCX] << 32) |
+ (u32) c->regs[VCPU_REGS_RBX];
ctxt->eflags |= EFLG_ZF;
}
@@ -2535,7 +2534,7 @@ x86_emulate_insn(struct x86_emulate_ctxt
ctxt->vcpu);
if (rc != X86EMUL_CONTINUE)
goto done;
- c->src.orig_val = c->src.val;
+ c->src.orig_val64 = c->src.val64;
}
if (c->src2.type == OP_MEM) {
diff -urpN linux-2.6.35.8/arch/x86/kvm/svm.c linux-2.6.35.9/arch/x86/kvm/svm.c
--- linux-2.6.35.8/arch/x86/kvm/svm.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kvm/svm.c 2010-11-23 04:01:26.000000000 +0900
@@ -87,6 +87,14 @@ struct nested_state {
/* A VMEXIT is required but not yet emulated */
bool exit_required;
+ /*
+ * If we vmexit during an instruction emulation we need this to restore
+ * the l1 guest rip after the emulation
+ */
+ unsigned long vmexit_rip;
+ unsigned long vmexit_rsp;
+ unsigned long vmexit_rax;
+
/* cache for intercepts of the guest */
u16 intercept_cr_read;
u16 intercept_cr_write;
@@ -1201,8 +1209,12 @@ static void svm_set_cr0(struct kvm_vcpu
if (old == new) {
/* cr0 write with ts and mp unchanged */
svm->vmcb->control.exit_code = SVM_EXIT_CR0_SEL_WRITE;
- if (nested_svm_exit_handled(svm) == NESTED_EXIT_DONE)
+ if (nested_svm_exit_handled(svm) == NESTED_EXIT_DONE) {
+ svm->nested.vmexit_rip = kvm_rip_read(vcpu);
+ svm->nested.vmexit_rsp = kvm_register_read(vcpu, VCPU_REGS_RSP);
+ svm->nested.vmexit_rax = kvm_register_read(vcpu, VCPU_REGS_RAX);
return;
+ }
}
}
@@ -2398,6 +2410,23 @@ static int emulate_on_interception(struc
return 1;
}
+static int cr0_write_interception(struct vcpu_svm *svm)
+{
+ struct kvm_vcpu *vcpu = &svm->vcpu;
+ int r;
+
+ r = emulate_instruction(&svm->vcpu, 0, 0, 0);
+
+ if (svm->nested.vmexit_rip) {
+ kvm_register_write(vcpu, VCPU_REGS_RIP, svm->nested.vmexit_rip);
+ kvm_register_write(vcpu, VCPU_REGS_RSP, svm->nested.vmexit_rsp);
+ kvm_register_write(vcpu, VCPU_REGS_RAX, svm->nested.vmexit_rax);
+ svm->nested.vmexit_rip = 0;
+ }
+
+ return r == EMULATE_DONE;
+}
+
static int cr8_write_interception(struct vcpu_svm *svm)
{
struct kvm_run *kvm_run = svm->vcpu.run;
@@ -2671,7 +2700,7 @@ static int (*svm_exit_handlers[])(struct
[SVM_EXIT_READ_CR4] = emulate_on_interception,
[SVM_EXIT_READ_CR8] = emulate_on_interception,
[SVM_EXIT_CR0_SEL_WRITE] = emulate_on_interception,
- [SVM_EXIT_WRITE_CR0] = emulate_on_interception,
+ [SVM_EXIT_WRITE_CR0] = cr0_write_interception,
[SVM_EXIT_WRITE_CR3] = emulate_on_interception,
[SVM_EXIT_WRITE_CR4] = emulate_on_interception,
[SVM_EXIT_WRITE_CR8] = cr8_write_interception,
@@ -3253,6 +3282,10 @@ static void svm_cpuid_update(struct kvm_
static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
{
switch (func) {
+ case 0x80000001:
+ if (nested)
+ entry->ecx |= (1 << 2); /* Set SVM bit */
+ break;
case 0x8000000A:
entry->eax = 1; /* SVM revision 1 */
entry->ebx = 8; /* Lets support 8 ASIDs in case we add proper
diff -urpN linux-2.6.35.8/arch/x86/kvm/x86.c linux-2.6.35.9/arch/x86/kvm/x86.c
--- linux-2.6.35.8/arch/x86/kvm/x86.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/kvm/x86.c 2010-11-23 04:01:26.000000000 +0900
@@ -1910,9 +1910,9 @@ static void do_cpuid_ent(struct kvm_cpui
0 /* Reserved, XSAVE, OSXSAVE */;
/* cpuid 0x80000001.ecx */
const u32 kvm_supported_word6_x86_features =
- F(LAHF_LM) | F(CMP_LEGACY) | F(SVM) | 0 /* ExtApicSpace */ |
+ F(LAHF_LM) | F(CMP_LEGACY) | 0 /*SVM*/ | 0 /* ExtApicSpace */ |
F(CR8_LEGACY) | F(ABM) | F(SSE4A) | F(MISALIGNSSE) |
- F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(SSE5) |
+ F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) |
0 /* SKINIT */ | 0 /* WDT */;
/* all calls to cpuid_count() should be made on the same cpu */
diff -urpN linux-2.6.35.8/arch/x86/xen/enlighten.c linux-2.6.35.9/arch/x86/xen/enlighten.c
--- linux-2.6.35.8/arch/x86/xen/enlighten.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/xen/enlighten.c 2010-11-23 04:01:26.000000000 +0900
@@ -1001,7 +1001,7 @@ static void xen_reboot(int reason)
struct sched_shutdown r = { .reason = reason };
#ifdef CONFIG_SMP
- smp_send_stop();
+ stop_other_cpus();
#endif
if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
diff -urpN linux-2.6.35.8/arch/x86/xen/smp.c linux-2.6.35.9/arch/x86/xen/smp.c
--- linux-2.6.35.8/arch/x86/xen/smp.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/arch/x86/xen/smp.c 2010-11-23 04:01:26.000000000 +0900
@@ -398,9 +398,9 @@ static void stop_self(void *v)
BUG();
}
-static void xen_smp_send_stop(void)
+static void xen_stop_other_cpus(int wait)
{
- smp_call_function(stop_self, NULL, 0);
+ smp_call_function(stop_self, NULL, wait);
}
static void xen_smp_send_reschedule(int cpu)
@@ -468,7 +468,7 @@ static const struct smp_ops xen_smp_ops
.cpu_disable = xen_cpu_disable,
.play_dead = xen_play_dead,
- .smp_send_stop = xen_smp_send_stop,
+ .stop_other_cpus = xen_stop_other_cpus,
.smp_send_reschedule = xen_smp_send_reschedule,
.send_call_func_ipi = xen_smp_send_call_function_ipi,
diff -urpN linux-2.6.35.8/drivers/ata/ahci.h linux-2.6.35.9/drivers/ata/ahci.h
--- linux-2.6.35.8/drivers/ata/ahci.h 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/ata/ahci.h 2010-11-23 04:01:26.000000000 +0900
@@ -72,6 +72,7 @@ enum {
AHCI_CMD_RESET = (1 << 8),
AHCI_CMD_CLR_BUSY = (1 << 10),
+ RX_FIS_PIO_SETUP = 0x20, /* offset of PIO Setup FIS data */
RX_FIS_D2H_REG = 0x40, /* offset of D2H Register FIS data */
RX_FIS_SDB = 0x58, /* offset of SDB FIS data */
RX_FIS_UNK = 0x60, /* offset of Unknown FIS data */
diff -urpN linux-2.6.35.8/drivers/ata/libahci.c linux-2.6.35.9/drivers/ata/libahci.c
--- linux-2.6.35.8/drivers/ata/libahci.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/ata/libahci.c 2010-11-23 04:01:26.000000000 +0900
@@ -1824,12 +1824,24 @@ static unsigned int ahci_qc_issue(struct
static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc)
{
struct ahci_port_priv *pp = qc->ap->private_data;
- u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
+ u8 *rx_fis = pp->rx_fis;
if (pp->fbs_enabled)
- d2h_fis += qc->dev->link->pmp * AHCI_RX_FIS_SZ;
+ rx_fis += qc->dev->link->pmp * AHCI_RX_FIS_SZ;
+
+ /*
+ * After a successful execution of an ATA PIO data-in command,
+ * the device doesn't send D2H Reg FIS to update the TF and
+ * the host should take TF and E_Status from the preceding PIO
+ * Setup FIS.
+ */
+ if (qc->tf.protocol == ATA_PROT_PIO && qc->dma_dir == DMA_FROM_DEVICE &&
+ !(qc->flags & ATA_QCFLAG_FAILED)) {
+ ata_tf_from_fis(rx_fis + RX_FIS_PIO_SETUP, &qc->result_tf);
+ qc->result_tf.command = (rx_fis + RX_FIS_PIO_SETUP)[15];
+ } else
+ ata_tf_from_fis(rx_fis + RX_FIS_D2H_REG, &qc->result_tf);
- ata_tf_from_fis(d2h_fis, &qc->result_tf);
return true;
}
diff -urpN linux-2.6.35.8/drivers/bluetooth/hci_ldisc.c linux-2.6.35.9/drivers/bluetooth/hci_ldisc.c
--- linux-2.6.35.8/drivers/bluetooth/hci_ldisc.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/bluetooth/hci_ldisc.c 2010-11-23 04:01:26.000000000 +0900
@@ -258,9 +258,16 @@ static int hci_uart_tty_open(struct tty_
BT_DBG("tty %p", tty);
+ /* FIXME: This btw is bogus, nothing requires the old ldisc to clear
+ the pointer */
if (hu)
return -EEXIST;
+ /* Error if the tty has no write op instead of leaving an exploitable
+ hole */
+ if (tty->ops->write == NULL)
+ return -EOPNOTSUPP;
+
if (!(hu = kzalloc(sizeof(struct hci_uart), GFP_KERNEL))) {
BT_ERR("Can't allocate control structure");
return -ENFILE;
diff -urpN linux-2.6.35.8/drivers/char/pcmcia/synclink_cs.c linux-2.6.35.9/drivers/char/pcmcia/synclink_cs.c
--- linux-2.6.35.8/drivers/char/pcmcia/synclink_cs.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/char/pcmcia/synclink_cs.c 2010-11-23 04:01:26.000000000 +0900
@@ -4132,6 +4132,8 @@ static int hdlcdev_ioctl(struct net_devi
if (cmd != SIOCWANDEV)
return hdlc_ioctl(dev, ifr, cmd);
+ memset(&new_line, 0, size);
+
switch(ifr->ifr_settings.type) {
case IF_GET_IFACE: /* return current sync_serial_settings */
diff -urpN linux-2.6.35.8/drivers/idle/intel_idle.c linux-2.6.35.9/drivers/idle/intel_idle.c
--- linux-2.6.35.8/drivers/idle/intel_idle.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/idle/intel_idle.c 2010-11-23 04:01:26.000000000 +0900
@@ -308,7 +308,7 @@ static int intel_idle_probe(void)
break;
case 0x1C: /* 28 - Atom Processor */
- lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */
+ lapic_timer_reliable_states = (1 << 1); /* C1 */
cpuidle_state_table = atom_cstates;
choose_substate = choose_zero_substate;
break;
diff -urpN linux-2.6.35.8/drivers/isdn/i4l/isdn_tty.c linux-2.6.35.9/drivers/isdn/i4l/isdn_tty.c
--- linux-2.6.35.8/drivers/isdn/i4l/isdn_tty.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/isdn/i4l/isdn_tty.c 2010-11-23 04:01:26.000000000 +0900
@@ -2636,12 +2636,6 @@ isdn_tty_modem_result(int code, modem_in
if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {
return;
}
-#ifdef CONFIG_ISDN_AUDIO
- if ( !info->vonline )
- tty_ldisc_flush(info->tty);
-#else
- tty_ldisc_flush(info->tty);
-#endif
if ((info->flags & ISDN_ASYNC_CHECK_CD) &&
(!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&
(info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {
diff -urpN linux-2.6.35.8/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.35.9/drivers/misc/sgi-xp/xpc_uv.c
--- linux-2.6.35.8/drivers/misc/sgi-xp/xpc_uv.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/misc/sgi-xp/xpc_uv.c 2010-11-23 04:01:26.000000000 +0900
@@ -417,6 +417,7 @@ xpc_process_activate_IRQ_rcvd_uv(void)
static void
xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
struct xpc_activate_mq_msghdr_uv *msg_hdr,
+ int part_setup,
int *wakeup_hb_checker)
{
unsigned long irq_flags;
@@ -481,6 +482,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc
case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREQUEST_UV: {
struct xpc_activate_mq_msg_chctl_closerequest_uv *msg;
+ if (!part_setup)
+ break;
+
msg = container_of(msg_hdr, struct
xpc_activate_mq_msg_chctl_closerequest_uv,
hdr);
@@ -497,6 +501,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc
case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREPLY_UV: {
struct xpc_activate_mq_msg_chctl_closereply_uv *msg;
+ if (!part_setup)
+ break;
+
msg = container_of(msg_hdr, struct
xpc_activate_mq_msg_chctl_closereply_uv,
hdr);
@@ -511,6 +518,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc
case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREQUEST_UV: {
struct xpc_activate_mq_msg_chctl_openrequest_uv *msg;
+ if (!part_setup)
+ break;
+
msg = container_of(msg_hdr, struct
xpc_activate_mq_msg_chctl_openrequest_uv,
hdr);
@@ -528,6 +538,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc
case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREPLY_UV: {
struct xpc_activate_mq_msg_chctl_openreply_uv *msg;
+ if (!part_setup)
+ break;
+
msg = container_of(msg_hdr, struct
xpc_activate_mq_msg_chctl_openreply_uv, hdr);
args = &part->remote_openclose_args[msg->ch_number];
@@ -545,6 +558,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc
case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENCOMPLETE_UV: {
struct xpc_activate_mq_msg_chctl_opencomplete_uv *msg;
+ if (!part_setup)
+ break;
+
msg = container_of(msg_hdr, struct
xpc_activate_mq_msg_chctl_opencomplete_uv, hdr);
spin_lock_irqsave(&part->chctl_lock, irq_flags);
@@ -621,6 +637,7 @@ xpc_handle_activate_IRQ_uv(int irq, void
part_referenced = xpc_part_ref(part);
xpc_handle_activate_mq_msg_uv(part, msg_hdr,
+ part_referenced,
&wakeup_hb_checker);
if (part_referenced)
xpc_part_deref(part);
diff -urpN linux-2.6.35.8/drivers/net/gianfar.c linux-2.6.35.9/drivers/net/gianfar.c
--- linux-2.6.35.8/drivers/net/gianfar.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/net/gianfar.c 2010-11-23 04:01:26.000000000 +0900
@@ -2427,7 +2427,7 @@ static int gfar_clean_tx_ring(struct gfa
if (skb_queue_len(&priv->rx_recycle) < rx_queue->rx_ring_size &&
skb_recycle_check(skb, priv->rx_buffer_size +
RXBUF_ALIGNMENT))
- __skb_queue_head(&priv->rx_recycle, skb);
+ skb_queue_head(&priv->rx_recycle, skb);
else
dev_kfree_skb_any(skb);
@@ -2498,7 +2498,7 @@ struct sk_buff * gfar_new_skb(struct net
struct gfar_private *priv = netdev_priv(dev);
struct sk_buff *skb = NULL;
- skb = __skb_dequeue(&priv->rx_recycle);
+ skb = skb_dequeue(&priv->rx_recycle);
if (!skb)
skb = netdev_alloc_skb(dev,
priv->rx_buffer_size + RXBUF_ALIGNMENT);
@@ -2675,7 +2675,7 @@ int gfar_clean_rx_ring(struct gfar_priv_
* recycle list.
*/
skb_reserve(skb, -GFAR_CB(skb)->alignamount);
- __skb_queue_head(&priv->rx_recycle, skb);
+ skb_queue_head(&priv->rx_recycle, skb);
}
} else {
/* Increment the number of packets */
diff -urpN linux-2.6.35.8/drivers/net/gianfar_ethtool.c linux-2.6.35.9/drivers/net/gianfar_ethtool.c
--- linux-2.6.35.8/drivers/net/gianfar_ethtool.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/net/gianfar_ethtool.c 2010-11-23 04:01:26.000000000 +0900
@@ -538,7 +538,7 @@ static int gfar_set_rx_csum(struct net_d
unlock_tx_qs(priv);
unlock_rx_qs(priv);
- local_irq_save(flags);
+ local_irq_restore(flags);
for (i = 0; i < priv->num_rx_queues; i++)
gfar_clean_rx_ring(priv->rx_queue[i],
diff -urpN linux-2.6.35.8/drivers/net/netxen/netxen_nic_init.c linux-2.6.35.9/drivers/net/netxen/netxen_nic_init.c
--- linux-2.6.35.8/drivers/net/netxen/netxen_nic_init.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/net/netxen/netxen_nic_init.c 2010-11-23 04:01:26.000000000 +0900
@@ -1540,7 +1540,6 @@ netxen_process_rcv(struct netxen_adapter
if (pkt_offset)
skb_pull(skb, pkt_offset);
- skb->truesize = skb->len + sizeof(struct sk_buff);
skb->protocol = eth_type_trans(skb, netdev);
napi_gro_receive(&sds_ring->napi, skb);
@@ -1602,8 +1601,6 @@ netxen_process_lro(struct netxen_adapter
skb_put(skb, lro_length + data_offset);
- skb->truesize = skb->len + sizeof(struct sk_buff) + skb_headroom(skb);
-
skb_pull(skb, l2_hdr_offset);
skb->protocol = eth_type_trans(skb, netdev);
diff -urpN linux-2.6.35.8/drivers/net/qlcnic/qlcnic_init.c linux-2.6.35.9/drivers/net/qlcnic/qlcnic_init.c
--- linux-2.6.35.8/drivers/net/qlcnic/qlcnic_init.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/net/qlcnic/qlcnic_init.c 2010-11-23 04:01:26.000000000 +0900
@@ -1363,7 +1363,6 @@ qlcnic_process_rcv(struct qlcnic_adapter
if (pkt_offset)
skb_pull(skb, pkt_offset);
- skb->truesize = skb->len + sizeof(struct sk_buff);
skb->protocol = eth_type_trans(skb, netdev);
napi_gro_receive(&sds_ring->napi, skb);
@@ -1425,8 +1424,6 @@ qlcnic_process_lro(struct qlcnic_adapter
skb_put(skb, lro_length + data_offset);
- skb->truesize = skb->len + sizeof(struct sk_buff) + skb_headroom(skb);
-
skb_pull(skb, l2_hdr_offset);
skb->protocol = eth_type_trans(skb, netdev);
@@ -1659,8 +1656,6 @@ qlcnic_process_rcv_diag(struct qlcnic_ad
if (pkt_offset)
skb_pull(skb, pkt_offset);
- skb->truesize = skb->len + sizeof(struct sk_buff);
-
if (!qlcnic_check_loopback_buff(skb->data))
adapter->diag_cnt++;
diff -urpN linux-2.6.35.8/drivers/net/r6040.c linux-2.6.35.9/drivers/net/r6040.c
--- linux-2.6.35.8/drivers/net/r6040.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/net/r6040.c 2010-11-23 04:01:26.000000000 +0900
@@ -988,16 +988,18 @@ static void r6040_multicast_list(struct
/* Multicast Address 1~4 case */
i = 0;
netdev_for_each_mc_addr(ha, dev) {
- if (i < MCAST_MAX) {
- adrp = (u16 *) ha->addr;
- iowrite16(adrp[0], ioaddr + MID_1L + 8 * i);
- iowrite16(adrp[1], ioaddr + MID_1M + 8 * i);
- iowrite16(adrp[2], ioaddr + MID_1H + 8 * i);
- } else {
- iowrite16(0xffff, ioaddr + MID_1L + 8 * i);
- iowrite16(0xffff, ioaddr + MID_1M + 8 * i);
- iowrite16(0xffff, ioaddr + MID_1H + 8 * i);
- }
+ if (i >= MCAST_MAX)
+ break;
+ adrp = (u16 *) ha->addr;
+ iowrite16(adrp[0], ioaddr + MID_1L + 8 * i);
+ iowrite16(adrp[1], ioaddr + MID_1M + 8 * i);
+ iowrite16(adrp[2], ioaddr + MID_1H + 8 * i);
+ i++;
+ }
+ while (i < MCAST_MAX) {
+ iowrite16(0xffff, ioaddr + MID_1L + 8 * i);
+ iowrite16(0xffff, ioaddr + MID_1M + 8 * i);
+ iowrite16(0xffff, ioaddr + MID_1H + 8 * i);
i++;
}
}
diff -urpN linux-2.6.35.8/drivers/net/wireless/p54/eeprom.c linux-2.6.35.9/drivers/net/wireless/p54/eeprom.c
--- linux-2.6.35.8/drivers/net/wireless/p54/eeprom.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/net/wireless/p54/eeprom.c 2010-11-23 04:01:26.000000000 +0900
@@ -262,8 +262,10 @@ static int p54_generate_channel_lists(st
list->max_entries = max_channel_num;
list->channels = kzalloc(sizeof(struct p54_channel_entry) *
max_channel_num, GFP_KERNEL);
- if (!list->channels)
+ if (!list->channels) {
+ ret = -ENOMEM;
goto free;
+ }
for (i = 0; i < max_channel_num; i++) {
if (i < priv->iq_autocal_len) {
diff -urpN linux-2.6.35.8/drivers/net/wireless/p54/p54usb.c linux-2.6.35.9/drivers/net/wireless/p54/p54usb.c
--- linux-2.6.35.8/drivers/net/wireless/p54/p54usb.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/net/wireless/p54/p54usb.c 2010-11-23 04:01:26.000000000 +0900
@@ -33,8 +33,17 @@ MODULE_ALIAS("prism54usb");
MODULE_FIRMWARE("isl3886usb");
MODULE_FIRMWARE("isl3887usb");
+/*
+ * Note:
+ *
+ * Always update our wiki's device list (located at:
+ * http://wireless.kernel.org/en/users/Drivers/p54/devices ),
+ * whenever you add a new device.
+ */
+
static struct usb_device_id p54u_table[] __devinitdata = {
/* Version 1 devices (pci chip + net2280) */
+ {USB_DEVICE(0x045e, 0x00c2)}, /* Microsoft MN-710 */
{USB_DEVICE(0x0506, 0x0a11)}, /* 3COM 3CRWE254G72 */
{USB_DEVICE(0x06b9, 0x0120)}, /* Thomson SpeedTouch 120g */
{USB_DEVICE(0x0707, 0xee06)}, /* SMC 2862W-G */
@@ -47,7 +56,9 @@ static struct usb_device_id p54u_table[]
{USB_DEVICE(0x0846, 0x4220)}, /* Netgear WG111 */
{USB_DEVICE(0x09aa, 0x1000)}, /* Spinnaker Proto board */
{USB_DEVICE(0x0cde, 0x0006)}, /* Medion 40900, Roper Europe */
+ {USB_DEVICE(0x107b, 0x55f2)}, /* Gateway WGU-210 (Gemtek) */
{USB_DEVICE(0x124a, 0x4023)}, /* Shuttle PN15, Airvast WM168g, IOGear GWU513 */
+ {USB_DEVICE(0x1630, 0x0005)}, /* 2Wire 802.11g USB (v1) / Z-Com */
{USB_DEVICE(0x1915, 0x2234)}, /* Linksys WUSB54G OEM */
{USB_DEVICE(0x1915, 0x2235)}, /* Linksys WUSB54G Portable OEM */
{USB_DEVICE(0x2001, 0x3701)}, /* DLink DWL-G120 Spinnaker */
@@ -60,6 +71,7 @@ static struct usb_device_id p54u_table[]
{USB_DEVICE(0x050d, 0x7050)}, /* Belkin F5D7050 ver 1000 */
{USB_DEVICE(0x0572, 0x2000)}, /* Cohiba Proto board */
{USB_DEVICE(0x0572, 0x2002)}, /* Cohiba Proto board */
+ {USB_DEVICE(0x06a9, 0x000e)}, /* Westell 802.11g USB (A90-211WG-01) */
{USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */
{USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */
{USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */
@@ -79,6 +91,7 @@ static struct usb_device_id p54u_table[]
{USB_DEVICE(0x13B1, 0x000C)}, /* Linksys WUSB54AG */
{USB_DEVICE(0x1413, 0x5400)}, /* Telsey 802.11g USB2.0 Adapter */
{USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */
+ {USB_DEVICE(0x1668, 0x1050)}, /* Actiontec 802UIG-1 */
{USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */
{USB_DEVICE(0x413c, 0x5513)}, /* Dell WLA3310 USB Wireless Adapter */
{USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */
@@ -930,8 +943,8 @@ static int __devinit p54u_probe(struct u
#ifdef CONFIG_PM
/* ISL3887 needs a full reset on resume */
udev->reset_resume = 1;
+#endif /* CONFIG_PM */
err = p54u_device_reset(dev);
-#endif
priv->hw_type = P54U_3887;
dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr);
diff -urpN linux-2.6.35.8/drivers/platform/x86/asus-laptop.c linux-2.6.35.9/drivers/platform/x86/asus-laptop.c
--- linux-2.6.35.8/drivers/platform/x86/asus-laptop.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/platform/x86/asus-laptop.c 2010-11-23 04:01:26.000000000 +0900
@@ -1064,9 +1064,9 @@ static ssize_t store_gps(struct device *
*/
static int asus_gps_rfkill_set(void *data, bool blocked)
{
- acpi_handle handle = data;
+ struct asus_laptop *asus = data;
- return asus_gps_switch(handle, !blocked);
+ return asus_gps_switch(asus, !blocked);
}
static const struct rfkill_ops asus_gps_rfkill_ops = {
@@ -1093,7 +1093,7 @@ static int asus_rfkill_init(struct asus_
asus->gps_rfkill = rfkill_alloc("asus-gps", &asus->platform_device->dev,
RFKILL_TYPE_GPS,
- &asus_gps_rfkill_ops, NULL);
+ &asus_gps_rfkill_ops, asus);
if (!asus->gps_rfkill)
return -EINVAL;
diff -urpN linux-2.6.35.8/drivers/scsi/gdth.c linux-2.6.35.9/drivers/scsi/gdth.c
--- linux-2.6.35.8/drivers/scsi/gdth.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/scsi/gdth.c 2010-11-23 04:01:26.000000000 +0900
@@ -4175,6 +4175,14 @@ static int ioc_general(void __user *arg,
ha = gdth_find_ha(gen.ionode);
if (!ha)
return -EFAULT;
+
+ if (gen.data_len > INT_MAX)
+ return -EINVAL;
+ if (gen.sense_len > INT_MAX)
+ return -EINVAL;
+ if (gen.data_len + gen.sense_len > INT_MAX)
+ return -EINVAL;
+
if (gen.data_len + gen.sense_len != 0) {
if (!(buf = gdth_ioctl_alloc(ha, gen.data_len + gen.sense_len,
FALSE, &paddr)))
diff -urpN linux-2.6.35.8/drivers/scsi/libsas/sas_ata.c linux-2.6.35.9/drivers/scsi/libsas/sas_ata.c
--- linux-2.6.35.8/drivers/scsi/libsas/sas_ata.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/scsi/libsas/sas_ata.c 2010-11-23 04:01:26.000000000 +0900
@@ -347,6 +347,7 @@ static int sas_ata_scr_read(struct ata_l
static struct ata_port_operations sas_sata_ops = {
.phy_reset = sas_ata_phy_reset,
.post_internal_cmd = sas_ata_post_internal,
+ .qc_defer = ata_std_qc_defer,
.qc_prep = ata_noop_qc_prep,
.qc_issue = sas_ata_qc_issue,
.qc_fill_rtf = sas_ata_qc_fill_rtf,
diff -urpN linux-2.6.35.8/drivers/scsi/scsi_lib.c linux-2.6.35.9/drivers/scsi/scsi_lib.c
--- linux-2.6.35.8/drivers/scsi/scsi_lib.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/scsi/scsi_lib.c 2010-11-23 04:01:26.000000000 +0900
@@ -2436,7 +2436,8 @@ scsi_internal_device_unblock(struct scsi
sdev->sdev_state = SDEV_RUNNING;
else if (sdev->sdev_state == SDEV_CREATED_BLOCK)
sdev->sdev_state = SDEV_CREATED;
- else
+ else if (sdev->sdev_state != SDEV_CANCEL &&
+ sdev->sdev_state != SDEV_OFFLINE)
return -EINVAL;
spin_lock_irqsave(q->queue_lock, flags);
diff -urpN linux-2.6.35.8/drivers/scsi/scsi_sysfs.c linux-2.6.35.9/drivers/scsi/scsi_sysfs.c
--- linux-2.6.35.8/drivers/scsi/scsi_sysfs.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/scsi/scsi_sysfs.c 2010-11-23 04:01:26.000000000 +0900
@@ -990,10 +990,11 @@ static void __scsi_remove_target(struct
list_for_each_entry(sdev, &shost->__devices, siblings) {
if (sdev->channel != starget->channel ||
sdev->id != starget->id ||
- sdev->sdev_state == SDEV_DEL)
+ scsi_device_get(sdev))
continue;
spin_unlock_irqrestore(shost->host_lock, flags);
scsi_remove_device(sdev);
+ scsi_device_put(sdev);
spin_lock_irqsave(shost->host_lock, flags);
goto restart;
}
diff -urpN linux-2.6.35.8/drivers/scsi/sd.c linux-2.6.35.9/drivers/scsi/sd.c
--- linux-2.6.35.8/drivers/scsi/sd.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/scsi/sd.c 2010-11-23 04:01:26.000000000 +0900
@@ -2204,11 +2204,10 @@ static void sd_probe_async(void *data, a
index = sdkp->index;
dev = &sdp->sdev_gendev;
- if (index < SD_MAX_DISKS) {
- gd->major = sd_major((index & 0xf0) >> 4);
- gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
- gd->minors = SD_MINORS;
- }
+ gd->major = sd_major((index & 0xf0) >> 4);
+ gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
+ gd->minors = SD_MINORS;
+
gd->fops = &sd_fops;
gd->private_data = &sdkp->driver;
gd->queue = sdkp->device->request_queue;
@@ -2297,6 +2296,12 @@ static int sd_probe(struct device *dev)
if (error)
goto out_put;
+ if (index >= SD_MAX_DISKS) {
+ error = -ENODEV;
+ sdev_printk(KERN_WARNING, sdp, "SCSI disk (sd) name space exhausted.\n");
+ goto out_free_index;
+ }
+
error = sd_format_disk_name("sd", index, gd->disk_name, DISK_NAME_LEN);
if (error)
goto out_free_index;
diff -urpN linux-2.6.35.8/drivers/staging/phison/phison.c linux-2.6.35.9/drivers/staging/phison/phison.c
--- linux-2.6.35.8/drivers/staging/phison/phison.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/staging/phison/phison.c 2010-11-23 04:01:26.000000000 +0900
@@ -62,7 +62,7 @@ static int phison_init_one(struct pci_de
};
const struct ata_port_info *ppi[] = { &info, NULL };
- ret = ata_pci_sff_init_one(pdev, ppi, &phison_sht, NULL, 0);
+ ret = ata_pci_bmdma_init_one(pdev, ppi, &phison_sht, NULL, 0);
dev_dbg(&pdev->dev, "phison_init_one(), ret = %x\n", ret);
diff -urpN linux-2.6.35.8/drivers/staging/usbip/usbip_event.c linux-2.6.35.9/drivers/staging/usbip/usbip_event.c
--- linux-2.6.35.8/drivers/staging/usbip/usbip_event.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/staging/usbip/usbip_event.c 2010-11-23 04:01:26.000000000 +0900
@@ -38,21 +38,13 @@ static int event_handler(struct usbip_de
ud->eh_ops.shutdown(ud);
ud->event &= ~USBIP_EH_SHUTDOWN;
-
- break;
}
- /* Stop the error handler. */
- if (ud->event & USBIP_EH_BYE)
- return -1;
-
/* Reset the device. */
if (ud->event & USBIP_EH_RESET) {
ud->eh_ops.reset(ud);
ud->event &= ~USBIP_EH_RESET;
-
- break;
}
/* Mark the device as unusable. */
@@ -60,13 +52,11 @@ static int event_handler(struct usbip_de
ud->eh_ops.unusable(ud);
ud->event &= ~USBIP_EH_UNUSABLE;
-
- break;
}
- /* NOTREACHED */
- printk(KERN_ERR "%s: unknown event\n", __func__);
- return -1;
+ /* Stop the error handler. */
+ if (ud->event & USBIP_EH_BYE)
+ return -1;
}
return 0;
diff -urpN linux-2.6.35.8/drivers/staging/usbip/vhci_hcd.c linux-2.6.35.9/drivers/staging/usbip/vhci_hcd.c
--- linux-2.6.35.8/drivers/staging/usbip/vhci_hcd.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/staging/usbip/vhci_hcd.c 2010-11-23 04:01:26.000000000 +0900
@@ -164,6 +164,8 @@ void rh_port_disconnect(int rhport)
* spin_unlock(&vdev->ud.lock); */
spin_unlock_irqrestore(&the_controller->lock, flags);
+
+ usb_hcd_poll_rh_status(vhci_to_hcd(the_controller));
}
diff -urpN linux-2.6.35.8/drivers/usb/core/hub.c linux-2.6.35.9/drivers/usb/core/hub.c
--- linux-2.6.35.8/drivers/usb/core/hub.c 2010-10-29 13:52:43.000000000 +0900
+++ linux-2.6.35.9/drivers/usb/core/hub.c 2010-11-23 04:01:26.000000000 +0900
@@ -2859,13 +2859,16 @@ hub_port_init (struct usb_hub *hub, stru
else
i = udev->descriptor.bMaxPacketSize0;
if (le16_to_cpu(udev->ep0.desc.wMaxPacketSize) != i) {
- if (udev->speed != USB_SPEED_FULL ||