sfrench/cifs-2.6.git
14 years agoMerge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Linus Torvalds [Thu, 21 Dec 2006 07:56:06 +0000 (23:56 -0800)]
Merge branch 'linus' of /linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (30 commits)
  [ALSA] version 1.0.14rc1
  [ALSA] ac97: Identify CMI9761 chips.
  [ALSA] ac97_codec - trivial fix for bit update functions
  [ALSA] snd-ca0106: Fix typos.
  [ALSA] snd-ca0106: Add new card variant.
  [ALSA] sound: fix PCM substream list
  [ALSA] sound: initialize rawmidi substream list
  [ALSA] snd_hda_intel 3stack mode for ASUS P5P-L2
  [ALSA] Remove IRQF_DISABLED for shared PCI irqs
  [ALSA] Fix invalid assignment of PCI revision
  [ALSA] Fix races in PCM OSS emulation
  [ALSA] hda-codec - fix typo in PCI IDs
  [ALSA] ac97 - Fix potential negative array index
  [ALSA] hda-codec - Verbose proc output for PCM parameters
  [ALSA] hda-codec - Fix detection of supported sample rates
  [ALSA] hda-codec - Fix model for ASUS V1j laptop
  [ALSA] sound/core/control.c: remove dead code
  [ALSA] hda-codec - Add model for HP q965
  [ALSA] pcm core: fix silence_start calculations
  [ALSA] hda-codec - Fix a typo
  ...

14 years agoMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 21 Dec 2006 07:54:23 +0000 (23:54 -0800)]
Merge branch 'for-linus' of /home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (29 commits)
  [ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC
  [ARM] 4060/1: update several ARM defconfigs
  [ARM] 4061/1: xsc3: change of maintainer
  [ARM] 4059/1: VR1000: fix LED3's platform device number
  [ARM] 4022/1: iop13xx: generic irq fixups
  [ARM] 4015/1: s3c2410 cpu ifdefs
  [ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency
  [ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup
  [ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc
  [ARM] 4054/1: ep93xx: add HWCAP_CRUNCH
  [ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig
  [ARM] Fix warnings from asm/system.h
  [ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support
  [ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410
  [ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h
  [ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static
  [ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410
  [ARM] 4045/1: S3C24XX: remove old VA for non-shared areas
  [ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c
  [ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c
  ...

14 years ago[ALSA] version 1.0.14rc1
Jaroslav Kysela [Wed, 20 Dec 2006 08:11:55 +0000 (09:11 +0100)]
[ALSA] version 1.0.14rc1

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] ac97: Identify CMI9761 chips.
James Courtier-Dutton [Tue, 12 Dec 2006 17:05:24 +0000 (17:05 +0000)]
[ALSA] ac97: Identify CMI9761 chips.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] ac97_codec - trivial fix for bit update functions
James C Georgas [Thu, 7 Dec 2006 07:10:57 +0000 (08:10 +0100)]
[ALSA] ac97_codec - trivial fix for bit update functions

This patch fixes a couple of bit update functions in
alsa-kernel/pci/ac97/ac97_codec.c, which could possibly corrupt bits not
in the given mask.
Specifically, it'll clobber unset bits in the target that are not in the
mask, when the corresponding bit in the given new value is set.

Signed-off-by: James C Georgas <jgeorgas@rogers.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] snd-ca0106: Fix typos.
James Courtier-Dutton [Sat, 25 Nov 2006 19:50:11 +0000 (19:50 +0000)]
[ALSA] snd-ca0106: Fix typos.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] snd-ca0106: Add new card variant.
James Courtier-Dutton [Sat, 25 Nov 2006 19:42:29 +0000 (19:42 +0000)]
[ALSA] snd-ca0106: Add new card variant.

Fixed ALSA bug#2326

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] sound: fix PCM substream list
Akinobu Mita [Thu, 23 Nov 2006 11:03:24 +0000 (12:03 +0100)]
[ALSA] sound: fix PCM substream list

If snd_pcm_new_stream() fails to initalize a substream (if
snd_pcm_substream_proc_init() returns error), snd_pcm_new_stream()
immediately return without unlinking that kfree()d substram.
It causes oops when snd_pcm_free() iterates the list of substream to
free them by invalid reference.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] sound: initialize rawmidi substream list
Akinobu Mita [Thu, 23 Nov 2006 11:02:33 +0000 (12:02 +0100)]
[ALSA] sound: initialize rawmidi substream list

If snd_rawmidi_new() failed to allocate substreams for input
(snd_rawmidi_alloc_substreams() failed to populate a
&rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT]), it will try to
free rawmidi instance by snd_rawmidi_free().
But it will cause oops because snd_rawmidi_free() tries to free
both of substreams list but list for output
(&rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT]) is not initialized yet.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] snd_hda_intel 3stack mode for ASUS P5P-L2
Nickolay V. Shmyrev [Tue, 21 Nov 2006 17:56:37 +0000 (18:56 +0100)]
[ALSA] snd_hda_intel 3stack mode for ASUS P5P-L2

I have ASUS P5PL2 motherboard and it's embedded sound card requires
the following patch which sets '3stack' model to operate properly:
00:1b.0 0403: 8086:27d8 (rev 01)
        Subsystem: 1043:817f
        Flags: bus master, fast devsel, latency 0, IRQ 177
        Memory at dfdf8000 (64-bit, non-prefetchable) [size=16K]
        Capabilities: [50] Power Management version 2
        Capabilities: [60] Message Signalled Interrupts: 64bit+
Queue=0/0 Enable-
        Capabilities: [70] Express Unknown type IRQ 0

Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] Remove IRQF_DISABLED for shared PCI irqs
Takashi Iwai [Tue, 21 Nov 2006 11:14:23 +0000 (12:14 +0100)]
[ALSA] Remove IRQF_DISABLED for shared PCI irqs

Fix IRQ flags for PCI devices.
The shared IRQs for PCI devices shouldn't be allocated with
IRQF_DISABLED.  Also, when MSI is enabled, IRQF_SHARED shouldn't
be used.
The patch removes unnecessary cast in request_irq and free_irq,
too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] Fix invalid assignment of PCI revision
Takashi Iwai [Thu, 16 Nov 2006 14:39:07 +0000 (15:39 +0100)]
[ALSA] Fix invalid assignment of PCI revision

Fix the type of PCI revision to char from int and avoid invalid
assignment with pointer cast.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] Fix races in PCM OSS emulation
Takashi Iwai [Tue, 14 Nov 2006 12:03:19 +0000 (13:03 +0100)]
[ALSA] Fix races in PCM OSS emulation

