]> pilppa.org Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
17 years ago[CRYPTO] ripemd: Add Kconfig entries for extended RIPEMD hash algorithms
Adrian-Ken Rueegsegger [Fri, 9 May 2008 13:30:27 +0000 (21:30 +0800)]
[CRYPTO] ripemd: Add Kconfig entries for extended RIPEMD hash algorithms

This patch adds Kconfig entries for RIPEMD-256 and RIPEMD-320.

Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] tcrypt: Add test vectors for RIPEMD-256 and RIPEMD-320
Adrian-Ken Rueegsegger [Fri, 9 May 2008 13:29:35 +0000 (21:29 +0800)]
[CRYPTO] tcrypt: Add test vectors for RIPEMD-256 and RIPEMD-320

This patch adds test vectors for RIPEMD-256 and
RIPEMD-320 hash algorithms.

The test vectors are taken from
<http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>

Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] ripemd: Add support for RIPEMD-256 and RIPEMD-320
Adrian-Ken Rueegsegger [Fri, 9 May 2008 13:27:02 +0000 (21:27 +0800)]
[CRYPTO] ripemd: Add support for RIPEMD-256 and RIPEMD-320

This patch adds support for the extended RIPEMD hash
algorithms RIPEMD-256 and RIPEMD-320.

Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] ripemd: Put all common RIPEMD values in header file
Adrian-Ken Rueegsegger [Fri, 9 May 2008 13:25:42 +0000 (21:25 +0800)]
[CRYPTO] ripemd: Put all common RIPEMD values in header file

This patch puts all common RIPEMD values in the
appropriate header file. Initial values and constants
are the same for all variants of RIPEMD.

Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] tcrypt: Catch cipher destination memory corruption
Patrick McHardy [Thu, 8 May 2008 11:27:47 +0000 (19:27 +0800)]
[CRYPTO] tcrypt: Catch cipher destination memory corruption

Check whether the destination buffer is written to beyond the last
byte contained in the scatterlist.

Also change IDX1 of the cross-page access offsets to a multiple of 4.
This triggers a corruption in the HIFN driver and doesn't seem to
negatively impact other testcases.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Have HW invalidate src and dest descriptors after processing
Patrick McHardy [Wed, 7 May 2008 14:37:29 +0000 (22:37 +0800)]
[HIFN]: Have HW invalidate src and dest descriptors after processing

The descriptors need to be invalidated after processing for ring
cleanup to work properly and to avoid using an old destination
descriptor when the src and cmd descriptors are already set up
and the dst descriptor isn't.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Move command descriptor setup to seperate function
Patrick McHardy [Wed, 7 May 2008 14:36:54 +0000 (22:36 +0800)]
[HIFN]: Move command descriptor setup to seperate function

Move command descriptor setup to seperate function as preparation
for the following DMA setup fixes.

Note 1: also fix a harmless typo while moving it: sa_idx is initialized
to dma->resi instead of dma->cmdi.

Note 2: errors from command descriptor setup are not propagated back,
anymore, they can't be handled anyway and all conditions leading
to errors should be checked earlier.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Fix max queue length value
Patrick McHardy [Wed, 7 May 2008 14:36:17 +0000 (22:36 +0800)]
[HIFN]: Fix max queue length value

All but the last element of the command and result descriptor rings can be
used for crypto requests, fix HIFN_QUEUE_LENGTH.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Properly initialize ivsize for CBC modes
Patrick McHardy [Wed, 7 May 2008 14:35:47 +0000 (22:35 +0800)]
[HIFN]: Properly initialize ivsize for CBC modes

For combined modes like cbc(aes) the driver is responsible for
initializing ivsize.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Use unique driver names for different algos
Patrick McHardy [Wed, 7 May 2008 14:35:07 +0000 (22:35 +0800)]
[HIFN]: Use unique driver names for different algos

When the CryptoAPI instantiates a new algorithm, it performs a lookup
by driver name. Since hifn uses the same name for all modes of one
algorithm, the lookup may return an incorrect algorithm.

Change the name to use <mode>-<algo>-<devicename> to provide unique
names for the different combinations and devices.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Properly handle requests for less than the full scatterlist
Patrick McHardy [Wed, 7 May 2008 14:34:27 +0000 (22:34 +0800)]
[HIFN]: Properly handle requests for less than the full scatterlist

The scatterlist may contain more data than the crypto request, causing
an underflow of the remaining byte count while walking the list.

Use the minimum of the scatterlist element size and the remaining byte
count specified in the crypto request to avoid this.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Fix data alignment checks
Patrick McHardy [Wed, 7 May 2008 14:33:37 +0000 (22:33 +0800)]
[HIFN]: Fix data alignment checks

