Commits · 384263dc669ea70ad850232370541b1219f6b687 · nexedi / linux

23 Dec, 2004 15 commits

Merge intel.com:/home/lenb/bk/26-latest-ref · 384263dc
Len Brown authored Dec 23, 2004
```
into intel.com:/home/lenb/src/26-latest-dev
```
384263dc
Merge intel.com:/home/lenb/src/26-stable-dev · afe244f6
Len Brown authored Dec 23, 2004
```
into intel.com:/home/lenb/src/26-latest-dev
```
afe244f6

[ACPI] Fix suspend/resume lockup issue · 2780cc46

Len Brown authored Dec 23, 2004

by leaving Bus Master Arbitration enabled.
The ACPI spec mandates it be disabled only for C3.

http://bugzilla.kernel.org/show_bug.cgi?id=3599Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

2780cc46

[ACPI] apply via_interrupt_line_quirk in ACPI mode · dac0b80e

Len Brown authored Dec 23, 2004

the same way it is applied in legacy mode.
Delete redundant quirks.

http://bugzilla.kernel.org/show_bug.cgi?id=3319Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

dac0b80e

[ACPI] another fix to the stack-audit patch · 6baa7c0c

Len Brown authored Dec 23, 2004

http://bugzilla.kernel.org/show_bug.cgi?id=2901Signed-off-by: Len Brown <len.brown@intel.com>

6baa7c0c

[PATCH] AB-BA deadlock between uidhash_lock and tasklist_lock. · 002984e2

Andrew Morton authored Dec 23, 2004

switch_uid() doesn't care about tasklist_lock, so do it outside
the lock and avoid a subtle (and very very unlikely to trigger)
AB-BA deadlock.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

002984e2

Merge intel.com:/home/lenb/src/26-stable-dev · ba20db08
Len Brown authored Dec 23, 2004
```
into intel.com:/home/lenb/src/26-latest-dev
```
ba20db08
[ACPI] two fixups where promotion and demotion were mixed up · ea7e61d8
Len Brown authored Dec 23, 2004
```
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Len Brown <len.brown@intel.com>
```
ea7e61d8

[ACPI] fix to the stack-audit patch · 25d163ee

Len Brown authored Dec 23, 2004

http://bugzilla.kernel.org/show_bug.cgi?id=2901Signed-off-by: Len Brown <len.brown@intel.com>

25d163ee

[PATCH] fix inlining related build failures in mxser.c · ba169c30

Jesper Juhl authored Dec 23, 2004

This fixes a build failure with gcc-3.4.1, where we use some functions
before we define them inline. 

The simple way to fix those is to simply un-inline the functions in
question. Since they are somewhat large that's what I did.

An alternative would be to rework the ordering of the file so the
functions are defined before their first use.
Signed-off-by: Jesper juhl <juhl-lkml@dif.dk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ba169c30

[ACPI] add "processor.nocst" parameter · 7ae42954

Len Brown authored Dec 23, 2004

which blocks _CST parsing and always uses FADT info instead.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Len Brown <len.brown@intel.com>

7ae42954

[ACPI] Let C4 demote to C3, not directly to C2. · ae00fd58

Len Brown authored Dec 23, 2004

Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Len Brown <len.brown@intel.com>

ae00fd58

· 629e2afd

Len Brown authored Dec 23, 2004

[ACPI] tweak /proc/acpi/processor/CPU0/power format
Current policy is to name both C-state-types and the actual C-States
"C[0-n]". Follow this rule...

Signed-off-by: Dominik Brodowski <linux@brodo.de
Signed-off-by: Len Brown <len.brown@intel.com>

629e2afd

[ACPI] max_cstate shall limit C-states not C-state-types. · 99a194fa
Len Brown authored Dec 23, 2004
```
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Len Brown <len.brown@intel.com>
```
99a194fa
Merge bk://linux.bkbits.net/linux-2.5 · a631fa30
Nathan Scott authored Dec 22, 2004
```
into oss.sgi.com:/oss4/bitkeeper/xfs-linux-2.6
```
a631fa30

22 Dec, 2004 7 commits

Merge intel.com:/home/lenb/bk/26-latest-ref · 57900764
Len Brown authored Dec 22, 2004
```
into intel.com:/home/lenb/src/26-latest-dev
```
57900764
Merge bk://gkernel.bkbits.net/libata-2.6 · e469d3c2
Linus Torvalds authored Dec 22, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
e469d3c2

[libata sata_nv] fix dev detect by removing sata-reset flag · b9fada70

Jeff Garzik authored Dec 22, 2004

Remove ATA_FLAG_SATA_RESET.  See comment in code and
http://bugme.osdl.org/show_bug.cgi?id=3352 for more details.

This problem needs more investigation.  Removing the flag
appears to fix the problems in the field, so it's the best
temporary solution.

b9fada70

[PATCH] USB: fix up warning messages spit out by the keyspan driver. · 5dda7317

Greg Kroah-Hartman authored Dec 22, 2004

I missed this in the previous usb_kill_urb() cleanup.  Thanks to
Pat Mochel for reporting this.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5dda7317

[PATCH] USB: drivers/usb/atm/usb_atm.c: fix nonzero snd_padding case · edb5352e

Greg Kroah-Hartman authored Dec 22, 2004

This is the patch to fix the case when snd_padding is not zero, updated
according to Duncan's comments.  Also it changes the driver name to reflect
its generic nature.
Signed-off-by: Roman Kagan <rkagan@mail.ru>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

edb5352e

[PATCH] Bring Moxa serial back into being · 938bc254

Alan Cox authored Dec 22, 2004

Moxa have released several driver updates now including support up to
2.6.8 but don't themselves feel its worth the effort of doing a cleaned
up merge for the base kernel.  So I pulled their latest driver release
(1.8) and removed all the macro gunge that makes it build on
2.2.0->2.6.8.  I then fixed it to run on 2.6.9/10 and fixed a bug in the
break handling.

It still doesn't do PCI hotplug but I don't have any PCI moxa cards to
really tackle that particular case. 

I've also merged Adriank Bunk's two 'could be static' changes into this
diff set.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

938bc254

[PATCH] alsa: fix oops with ALSA OSS emulation on PPC · cf5bd50c

Takashi Iwai authored Dec 21, 2004

Fix suggested by Benjamin Herrenschmidt <benh@kernel.crashing.org>

On architectures like PPC, char is handled as "unsigned char", thus the
pcm_format_data table entries with -1 give a positive 255.  This results
in Oops with OSS-emulation on such architectures.

The patch simply adds the right signed/unsigned prefix to fix this problem.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>