Fixed the race among multiple threads accessing the OSS PCM
instance concurrently by simply introducing a mutex for protecting
a setup of the PCM.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hda-codec - fix typo in PCI IDs
Christian Hesse [Wed, 8 Nov 2006 14:50:41 +0000 (15:50 +0100)]
[ALSA] hda-codec - fix typo in PCI IDs

my notebook is a Samsung X11 of course... The attached patch fixes the typo.

Signed-off-by: Christian Hesse <mail@earthworm.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] ac97 - Fix potential negative array index
Takashi Iwai [Wed, 8 Nov 2006 14:48:43 +0000 (15:48 +0100)]
[ALSA] ac97 - Fix potential negative array index

Fix the case cidx2 >= 0 and cidx2 < 0 which may result in negative
array index.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hda-codec - Verbose proc output for PCM parameters
Takashi Iwai [Tue, 7 Nov 2006 15:10:06 +0000 (16:10 +0100)]
[ALSA] hda-codec - Verbose proc output for PCM parameters

Make the output for PCM parameters more verbose, showing
each rate, bits and format.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hda-codec - Fix detection of supported sample rates
Takashi Iwai [Tue, 7 Nov 2006 15:09:00 +0000 (16:09 +0100)]
[ALSA] hda-codec - Fix detection of supported sample rates

Don't include 9.6kHz in the list of supported sample rates.
Since this rate isn't indicated in AC_PAR_PCM parameter,
the driver might guess wrongly as if it's available.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hda-codec - Fix model for ASUS V1j laptop
Takashi Iwai [Tue, 7 Nov 2006 12:48:42 +0000 (13:48 +0100)]
[ALSA] hda-codec - Fix model for ASUS V1j laptop

Add a proper model entry (laptop-eapd) for ASUS V1j laptop with
AD1986A codec.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] sound/core/control.c: remove dead code
Adrian Bunk [Tue, 7 Nov 2006 12:42:54 +0000 (13:42 +0100)]
[ALSA] sound/core/control.c: remove dead code

This patch removes some obviously dead code spotted by the Coverity
checker.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hda-codec - Add model for HP q965
Takashi Iwai [Tue, 24 Oct 2006 12:57:52 +0000 (14:57 +0200)]
[ALSA] hda-codec - Add model for HP q965

Added a model entry (HP_BPC) for HP q965 with ALC262 codec.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] pcm core: fix silence_start calculations
Clemens Ladisch [Mon, 23 Oct 2006 14:26:57 +0000 (16:26 +0200)]
[ALSA] pcm core: fix silence_start calculations

The case where silence_size < boundary was broken because different
parts of the snd_pcm_playback_silence() function disagreed about whether
silence_start should point to the start or to the end of the buffer part
to be silenced.
This patch changes the code to always use to the start, which also
simplifies several calculations.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hda-codec - Fix a typo
Takashi Iwai [Tue, 17 Oct 2006 18:41:38 +0000 (20:41 +0200)]
[ALSA] hda-codec - Fix a typo

Fixed a typo in proc file.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hdsp: precise_ptr control switched off by default
Remy Bruno [Mon, 16 Oct 2006 10:32:53 +0000 (12:32 +0200)]
[ALSA] hdsp: precise_ptr control switched off by default

precise_ptr option causes dysfunction with hdsp driver.
Turn it off as default.