The check for misalignment of the scatterlist data has two bugs:

- the source buffer doesn't need to be aligned at all
- the destination buffer and its size needs to be aligned to a multiple
  of 4, not to the crypto alg blocksize

Introduce symbolic constant for destination buffer alignment requirements,
use it instead of the crypto alg blocksize and remove the unnecessary
checks for source buffer alignment and change cra_alignmask to zero.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Handle ablkcipher_walk errors
Patrick McHardy [Wed, 7 May 2008 14:32:28 +0000 (22:32 +0800)]
[HIFN]: Handle ablkcipher_walk errors

ablkcipher_walk may return a negative error value, handle this properly
instead of treating it as a huge number of scatter-gather elements.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Indicate asynchronous processing to crypto API
Patrick McHardy [Wed, 7 May 2008 14:31:35 +0000 (22:31 +0800)]
[HIFN]: Indicate asynchronous processing to crypto API

hifn_setup_crypto() needs to return -EINPROGRESS on success to indicate
asynchronous processing to the crypto API. This also means it must not
return the errno code returned by hifn_process_queue(), if any.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Remove printk_ratelimit() for debugging printk
Patrick McHardy [Wed, 7 May 2008 14:29:42 +0000 (22:29 +0800)]
[HIFN]: Remove printk_ratelimit() for debugging printk

Without debugging this spams the log with "printk: N messages surpressed"
without any actual messages on error. With debugging its more useful to
always see the message.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[HIFN]: Endianess fixes
Patrick McHardy [Wed, 7 May 2008 14:28:27 +0000 (22:28 +0800)]
[HIFN]: Endianess fixes

HIFN uses little-endian by default, move cpu_to_le32 conversion to hifn_write_0/
hifn_write_1, add sparse annotations and fix an invalid endian conversion in
hifn_setup_src_desc.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] tcrpyt: Get rid of change log in source
Herbert Xu [Wed, 7 May 2008 14:19:38 +0000 (22:19 +0800)]
[CRYPTO] tcrpyt: Get rid of change log in source

Change logs should be kept in source control systems, not the source.
This patch removes the change log from tcrpyt to stop people from
extending it any more.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] ripemd: Add Kconfig entries for RIPEMD hash algorithms
Adrian-Ken Rueegsegger [Wed, 7 May 2008 14:17:37 +0000 (22:17 +0800)]
[CRYPTO] ripemd: Add Kconfig entries for RIPEMD hash algorithms

This patch adds Kconfig entries for RIPEMD-128 and RIPEMD-160.

Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] tcrypt: Add test vectors for RIPEMD-128 and RIPEMD-160
Adrian-Ken Rueegsegger [Wed, 7 May 2008 14:16:36 +0000 (22:16 +0800)]
[CRYPTO] tcrypt: Add test vectors for RIPEMD-128 and RIPEMD-160

This patch adds test vectors for RIPEMD-128 and
RIPEMD-160 hash algorithms and digests (HMAC).

The test vectors are taken from ISO:IEC 10118-3 (2004)
and RFC2286.

Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] ripemd: Add support for RIPEMD hash algorithms
Adrian-Ken Rueegsegger [Wed, 7 May 2008 14:14:10 +0000 (22:14 +0800)]
[CRYPTO] ripemd: Add support for RIPEMD hash algorithms

This patch adds support for RIPEMD-128 and RIPEMD-160
hash algorithms.

Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[CRYPTO] cryptd: Fix EINPROGRESS notification context
Herbert Xu [Wed, 7 May 2008 13:10:13 +0000 (21:10 +0800)]
[CRYPTO] cryptd: Fix EINPROGRESS notification context

The EINPROGRESS notifications should be done just like the final
call-backs, i.e., with BH off.  This patch fixes the call in cryptd
since previously it was called with BH on.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years agocrypto: chainiv - Invoke completion function
Herbert Xu [Thu, 10 Jul 2008 09:42:36 +0000 (17:42 +0800)]
crypto: chainiv - Invoke completion function

When chainiv postpones requests it never calls their completion functions.
This causes symptoms such as memory leaks when IPsec is in use.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years ago[ARM] 5155/1: PalmTX battery monitor
Marek Vašut [Mon, 7 Jul 2008 16:31:58 +0000 (17:31 +0100)]
[ARM] 5155/1: PalmTX battery monitor

This patch adds battery monitoring driver for PalmTX.
It can read voltage from the battery and temperature.
It also monitors charging/discharging status.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 5154/1: PalmTX PCMCIA
Marek Vašut [Mon, 7 Jul 2008 16:28:59 +0000 (17:28 +0100)]
[ARM] 5154/1: PalmTX PCMCIA

This patch adds PCMCIA support for PalmTX handheld computer.
There is one chip hard-soldered to slot0, another slot is
not in use and not accessible.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 5153/1: Add support for PalmTX handheld computer
Marek Vašut [Mon, 7 Jul 2008 16:25:46 +0000 (17:25 +0100)]
[ARM] 5153/1: Add support for PalmTX handheld computer

PalmTX is PXA27x based device with wifi, bluetooth,
touchscreen, sdio slot, irda, keypad, nand flash,
pxa framebuffer, serial and usb gadget interface.

Supported by this patch is pxafb, touchscreen, irda,
keypad and sdio slot.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 5133/2: at91sam9g20 defconfig file
sedji gaouaou [Thu, 10 Jul 2008 09:12:14 +0000 (10:12 +0100)]
[ARM] 5133/2: at91sam9g20 defconfig file

at91sam9g20 defconfig file

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 5130/4: Support for the at91sam9g20
sedji gaouaou [Thu, 10 Jul 2008 09:15:35 +0000 (10:15 +0100)]
[ARM] 5130/4: Support for the at91sam9g20

Support for the at91sam9g20 : Atmel 400Mhz ARM 926ej-s SOC.

AT91sam9g20 is an evolution of the at91sam9260 with a faster clock
speed.
We created a new board for this device but based the chip support
directly on 9260 files with little updates.
Here is the chip page on Atmel wabsite:
http://atmel.com/dyn/products/product_card.asp?part_id=4337

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years agox86, visws: use mach-default/entry_arch.h
Ingo Molnar [Thu, 10 Jul 2008 10:35:46 +0000 (12:35 +0200)]
x86, visws: use mach-default/entry_arch.h

mach-default/entry_arch.h is exactly the same file as
mach-visws/entry_arch.h, so include the first from the second,
so that updates to the generic one get picked up by VISWS as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86, visws: fix generic-ipi build
Ingo Molnar [Thu, 10 Jul 2008 10:33:20 +0000 (12:33 +0200)]
x86, visws: fix generic-ipi build

fix:

 arch/x86/kernel/built-in.o: In function `smp_intr_init':
 (.init.text+0x49e2): undefined reference to `call_function_single_interrupt'

Caused by include/asm-x86/mach-visws/entry_arch.h getting out of sync
with the include/asm-x86/mach-default/entry_arch.h file it derives from.

Copy the default file over - next step will be to simply include the default
file.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: fix visws and vsmp build
Ingo Molnar [Thu, 10 Jul 2008 10:21:58 +0000 (12:21 +0200)]
x86: fix visws and vsmp build

these two sub-architectures want PCI to be default-on, not default-off.

Reported-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoMerge branch 'tracing/sysprof' into auto-ftrace-next
Ingo Molnar [Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)]
Merge branch 'tracing/sysprof' into auto-ftrace-next

17 years agoMerge branch 'tracing/mmiotrace' into auto-ftrace-next
Ingo Molnar [Thu, 10 Jul 2008 09:43:06 +0000 (11:43 +0200)]
Merge branch 'tracing/mmiotrace' into auto-ftrace-next

17 years agoMerge branch 'tracing/ftrace' into auto-ftrace-next
Ingo Molnar [Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)]
Merge branch 'tracing/ftrace' into auto-ftrace-next

17 years agoClocklib: Fix SA1111 clock name mess.
Ian Molton [Tue, 8 Jul 2008 09:32:50 +0000 (10:32 +0100)]
Clocklib: Fix SA1111 clock name mess.

This patch uses the ability of PXA's clocklib to alias clock to resolve the
problem caused by sharing the SA1111 IO controller between PXA and SA1100
architectures, which have differing GPIO numbering.

Signed-off-by: Ian Molton <spyro@f2s.com>
17 years agoClocklib: Provide for GPIO 12 clock on PXA
Ian Molton [Tue, 8 Jul 2008 09:32:08 +0000 (10:32 +0100)]
Clocklib: Provide for GPIO 12 clock on PXA

Signed-off-by: Ian Molton <spyro@f2s.com>
17 years agoFix serial broken-ness on PXA250
Ian Molton [Wed, 25 Jun 2008 21:17:16 +0000 (22:17 +0100)]
Fix serial broken-ness on PXA250

PXA255 and 26x are the only PXA CPUs with HWUART. This patch prevents bogus
initialisation on other models.

Signed-off-by: Ian Molton <spyro@f2s.com>
17 years agoALSA: usb-audio: add some Yamaha USB MIDI quirks
Clemens Ladisch [Thu, 10 Jul 2008 09:05:42 +0000 (11:05 +0200)]
ALSA: usb-audio: add some Yamaha USB MIDI quirks