Signed-off-by: Remy Bruno <remy.bruno@trinnov.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hda-codec - Don't return error at initialization of modem codec
Takashi Iwai [Tue, 10 Oct 2006 18:01:01 +0000 (20:01 +0200)]
[ALSA] hda-codec - Don't return error at initialization of modem codec

Some modem codec seem to fail in the initialization, and this
stopped loading of the whole module although the audio is OK.
Since it's usually a non-fatal issue, the driver tries to proceed
to initialize now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] hda-codec - Fix wrong error checks in patch_{realtek,analog}.c
Takashi Iwai [Tue, 10 Oct 2006 17:49:31 +0000 (19:49 +0200)]
[ALSA] hda-codec - Fix wrong error checks in patch_{realtek,analog}.c

Fix wrong error checks of *_ch_mode_put() in patch_realtek.c and
patch_analog.c.  snd_hda_ch_mode_put() could return a positive
value for success, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] ymfpci: fix swap_rear for S/PDIF passthrough
Glen Masgai [Tue, 10 Oct 2006 07:27:19 +0000 (09:27 +0200)]
[ALSA] ymfpci: fix swap_rear for S/PDIF passthrough

This patch fixes incorrect assignment of swap_rear,
which was broken since patch 'ymfpci - make rear channel swap optional'
It removes module_param rear_swap.

Signed-off-by: Glen Masgai <mimosius@gmx.de>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] use the roundup macro
Clemens Ladisch [Mon, 9 Oct 2006 06:14:15 +0000 (08:14 +0200)]
[ALSA] use the roundup macro

Use the roundup macro instead of manual calculations.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] use the ALIGN macro
Clemens Ladisch [Mon, 9 Oct 2006 06:13:32 +0000 (08:13 +0200)]
[ALSA] use the ALIGN macro

Use the ALIGN macro instead of manual calculations.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] ac97_codec (ALC655): add EAPD hack for MSI L725 laptop
Jaroslav Kysela [Thu, 5 Oct 2006 07:30:36 +0000 (09:30 +0200)]
[ALSA] ac97_codec (ALC655): add EAPD hack for MSI L725 laptop

New PCI ID described and tested Spectr <spectr@gmail.com> .

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] sound: Don't include i2c-dev.h
Jean Delvare [Wed, 4 Oct 2006 16:38:16 +0000 (18:38 +0200)]
[ALSA] sound: Don't include i2c-dev.h

Don't include <linux/i2c-dev.h> as it's not needed.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] sound/usb/usbaudio: Handle return value of usb_register()
Tobias Klauser [Wed, 4 Oct 2006 16:12:43 +0000 (18:12 +0200)]
[ALSA] sound/usb/usbaudio: Handle return value of usb_register()

Handle the return value of usb_register() in the module_init function.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ALSA] via82xx: add __devinitdata
Andreas Mohr [Wed, 4 Oct 2006 15:15:04 +0000 (17:15 +0200)]
[ALSA] via82xx: add __devinitdata

add __devinitdata to struct whitelist, since it's used within
a __devinit function.
Add const attribute to iterator variable, too.
Compile-tested (no section warnings etc.) and run-tested
on vt8233, 2.6.18-mm3 (hopefully applies well to current ALSA).

Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
14 years ago[ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC
Ben Dooks [Tue, 19 Dec 2006 22:46:17 +0000 (23:46 +0100)]
[ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC

Both CONFIG_MACH_OSIRIS and CONFIG_MACH_ANUBIS
should select CONFIG_PM_SIMTEC.

This patch moves the selection of CONFIG_PM_SIMTEC
to the machines that require it, as currently done
with other machines in the S3C2410 architecture.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4060/1: update several ARM defconfigs
Lennert Buytenhek [Tue, 19 Dec 2006 20:46:05 +0000 (21:46 +0100)]
[ARM] 4060/1: update several ARM defconfigs

Update the ep93xx, iop13xx, iop32x, iop33x, ixp2000, ixp23xx,
lpd270 and onearm defconfigs to 2.6.20-rc1.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4061/1: xsc3: change of maintainer
Lennert Buytenhek [Tue, 19 Dec 2006 20:48:15 +0000 (21:48 +0100)]
[ARM] 4061/1: xsc3: change of maintainer

Deepak Saxena has agreed to hand xsc3 maintainership over to me.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4059/1: VR1000: fix LED3's platform device number
Ben Dooks [Tue, 19 Dec 2006 18:10:13 +0000 (19:10 +0100)]
[ARM] 4059/1: VR1000: fix LED3's platform device number

LED 3 should have been registered with the
platform deviceid of 3, instead of 1 (which
was used for LED 1).

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4022/1: iop13xx: generic irq fixups
Dan Williams [Thu, 14 Dec 2006 22:31:20 +0000 (23:31 +0100)]
[ARM] 4022/1: iop13xx: generic irq fixups

* use irq_chip
* use handle_level_irq

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Linus Torvalds [Tue, 19 Dec 2006 18:32:40 +0000 (10:32 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  [PATCH] Generic HID layer - update MAINTAINERS
  input/hid: Supporting more keys from the HUT Consumer Page
  [PATCH] Generic HID layer - build: USB_HID should select HID

14 years ago[CONNECTOR]: Replace delayed work with usual work queue.
Evgeniy Polyakov [Mon, 18 Dec 2006 09:53:58 +0000 (01:53 -0800)]
[CONNECTOR]: Replace delayed work with usual work queue.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[IPV4]: Fix BUG of ip_rt_send_redirect()
Li Yewang [Mon, 18 Dec 2006 08:26:35 +0000 (00:26 -0800)]
[IPV4]: Fix BUG of ip_rt_send_redirect()

Fix the redirect packet of the router if the jiffies wraparound.

Signed-off-by: Li Yewang <lyw@nanjing-fnst.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TCP]: Trivial fix to message in tcp_v4_inbound_md5_hash
Leigh Brown [Mon, 18 Dec 2006 01:13:10 +0000 (17:13 -0800)]
[TCP]: Trivial fix to message in tcp_v4_inbound_md5_hash

The message logged in tcp_v4_inbound_md5_hash when the hash was expected
but not found was reversed.

Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TCP]: Fix oops caused by tcp_v4_md5_do_del
Leigh Brown [Mon, 18 Dec 2006 01:12:30 +0000 (17:12 -0800)]
[TCP]: Fix oops caused by tcp_v4_md5_do_del

md5sig_info.alloced4 must be set to zero when freeing keys4, otherwise
it will not be alloc'd again when another key is added to the same
socket by tcp_v4_md5_do_add.

Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[CONNECTOR]: Fix compilation breakage introduced recently.
Evgeniy Polyakov [Mon, 18 Dec 2006 01:09:41 +0000 (17:09 -0800)]
[CONNECTOR]: Fix compilation breakage introduced recently.

Linus has changed work queue structure and has not tested it with
connector compiled in, his changes break the build.

Attached patch fixes compilation error.

Patch is against commit 99f5e9718185f07458ae70c2282c2153a2256c91.

Thanks to Toralf Förster for pointing this out.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TG3]: Update version and reldate.
Michael Chan [Mon, 18 Dec 2006 01:08:30 +0000 (17:08 -0800)]
[TG3]: Update version and reldate.

Update version to 3.71.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TG3]: Power down/up 5906 PHY correctly.
Michael Chan [Mon, 18 Dec 2006 01:08:07 +0000 (17:08 -0800)]
[TG3]: Power down/up 5906 PHY correctly.

The 5906 PHY requires a special register bit to power down and up the
PHY.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TG3]: Fix race condition when calling register_netdev().
Michael Chan [Mon, 18 Dec 2006 01:07:29 +0000 (17:07 -0800)]
[TG3]: Fix race condition when calling register_netdev().

Hot-plug scripts can call tg3_open() as soon as register_netdev() is
called in tg3_init_one().  We need to call pci_set_drvdata() before
register_netdev(), and netif_carrier_off() needs to be moved to
tg3_open() to avoid race conditions.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TG3]: Assign tp->link_config.orig_* values.
Michael Chan [Mon, 18 Dec 2006 01:06:46 +0000 (17:06 -0800)]
[TG3]: Assign tp->link_config.orig_* values.

tp->link_config.orig_* values must be assigned during
tg3_set_settings() because these values will be used to setup the
link speed during tg3_open().  Without these assignments, the link
speed settings will be all messed by if tg3_set_settings() is called
when the device is down.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[NETFILTER] IPV6: Fix dependencies.
David S. Miller [Sun, 17 Dec 2006 22:37:23 +0000 (14:37 -0800)]
[NETFILTER] IPV6: Fix dependencies.

Although the menu dependencies in net/ipv6/netfilter/Kconfig
guard the entries in that file from the Kconfig GUI, this does
not prevent them from being selected still via "make oldconfig"
when IPV6 etc. is disabled.

So add explicit dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[BNX2]: Fix minor loopback problem.
Michael Chan [Thu, 14 Dec 2006 23:57:04 +0000 (15:57 -0800)]
[BNX2]: Fix minor loopback problem.

Use the configured MAC address instead of the permanent MAC address
for loopback frames.

Update version to 1.5.2.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[BNX2]: Fix bug in bnx2_nvram_write().
Michael Chan [Thu, 14 Dec 2006 23:56:50 +0000 (15:56 -0800)]
[BNX2]: Fix bug in bnx2_nvram_write().

Length was not calculated correctly if the NVRAM offset is on a non-
aligned offset.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[BNX2]: Fix panic in bnx2_tx_int().
Michael Chan [Thu, 14 Dec 2006 23:56:32 +0000 (15:56 -0800)]
[BNX2]: Fix panic in bnx2_tx_int().