Add quirk entries for four Yamaha USB MIDI devices.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
17 years agox86: I/O APIC: Add a 64-bit variation of replace_pin_at_irq()
Maciej W. Rozycki [Tue, 1 Jul 2008 00:19:31 +0000 (01:19 +0100)]
x86: I/O APIC: Add a 64-bit variation of replace_pin_at_irq()

When an interrupt is rerouted to a different I/O APIC pin the relevant
entry of the irq_2_pin list should get updated accordingly so that
operations are performed on the correct redirection entry.

This is already done by the 32-bit variation of the code and here is a
complementing 64-bit implementation.  Should make someone's decision less
tough when merging the two. ;)

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoALSA: usb-audio: fix Yamaha KX quirk
Clemens Ladisch [Thu, 10 Jul 2008 09:01:06 +0000 (11:01 +0200)]
ALSA: usb-audio: fix Yamaha KX quirk

We have to restrict the quirk to interface 0 because the second
interface is not MIDI but HID. Additionally, this product ID is used
by all four KX models, so it is better to read the product name from
the device.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
17 years agoRevert "x86: fix IO APIC breakage on HP nx6325"
Ingo Molnar [Thu, 10 Jul 2008 09:00:50 +0000 (11:00 +0200)]
Revert "x86: fix IO APIC breakage on HP nx6325"

This reverts commit 90221a61a71b7ad659d8741cf1e404506b174982.

This too was just temporary diagnostics - not needed now that we've
got the final fix via:

| commit e2079c43861f71b2deb78ee20e247ad954fdd67e
| Author: Rafael J. Wysocki <rjw@sisk.pl>
| Date:   Tue Jul 8 16:12:26 2008 +0200
|
|     x86: fix C1E && nx6325 stability problem

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoRevert "x86: fix IO APIC breakage on HP nx6325, v2"
Ingo Molnar [Thu, 10 Jul 2008 08:59:59 +0000 (10:59 +0200)]
Revert "x86: fix IO APIC breakage on HP nx6325, v2"

This reverts commit a74a1cc3df0be89658bc735c8aed80c8392e2c15.

This was just temporary diagnostics commit - not needed now that we've
got the final fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86, AMD IOMMU: clean up Kconfig entry
FUJITA Tomonori [Thu, 10 Jul 2008 00:50:50 +0000 (09:50 +0900)]
x86, AMD IOMMU: clean up Kconfig entry

AMD_IOMMU should depend on IOMMU_HELPER since they are the IOMMU
helper functions. SWIOTLB requires IOMMU_HELPER so declaring that
AMD_IOMMU depends on SWIOTLB properly fixes the problems.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: clean up iommu.h and gart.h
FUJITA Tomonori [Wed, 9 Jul 2008 23:27:49 +0000 (08:27 +0900)]
x86: clean up iommu.h and gart.h

This remove lots of duplications in iommu.h and gart.h.

The end result of this patch is:

- iommu.h is a header file for everyone related with IOMMUs.

- gart.h is the private header file. Only pci-gart_64.c and its friends
  include it.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: fujita.tomonori@lab.ntt.co.jp
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoMerge branch 'x86/gart' into x86/core
Ingo Molnar [Thu, 10 Jul 2008 08:43:11 +0000 (10:43 +0200)]
Merge branch 'x86/gart' into x86/core

17 years agox86: fix /dev/mem compatibility under PAT
Venkatesh Pallipadi [Thu, 10 Jul 2008 08:09:59 +0000 (10:09 +0200)]
x86: fix /dev/mem compatibility under PAT

Add ioremap_default(), which gives a sane mapping without worrying about
type conflicts.

Use it in /dev/mem read in place of ioremap(), as with ioremap(),
any mapping of the region (other than UC_MINUS) will cause a conflict
and failure of /dev/mem read.

Should address the vbetest failure reported at:

  http://bugzilla.kernel.org/show_bug.cgi?id=11057

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agosched: fix cpu hotplug
Dmitry Adamushko [Wed, 9 Jul 2008 22:32:40 +0000 (00:32 +0200)]
sched: fix cpu hotplug

I think we may have a race between try_to_wake_up() and
migrate_live_tasks() -> move_task_off_dead_cpu() when the later one
may end up looping endlessly.

Interrupts are enabled on other CPUs when migration_call(CPU_DEAD, ...) is
called so we may get a race between try_to_wake_up() and
migrate_live_tasks() -> move_task_off_dead_cpu(). The former one may push
a task out of a dead CPU causing the later one to loop endlessly.

Heiko Carstens observed:

| That's exactly what explains a dump I got yesterday. Thanks for fixing! :)

Signed-off-by: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Cc: miaox@cn.fujitsu.com
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Avi Kivity <avi@qumranet.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoALSA: ASoC: Au12x0/Au1550 PSC Audio support
Manuel Lauss [Wed, 9 Jul 2008 14:27:56 +0000 (16:27 +0200)]
ALSA: ASoC: Au12x0/Au1550 PSC Audio support

Audio for Au12x0/Au1550 PSCs in AC97 and I2S mode, for ASoC v1 framework.

- DBDMA, AC97 and I2S drivers
- sample AC97 machine code (Db1200)

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: Add Yamaha KX49 (USB MIDI controller) to usbquirks.h
Richard Chan [Wed, 9 Jul 2008 17:39:07 +0000 (19:39 +0200)]
ALSA: Add Yamaha KX49 (USB MIDI controller) to usbquirks.h

This patch is for the Yamaha USB MIDI controller KX49.
http://www.yamahasynth.com/products/kx/index.html
It has a 3-port MIDI interface and an HID interface (it has a tiny
keyboard subset).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ASoC: pxa2xx-ac97: fix warning due to missing argument in fuction declaration
Dmitry Baryshkov [Tue, 8 Jul 2008 15:45:42 +0000 (19:45 +0400)]
ALSA: ASoC: pxa2xx-ac97: fix warning due to missing argument in fuction declaration

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: tosa: fix compilation with new DAPM API
Dmitry Baryshkov [Tue, 8 Jul 2008 15:45:20 +0000 (19:45 +0400)]
ALSA: tosa: fix compilation with new DAPM API

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: wavefront - add const
Takashi Iwai [Wed, 9 Jul 2008 17:13:30 +0000 (19:13 +0200)]
ALSA: wavefront - add const

Fix const to non-const pointer cast warning in wavefront_synth.c.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: remove CONFIG_KMOD from sound
Johannes Berg [Wed, 9 Jul 2008 08:28:41 +0000 (10:28 +0200)]
ALSA: remove CONFIG_KMOD from sound

A bunch of things in alsa depend on CONFIG_KMOD,
use CONFIG_MODULES instead where the dependency
is needed at all.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: Fix a const to non-const assignment in the Digigram VXpocket sound driver
David Howells [Tue, 8 Jul 2008 16:52:10 +0000 (17:52 +0100)]
ALSA: Fix a const to non-const assignment in the Digigram VXpocket sound driver

Fix a const to non-const pointer assignment warning in the Digigram VXpocket
sound driver.

This may be due to patch 0aa4937648b91e9e6d3879b2cbeaa5f0c9863ac0.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: Fix a const pointer usage warning in the Digigram VX soundcard driver
David Howells [Tue, 8 Jul 2008 16:30:30 +0000 (17:30 +0100)]
ALSA: Fix a const pointer usage warning in the Digigram VX soundcard driver

Fix a const pointer usage warning in the Digigram VX soundcard driver.  A
const pointer is being passed to copy_from_user() to load the firmware into.
This is okay in this case because the function has allocated the firmware
struct itself, but the const qualifier is part of the firmware struct - so the
patch casts the const away.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: at32 - DAI struct merge and enable_pin() change.
Liam Girdwood [Tue, 8 Jul 2008 12:21:52 +0000 (13:21 +0100)]
ALSA: asoc: at32 - DAI struct merge and enable_pin() change.

This adds support for the recent DAI struct merge and new DAPM pin API.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: n810 - fix build error.
Liam Girdwood [Tue, 8 Jul 2008 12:20:39 +0000 (13:20 +0100)]
ALSA: asoc: n810 - fix build error.

This patch adds a missing " that was recently introduced (removed)
in the DAI struct merge patch series.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: machines - add Digital Audio Interface (DAI) control functions.
Liam Girdwood [Tue, 8 Jul 2008 12:19:18 +0000 (13:19 +0100)]
ALSA: asoc: machines - add Digital Audio Interface (DAI) control functions.

This patch adds several functions for DAI control and config
and replaces the current method of calling function pointers within
the DAI struct within the machine drivers.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: core - add Digital Audio Interface (DAI) control functions.
Liam Girdwood [Tue, 8 Jul 2008 12:19:13 +0000 (13:19 +0100)]
ALSA: asoc: core - add Digital Audio Interface (DAI) control functions.

This patch adds several functions for DAI control and config
and replaces the current method of calling function pointers within
the DAI struct.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: hda - removed redundant gpio_mask
Matthew Ranostay [Tue, 8 Jul 2008 09:50:09 +0000 (11:50 +0200)]
ALSA: hda - removed redundant gpio_mask