There was an off-by-one bug in bnx2_tx_avail().  If the tx ring is
completely full, the producer and consumer indices may be apart by
256 even though the ring size is only 255.  One entry in the ring is
unused and must be properly accounted for when calculating the number
of available entries.  The bug caused the tx ring entries to be
reused by mistake, overwriting active entries, and ultimately causing
it to crash.

This bug rarely occurs because the tx ring is rarely completely full.
We always stop when there is less than MAX_SKB_FRAGS entries available
in the ring.

Thanks to Corey Kovacs <cjk@techma.com> and Andy Gospodarek
<agospoda@redhat.com> for reporting the problem and helping to collect
debug information.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[AX.25]: Fix unchecked rose_add_loopback_neigh uses
Ralf Baechle [Thu, 14 Dec 2006 23:52:13 +0000 (15:52 -0800)]
[AX.25]: Fix unchecked rose_add_loopback_neigh uses

rose_add_loopback_neigh uses kmalloc and the callers were ignoring the
error value.  Rewrite to let the caller deal with the allocation.  This
allows the use of static allocation of kmalloc use entirely.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[AX.25]: Fix unchecked rose_add_loopback_node uses
Ralf Baechle [Thu, 14 Dec 2006 23:51:44 +0000 (15:51 -0800)]
[AX.25]: Fix unchecked rose_add_loopback_node uses

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[AX.25]: Fix unchecked ax25_linkfail_register uses
Ralf Baechle [Thu, 14 Dec 2006 23:51:23 +0000 (15:51 -0800)]
[AX.25]: Fix unchecked ax25_linkfail_register uses

ax25_linkfail_register uses kmalloc and the callers were ignoring the
error value.  Rewrite to let the caller deal with the allocation.  This
allows the use of static allocation of kmalloc use entirely.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[AX.25]: Fix unchecked nr_add_node uses.
Ralf Baechle [Thu, 14 Dec 2006 23:50:58 +0000 (15:50 -0800)]
[AX.25]: Fix unchecked nr_add_node uses.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[AX.25]: Fix unchecked ax25_listen_register uses
Ralf Baechle [Thu, 14 Dec 2006 23:50:34 +0000 (15:50 -0800)]
[AX.25]: Fix unchecked ax25_listen_register uses

Fix ax25_listen_register to return something that's a sane error code,
then all callers to use it.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[AX.25]: Fix unchecked ax25_protocol_register uses.
Ralf Baechle [Thu, 14 Dec 2006 23:50:01 +0000 (15:50 -0800)]
[AX.25]: Fix unchecked ax25_protocol_register uses.

Replace ax25_protocol_register by ax25_register_pid which assumes the
caller has done the memory allocation.  This allows replacing the
kmalloc allocations entirely by static allocations.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[AX.25]: Mark all kmalloc users __must_check
Ralf Baechle [Thu, 14 Dec 2006 23:49:28 +0000 (15:49 -0800)]
[AX.25]: Mark all kmalloc users __must_check

The recent fix 0506d4068bad834aab1141b5dc5e748eb175c6b3 made obvious that
error values were not being propagated through the AX.25 stack.  To help
with that this patch marks all kmalloc users in the AX.25, NETROM and
ROSE stacks as __must_check.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[TG3]: replace kmalloc+memset with kzalloc
Yan Burman [Thu, 14 Dec 2006 23:25:00 +0000 (15:25 -0800)]
[TG3]: replace kmalloc+memset with kzalloc

Replace kmalloc+memset with kzalloc

Signed-off-by: Yan Burman <burman.yan@gmail.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Linus Torvalds [Mon, 18 Dec 2006 03:08:11 +0000 (19:08 -0800)]
Merge /pub/scm/linux/kernel/git/davej/cpufreq

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] longhaul compile fix.
  [CPUFREQ] Advise not to use longhaul on VIA C7.
  [CPUFREQ] set policy->curfreq on initialization
  [CPUFREQ] Trivial cleanup for acpi read/write port in acpi-cpufreq.c
  [CPUFREQ] fixes typo in cpufreq.c

14 years ago[PATCH] more work_struct fixes: tas300x sound drivers
Al Viro [Fri, 8 Dec 2006 09:16:49 +0000 (09:16 +0000)]
[PATCH] more work_struct fixes: tas300x sound drivers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[SPARC]: Make bitops use same spinlocks as atomics.
David S. Miller [Mon, 18 Dec 2006 00:18:47 +0000 (16:18 -0800)]
[SPARC]: Make bitops use same spinlocks as atomics.

Recent workqueue changes basically make this a formal requirement.

Also, move atomic32.o from lib-y to obj-y since it exports symbols
to modules.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[ARM] 4015/1: s3c2410 cpu ifdefs
Krzysztof Helt [Tue, 12 Dec 2006 14:02:32 +0000 (15:02 +0100)]
[ARM] 4015/1: s3c2410 cpu ifdefs