An gpio_mask value was defined twice needlessly.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ASoC: Dump DAPM state for non-stream changes
Mark Brown [Mon, 7 Jul 2008 18:26:04 +0000 (19:26 +0100)]
ALSA: ASoC: Dump DAPM state for non-stream changes

Explicit DAPM syncs are likely to cause DAPM state updates, as are mixer
and mux configuration changes, so display the DAPM status after them too.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ASoC: Switch DAPM to use of standard DEBUG macro
Mark Brown [Mon, 7 Jul 2008 18:26:03 +0000 (19:26 +0100)]
ALSA: ASoC: Switch DAPM to use of standard DEBUG macro

DAPM contains debug output controlled by a DAPM_DEBUG macro. Change this
to be controlled by the standard DEBUG, dropping the custom dbg() macro
as we go.

Also fix the error printed when configuring an unknown pin to be an
unconditionally displayed error rather than debug output.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: sh - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:08:29 +0000 (16:08 +0100)]
ALSA: asoc: sh - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the SuperH platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: s3c24xx - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:08:24 +0000 (16:08 +0100)]
ALSA: asoc: s3c24xx - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the S3C24xx platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: pxa - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:08:11 +0000 (16:08 +0100)]
ALSA: asoc: pxa - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the PXA platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: omap - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:08:07 +0000 (16:08 +0100)]
ALSA: asoc: omap - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the Omap platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: fsl - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:08:00 +0000 (16:08 +0100)]
ALSA: asoc: fsl - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the Freescale PPC platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: codecs - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:07:52 +0000 (16:07 +0100)]
ALSA: asoc: codecs - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the codec drivers.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: davinci - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:07:42 +0000 (16:07 +0100)]
ALSA: asoc: davinci - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the DaVinci platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: at91 - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:07:37 +0000 (16:07 +0100)]
ALSA: asoc: at91 - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the AT91 platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: at32 - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:07:29 +0000 (16:07 +0100)]
ALSA: asoc: at32 - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch series merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for AT32 platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: core - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Liam Girdwood [Mon, 7 Jul 2008 15:07:17 +0000 (16:07 +0100)]
ALSA: asoc: core - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.

This patch series merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai in preparation for further
ASoC v2 patches.

This merger removes duplication in both DAI structures and simplifies
the API for other users.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: asoc: core - refactored DAPM pin control API.
Liam Girdwood [Mon, 7 Jul 2008 12:35:17 +0000 (13:35 +0100)]
ALSA: asoc: core - refactored DAPM pin control API.

Refactored snd_soc_dapm_set_endpoint() to snd_soc_dapm_enable_pin() and
snd_soc_dapm_disable_pin().

Renamed snd_soc_dapm_sync_endpoints() to snd_soc_dapm_sync().
Renamed snd_soc_dapm_get_endpoint_status() to
snd_soc_dapm_get_pin_status().

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: hda - Add support for Lenovo 3000 N200
Takashi Iwai [Mon, 7 Jul 2008 14:04:04 +0000 (16:04 +0200)]
ALSA: hda - Add support for Lenovo 3000 N200

Added the model entry (model=lenovo) for Lenovo N3000 N200 laptop
with ALC861-VD.  Reference below:
https://bugzilla.novell.com/show_bug.cgi?id=406425

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ASoC: Fix warning from strict_strtoul()
Mark Brown [Fri, 4 Jul 2008 15:01:14 +0000 (16:01 +0100)]
ALSA: ASoC: Fix warning from strict_strtoul()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ASoC: AC97 codec PM
Manuel Lauss [Thu, 3 Jul 2008 07:33:10 +0000 (09:33 +0200)]
ALSA: ASoC: AC97 codec PM

Simple suspend/resume for AC97 ASoC codec.

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Acked-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ASoC: Make pop/click debug wait times dynamically configurable
Mark Brown [Wed, 2 Jul 2008 10:51:20 +0000 (11:51 +0100)]
ALSA: ASoC: Make pop/click debug wait times dynamically configurable

DAPM supports adding a compile time configurable delay to the widget power
sequences, aiding diagnosis of problems with pops and clicks being
generated during them. This patch converts this to be configurable at run
time via a sysfs file.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ASoC: Advertise 16000Hz rate for WM9713 PCM interface
Mark Brown [Wed, 2 Jul 2008 10:51:19 +0000 (11:51 +0100)]
ALSA: ASoC: Advertise 16000Hz rate for WM9713 PCM interface

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ac97 - fix patch_ucb1400 for proper resume
Mike Rapoport [Wed, 2 Jul 2008 10:19:23 +0000 (13:19 +0300)]
ALSA: ac97 - fix patch_ucb1400 for proper resume

Replace 'snd_ac97_write' with snd_ac97_write_cache' in pacth_ucb1400 to allow
proper codec wakeup.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ALSA: hda - Fix speaker output on Toshiba P105
Takashi Iwai [Tue, 1 Jul 2008 12:52:05 +0000 (14:52 +0200)]
ALSA: ALSA: hda - Fix speaker output on Toshiba P105

Toshiba Satellite P105 with cx5045 has no HP pin but only a
speaker pin and does the speaker-muting on hardware.
Thus the matching model is laptop-micsense.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: hda - Add missing Thinkpad Z60m support
Takashi Iwai [Mon, 30 Jun 2008 14:40:10 +0000 (16:40 +0200)]
ALSA: hda - Add missing Thinkpad Z60m support

Added the missing SSID of Thinkpad Z60m for model=thinkpad with
AD1981HD.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ALSA: hda - Fix ALC883 medion model
Takashi Iwai [Fri, 27 Jun 2008 14:30:57 +0000 (16:30 +0200)]
ALSA: ALSA: hda - Fix ALC883 medion model

ALC883 medion model doesn't unmute the proper amps so no output can be heard.
Replaced the mute switches to behave just like other models.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: ASoC: TLV320AIC3X: Add mixer control for ADC highpass filter
Jarkko Nikula [Fri, 27 Jun 2008 11:07:57 +0000 (14:07 +0300)]
ALSA: ASoC: TLV320AIC3X: Add mixer control for ADC highpass filter

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: Fix AC97 power down
Takashi Iwai [Fri, 27 Jun 2008 09:55:20 +0000 (11:55 +0200)]
ALSA: Fix AC97 power down

Some laptops don't like PR3 powerdown.  Do PR3 powerdown only
for the real power-saving.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agoALSA: via82xx - Add VIA audio device #1841 to ac97_quirk list
Walter Sheets [Fri, 27 Jun 2008 09:53:31 +0000 (11:53 +0200)]
ALSA: via82xx - Add VIA audio device #1841 to ac97_quirk list

Signed-off-by: Walter Sheets <w41ter@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
17 years agox86: make e820_end return end_of_ram again for 64bit
Yinghai Lu [Thu, 10 Jul 2008 03:17:50 +0000 (20:17 -0700)]
x86: make e820_end return end_of_ram again for 64bit

even on 64bit systems with less than 4G RAM, we can now use fixmap
to handle acpi SIT near end of ram.

change e820_end to e820_end_of_ram again?
or e820_ram_pfn?

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86, acpi: merge __acpi_map_table
Yinghai Lu [Thu, 10 Jul 2008 03:16:36 +0000 (20:16 -0700)]
x86, acpi: merge __acpi_map_table

and let 64-bit to fall back to use fixmap too.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoMerge branch 'for-2.6.26' into for-next
Neil Brown [Thu, 10 Jul 2008 06:51:26 +0000 (16:51 +1000)]
Merge branch 'for-2.6.26' into for-next

Conflicts:

drivers/md/raid5.c

17 years agox86: overmapped fix when 4K pages on tail, 64-bit
Yinghai Lu [Thu, 10 Jul 2008 03:15:02 +0000 (20:15 -0700)]
x86: overmapped fix when 4K pages on tail, 64-bit

fix phys_pmd_init to make sure not to return bigger value than end.

also print out range split:1G/2M/4K in init_memory_mapping().

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoMerge branch 'linus' into core/printk
Ingo Molnar [Thu, 10 Jul 2008 06:17:14 +0000 (08:17 +0200)]
Merge branch 'linus' into core/printk

Conflicts:

kernel/printk.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: build fix for "x86: fix C1E && nx6325 stability problem"
Ingo Molnar [Wed, 9 Jul 2008 11:07:23 +0000 (13:07 +0200)]
x86: build fix for "x86: fix C1E && nx6325 stability problem"

fix:

 arch/x86/kernel/built-in.o: In function `dmi_ignore_irq0_timer_override':
 boot.c:(.init.text+0x3ea4): undefined reference to `force_mask_ioapic_irq_2'

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agomd: ensure all blocks are uptodate or locked when syncing
Dan Williams [Thu, 10 Jul 2008 11:54:57 +0000 (04:54 -0700)]
md: ensure all blocks are uptodate or locked when syncing

Remove the dubious attempt to prefer 'compute' over 'read'.  Not only is it
wrong given commit c337869d (md: do not compute parity unless it is on a failed
drive), but it can trigger a BUG_ON in handle_parity_checks5().