The patch adds ifdefs around per cpu definitions. Otherwise, if
not all cpu types are selected, the kernel does not link.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency
Lennert Buytenhek [Mon, 18 Dec 2006 00:04:09 +0000 (01:04 +0100)]
[ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency

On ixp23xx, it was thought to be necessary to disable coherency to work
around certain silicon errata.  This turns out not to be the case --
none of the documented errata workarounds require disabling coherency,
and disabling coherency does not work around any existing errata.

Furthermore, all ixp23xx models do support coherency, so we should just
unconditionally enable coherency for all ixp23xx.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup
Lennert Buytenhek [Mon, 18 Dec 2006 00:02:24 +0000 (01:02 +0100)]
[ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup

The struct resource 'end' field is inclusive, the iop13xx flash
setup code got this wrong.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc
Lennert Buytenhek [Mon, 18 Dec 2006 00:01:08 +0000 (01:01 +0100)]
[ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc

The phys_io/io_pg_offst machine record variables were being set
to bogus values, causing problems when enabling DEBUG_LL.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4054/1: ep93xx: add HWCAP_CRUNCH
Lennert Buytenhek [Sun, 17 Dec 2006 23:59:10 +0000 (00:59 +0100)]
[ARM] 4054/1: ep93xx: add HWCAP_CRUNCH

Add HWCAP_CRUNCH so that the dynamic linker knows whether it can
use Crunch-optimised libraries or not.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig
Ben Dooks [Sun, 17 Dec 2006 23:39:47 +0000 (00:39 +0100)]
[ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig

Fix up the CONFIG_PM mixups in arch/arm/mach-s3c2410/Kconfig
causing CONFIG_S3C2410_PM and CONFIG_PM_H1940 to get enabled
permanently.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] Fix warnings from asm/system.h
Russell King [Mon, 18 Dec 2006 00:12:47 +0000 (00:12 +0000)]
[ARM] Fix warnings from asm/system.h

Move adjust_cr() into arch/arm/mm/mmu.c, and move irqflags.h to
a more appropriate place in the header file.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[CPUFREQ] longhaul compile fix.
Dave Jones [Mon, 18 Dec 2006 00:09:59 +0000 (19:09 -0500)]
[CPUFREQ] longhaul compile fix.

Some gcc's are more anal than others about empty switch labels.
error: label at end of compound statement

Signed-off-by: Dave Jones <davej@redhat.com>
14 years ago[CPUFREQ] Advise not to use longhaul on VIA C7.
Dave Jones [Mon, 18 Dec 2006 00:07:35 +0000 (19:07 -0500)]
[CPUFREQ] Advise not to use longhaul on VIA C7.

C7's are centrino speedstep-alike.

Signed-off-by: Dave Jones <davej@redhat.com>
14 years ago[ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support
Ben Dooks [Sun, 17 Dec 2006 22:32:21 +0000 (23:32 +0100)]
[ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support

Clean the includes in arch/arm/mach-s3c2410/s3c2440.c
and arch/arm/mach-s3c2410/s3c2442.c which should have
been pruned when these where split and updated.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410
Ben Dooks [Sun, 17 Dec 2006 22:26:13 +0000 (23:26 +0100)]
[ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410

Remove old changelog entries in arch/arm/mach-s3c2410
which should be available from the version control
system.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h
Ben Dooks [Sun, 17 Dec 2006 22:22:26 +0000 (23:22 +0100)]
[ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h

Change the include/asm-arm/arch-s3c2410/regs-serial.h
platform data to use the prorper type (upf_t) for the
uart_flags.

Fix all the other parts of arch/arm/mach-s3c2410 to
include <linux/serial_core.h> and all other uses of
the include file.

mach-rx3715.c:101:18: warning: incorrect type in initializer (different base types)
mach-rx3715.c:101:18:    expected unsigned long [unsigned] uart_flags
mach-rx3715.c:101:18:    got restricted unsigned int [usertype] [force] <noident>

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static
Ben Dooks [Sun, 17 Dec 2006 21:44:56 +0000 (22:44 +0100)]
[ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static

Remove warning from s3c2410_pm_resume() not being
declared by making it static.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410
Ben Dooks [Sun, 17 Dec 2006 19:59:37 +0000 (20:59 +0100)]
[ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410

Fix the following sparse errors in arch/arm/mach-s3c2410
by fixing the include paths and making un-exported items
static.

s3c2410-clock.c:206:12: warning: symbol 's3c2410_baseclk_add' was not declared. Should it be static?
s3c2412-clock.c:559:17: warning: symbol 'clks_src' was not declared. Should it be static?
s3c2412-clock.c:622:12: warning: symbol 'clks' was not declared. Should it be static?
s3c2412-clock.c:630:12: warning: symbol 's3c2412_baseclk_add' was not declared. Should it be static?

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4045/1: S3C24XX: remove old VA for non-shared areas
Ben Dooks [Sun, 17 Dec 2006 19:50:55 +0000 (20:50 +0100)]
[ARM] 4045/1: S3C24XX: remove old VA for non-shared areas

Remove old (and non-shared) VA addresses from the mappings
in arch/arm/mach-s3c2410/map.h and anywhere they are being
mapped in arch/arm/mach-s3c2410

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c
Ben Dooks [Sun, 17 Dec 2006 19:41:45 +0000 (20:41 +0100)]
[ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c

Fix sparse errors in arch/arm/mach-s3c2410/s3c2442-clock.c

warning: symbol 'clk_h' shadows an earlier one
warning: symbol 'clk_p' shadows an earlier one
warning: symbol 'clk_upll' shadows an earlier one

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c
Ben Dooks [Sun, 17 Dec 2006 19:38:14 +0000 (20:38 +0100)]
[ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c

Fix the sparse errors in arch/arm/mach-s3c2410/s3c2440-clock.c

warning: symbol 'clk_h' shadows an earlier one
warning: symbol 'clk_p' shadows an earlier one
warning: symbol 'clk_upll' shadows an earlier one

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4042/1: H1940: Fix sparse errors from VA addresses
Ben Dooks [Sun, 17 Dec 2006 19:18:40 +0000 (20:18 +0100)]
[ARM] 4042/1: H1940: Fix sparse errors from VA addresses

Fix address-space conversion errors from passing addresses
generated from include/asm-arm/arch-s3c2410/map.h by adding
an __force argument to the `void __iomem *` for all the
virtual addresses.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4041/1: S3C24XX: Fix sparse errors from VA addresses
Ben Dooks [Sun, 17 Dec 2006 19:15:13 +0000 (20:15 +0100)]
[ARM] 4041/1: S3C24XX: Fix sparse errors from VA addresses

Fix address-space conversion errors from passing addresses
generated from include/asm-arm/arch-s3c2410/map.h by adding
an __force argument to the `void __iomem *` for all the
virtual addresses.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4040/1: S3C24XX: Fix copyrights in arch/arm/mach-s3c2410
Ben Dooks [Sun, 17 Dec 2006 19:05:21 +0000 (20:05 +0100)]
[ARM] 4040/1: S3C24XX: Fix copyrights in arch/arm/mach-s3c2410

Fix the copyright messages in arch/arm/mach-s3c2410
to actually have `Copyright` in the line.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4039/1: S3C24XX: Fix copyrights in include/asm-arm/arch-s3c2410 (mach)
Ben Dooks [Sun, 17 Dec 2006 19:02:01 +0000 (20:02 +0100)]
[ARM] 4039/1: S3C24XX: Fix copyrights in include/asm-arm/arch-s3c2410 (mach)

Fix copyright notices in include/asm-arm/arch-s3c2410
to actually have `Copyright` in the line. This patch
deals with all the core files.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4038/1: S3C24XX: Fix copyrights in include/asm-arm/arch-s3c2410 (core)
Ben Dooks [Sun, 17 Dec 2006 18:59:20 +0000 (19:59 +0100)]
[ARM] 4038/1: S3C24XX: Fix copyrights in include/asm-arm/arch-s3c2410 (core)

Fix copyright notices in include/asm-arm/arch-s3c2410
to actually have `Copyright` in the line. This patch
deals with all the core files.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4035/1: fix collie compilation
Pavel Machek [Sun, 17 Dec 2006 12:21:05 +0000 (13:21 +0100)]
[ARM] 4035/1: fix collie compilation

Thanks to Al Viro, here's fix to 2.6.20-rc1-git, so that collie
compiles, again. It was broken by INIT_WORK changes.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4034/1: pxafb: Fix compile errors
Richard Purdie [Sun, 17 Dec 2006 00:01:11 +0000 (01:01 +0100)]
[ARM] 4034/1: pxafb: Fix compile errors

Fix pxafb compile failures when CONFIG_FB_PXA_PARAMETERS is enabled
after recent structure changes.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] Fix BUG()s in ioremap() code
Russell King [Sun, 17 Dec 2006 23:29:57 +0000 (23:29 +0000)]
[ARM] Fix BUG()s in ioremap() code

We need to ensure that the area size is page aligned so that
remap_area_pte() doesn't increment the address past the end of
the desired area.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[CPUFREQ] set policy->curfreq on initialization
Mattia Dongili [Fri, 15 Dec 2006 18:52:45 +0000 (19:52 +0100)]
[CPUFREQ] set policy->curfreq on initialization

Check the correct variable and set policy->cur upon acpi-cpufreq
initialization to allow the userspace governor to be used as default.

Signed-off-by: Mattia Dongili <malattia@linux.it>
Acked-by: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Jones <davej@redhat.com>
14 years ago[SPARC]: Update defconfig.
David S. Miller [Sun, 17 Dec 2006 22:21:34 +0000 (14:21 -0800)]
[SPARC]: Update defconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[SPARC64]: Mirror x86_64's PERCPU_ENOUGH_ROOM definition.
David S. Miller [Fri, 15 Dec 2006 07:40:57 +0000 (23:40 -0800)]
[SPARC64]: Mirror x86_64's PERCPU_ENOUGH_ROOM definition.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[SUNKBD]: Fix sunkbd_enable(sunkbd, 0); obvious.
Fabrice Knevez [Thu, 14 Dec 2006 23:20:29 +0000 (15:20 -0800)]
[SUNKBD]: Fix sunkbd_enable(sunkbd, 0); obvious.

"sunkbd_enable(sunkbd, 0);" has no effect. Adding "sunkbd->enabled =
enable" in sunkbd_enable (obvious)

Signed-off-by: Fabrice Knevez <nuxdoors@cegetel.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[DocBook]: Fix two typos in generic IRQ docs.
David S. Miller [Tue, 12 Dec 2006 09:00:06 +0000 (01:00 -0800)]
[DocBook]: Fix two typos in generic IRQ docs.

desc-status --> desc->status

Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[SPARC64]: Minor irq handling cleanups.
David S. Miller [Tue, 12 Dec 2006 08:59:12 +0000 (00:59 -0800)]
[SPARC64]: Minor irq handling cleanups.

Use struct irq_chip instead of hw_interrupt_type.

Delete hw_resend_irq(), totally unused.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[SPARC64]: Kill no-remapping-needed code in head.S
David S. Miller [Tue, 12 Dec 2006 05:06:55 +0000 (21:06 -0800)]
[SPARC64]: Kill no-remapping-needed code in head.S

It branches around some necessary prom calls, which we would
need to do even if we are mapped at the correct location already.
So it doesn't work.

The idea was that this sort of thing could be used for the eventual
kexec implementation, but it is clear that this will need to be
done differently.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 years ago[ARM] Add more syscalls
Russell King [Sun, 17 Dec 2006 18:23:10 +0000 (18:23 +0000)]
[ARM] Add more syscalls

Add:
  sys_unshare
  sys_set_robust_list
  sys_get_robust_list
  sys_splice
  sys_arm_sync_file_range
  sys_tee
  sys_vmsplice
  sys_move_pages
  sys_getcpu

Special note about sys_arm_sync_file_range(), which is implemented as:

asmlinkage long sys_arm_sync_file_range(int fd, unsigned int flags,
                                        loff_t offset, loff_t nbytes)
{
        return sys_sync_file_range(fd, offset, nbytes, flags);
}

We can't export sys_sync_file_range() directly on ARM because the
argument list someone picked does not fit in the available registers.
Would be nice if... there was an arch maintainer review mechanism for
new syscalls before they hit the kernel.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[PATCH] sys_mincore: s/max/min/
Oleg Nesterov [Sun, 17 Dec 2006 15:52:47 +0000 (18:52 +0300)]
[PATCH] sys_mincore: s/max/min/

fix a typo, sys_mincore() needs min().

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Linus "I'm a moron" Torvalds <torvalds@osdl.org>
14 years ago[PATCH] m68k trivial build fixes
Al Viro [Thu, 14 Dec 2006 15:00:15 +0000 (15:00 +0000)]
[PATCH] m68k trivial build fixes

amikbd: missing declaration
sun3_NCR5380: more work_struct mess
sun3_NCR5380: cast is not an lvalue

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
14 years agoFix up mm/mincore.c error value cases
Linus Torvalds [Sun, 17 Dec 2006 00:01:50 +0000 (16:01 -0800)]
Fix up mm/mincore.c error value cases

Hugh Dickins correctly points out that mincore() is actually _supposed_
to fail on an unmapped hole in the user address space, rather than
return valid ("empty") information about the hole.  This just simplifies
the problem further (I had been misled by our previous confusing and
complicated way of doing mincore()).

Also, in the unlikely situation that we can't allocate a temporary
kernel buffer, we should actually return EAGAIN, not ENOMEM, to keep the
"unmapped hole" and "allocation failure" error cases separate.

Finally, add a comment about our stupid historical lack of support for
anonymous mappings.  I'll fix that if somebody reminds me after 2.6.20
is out.

Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Sat, 16 Dec 2006 21:23:45 +0000 (13:23 -0800)]
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Use DEFINE_MUTEX() instead of mutex_init()
  IB/mthca: Add HCA profile module parameters
  IB/srp: Fix FMR mapping for 32-bit kernels and addresses above 4G
  IB: Fix ib_dma_alloc_coherent() wrapper

14 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Sat, 16 Dec 2006 17:54:23 +0000 (09:54 -0800)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] pata_via: Cable detect error
  [PATCH] Fix help text for CONFIG_ATA_PIIX
  [PATCH] initializer entry defined twice in pata_rz1000
  [PATCH] ata: fix platform_device_register_simple() error check
  [PATCH] ahci: do not mangle saved HOST_CAP while resetting controller
  [PATCH] libata: don't initialize sg in ata_exec_internal() if DMA_NONE (take #2)
  [libata] sata_svw: Disable ATAPI DMA on current boards (errata workaround)
  [libata] use kmap_atomic(KM_IRQ0) in SCSI simulator
  [PATCH] ata_piix: use piix_host_stop() in ich_pata_ops
  [PATCH] ata_piix: IDE mode SATA patch for Intel ICH9