Cc: <stable@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Neil Brown <neilb@suse.de>
17 years agopmtmr: allow command line override of ioport
Thomas Gleixner [Wed, 21 May 2008 19:14:58 +0000 (21:14 +0200)]
pmtmr: allow command line override of ioport

Stupid BIOSes do not tell us about the PMTimer,
but we might know where it is.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
17 years agogenirq: remove extraneous checks in manage.c
Thomas Gleixner [Thu, 10 Jul 2008 05:01:13 +0000 (07:01 +0200)]
genirq: remove extraneous checks in manage.c

In http://bugzilla.kernel.org/show_bug.cgi?id=9580 it was pointed out
that the desc->chip checks are extraneous. In fact these are left
overs from early development and can be removed safely.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
17 years ago[ARM] 5160/1: IOP3XX: gpio/gpiolib support
Arnaud Patard [Tue, 8 Jul 2008 22:07:48 +0000 (23:07 +0100)]
[ARM] 5160/1: IOP3XX: gpio/gpiolib support

This patch brings support for gpio/gpiolib framework to Intel IOP3xx
platforms.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Wed, 9 Jul 2008 22:10:09 +0000 (15:10 -0700)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

17 years agonetfilter: nf_nat_snmp_basic: fix a range check in NAT for SNMP
David Howells [Wed, 9 Jul 2008 22:06:45 +0000 (15:06 -0700)]
netfilter: nf_nat_snmp_basic: fix a range check in NAT for SNMP

Fix a range check in netfilter IP NAT for SNMP to always use a big enough size
variable that the compiler won't moan about comparing it to ULONG_MAX/8 on a
64-bit platform.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agonetfilter: nf_conntrack_tcp: fix endless loop
Patrick McHardy [Wed, 9 Jul 2008 22:06:12 +0000 (15:06 -0700)]
netfilter: nf_conntrack_tcp: fix endless loop

When a conntrack entry is destroyed in process context and destruction
is interrupted by packet processing and the packet is an attempt to
reopen a closed connection, TCP conntrack tries to kill the old entry
itself and returns NF_REPEAT to pass the packet through the hook
again. This may lead to an endless loop: TCP conntrack repeatedly
finds the old entry, but can not kill it itself since destruction
is already in progress, but destruction in process context can not
complete since TCP conntrack is keeping the CPU busy.

Drop the packet in TCP conntrack if we can't kill the connection
ourselves to avoid this.

Reported by: hemao77@gmail.com [ Kernel bugzilla #11058 ]
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
Linus Torvalds [Wed, 9 Jul 2008 21:16:23 +0000 (14:16 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cxgb3: Fix regression caused by class_device -> device conversion

17 years ago[ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
Patrice Vilchez [Wed, 9 Jul 2008 21:16:00 +0000 (22:16 +0100)]
[ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.

New timings are based on application note
"NAND Flash Support on AT91SAM9 Microcontrollers" available at
http://atmel.com/dyn/resources/prod_documents/doc6255.pdf).

Signed-off-by: Patrice Vilchez <patrice.vilchez@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] pxa: add support for L2 outer cache on XScale3
Eric Miao [Fri, 6 Jun 2008 08:34:03 +0000 (16:34 +0800)]
[ARM] pxa: add support for L2 outer cache on XScale3

The initial patch from Lothar, and Lennert make it into a cleaner
one, modified and tested on PXA320 by Eric Miao.

This patch moves the L2 cache operations out of proc-xsc3.S into
dedicated outer cache support code.

CACHE_XSC3L2 can be deselected so no L2 cache specific code will be
linked in, and that L2 enable bit will not be set, this applies to
the following cases:

    a. _only_ PXA300/PXA310 support included and no L2 cache wanted
    b. PXA320 support included, but want L2 be disabled

So the enabling of L2 depends on two things:

    - CACHE_XSC3L2 is selected
    - and L2 cache is present

Where the latter is only a safeguard (previous testing shows it works
OK even when this bit is turned on).

IXP series of processors with XScale3 cannot disable L2 cache for the
moment since they depend on the L2 cache for its coherent memory, so
IXP may always select CACHE_XSC3L2.

Other L2 relevant bits are always turned on (i.e. the original code
enclosed by #if L2_CACHE_ENABLED .. #endif), as they showed no side
effects. Specifically, these bits are:

   - OC bits in TTBASE register (table walk outer cache attributes)
   - LLR Outer Cache Attributes (OC) in Auxiliary Control Register

Signed-off-by: Lothar WaÃ<9f>mann <LW@KARO-electronics.de>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>