11 years agoMerge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa
Russell King [Wed, 9 Jul 2008 19:56:05 +0000]
Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa

11 years ago[ARM] pxa: allow clk aliases
Russell King [Mon, 30 Jun 2008 18:47:59 +0000]
[ARM] pxa: allow clk aliases

We need to support more than one name+device for a struct clk for a
small number of peripherals.  We do this by re-using struct clk alias
to another struct clk - IOW, if we find that the entry we're using is
an alias, we return the aliased entry not the one we found.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5079/1: Warn people when using pxa2xx-gpio.h
Stefan Schmidt [Fri, 6 Jun 2008 09:12:37 +0000]
[ARM] 5079/1: Warn people when using pxa2xx-gpio.h

Warn people when using pxa2xx-gpio.h as it is only here for backwards
compatibility. The new mfp-pxa2[57]x.h and the relevant API should be used
instead.

Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5135/1: pxa: drop superfluous asm/arch/pxa2xx-gpio.h includes
Philipp Zabel [Mon, 30 Jun 2008 17:08:11 +0000]
[ARM] 5135/1: pxa: drop superfluous asm/arch/pxa2xx-gpio.h includes

Both i2c-pxa.c and irq.c still include pxa2xx-gpio.h although is is not
needed anymore.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5118/1: pxafb: add exit and remove handlers
Jaya Kumar [Sun, 22 Jun 2008 03:27:28 +0000]
[ARM] 5118/1: pxafb: add exit and remove handlers

This patch adds exit and remove handlers to pxafb so that it can be loaded
and unloaded as a module.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5063/1: pxa: add clk support for pxa2xx I2S
eric miao [Mon, 26 May 2008 02:28:09 +0000]
[ARM] 5063/1: pxa: add clk support for pxa2xx I2S

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5094/1: pcm990: Add framebuffer and backlight support
Guennadi Liakhovetski [Fri, 13 Jun 2008 10:50:44 +0000]
[ARM] 5094/1: pcm990: Add framebuffer and backlight support

PCM990 boards can be assembled with either a Sharp STN or a NEC TFT LCD. This
patch adds support for these displays and for the backlight, using the pwm_bl
driver.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5045/1: magician: use the pwm_bl driver for the LCD backlight
Philipp Zabel [Thu, 22 May 2008 13:20:01 +0000]
[ARM] 5045/1: magician: use the pwm_bl driver for the LCD backlight

magician has a GPIO that modifies the brightness level additionally to
the PWM duty value. This patch makes use of the pwm_bl notify callback
to present userspace with a single brightness scale.
This gets rid of the pxa_set_cken calls and direct PWM register access.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5141/1: PWM: pwm_request() should return an PTR_ERR() instead of NULL.
Ben Dooks [Tue, 1 Jul 2008 13:18:27 +0000]
[ARM] 5141/1: PWM: pwm_request() should return an PTR_ERR() instead of NULL.

Make the return of pwm_request() be more informative than just
being NULL on error by using PTR_ERR() to respond with an
approriate error.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5044/1: pwm_bl: add init/notify/exit callbacks
Philipp Zabel [Thu, 22 May 2008 13:18:40 +0000]
[ARM] 5044/1: pwm_bl: add init/notify/exit callbacks

This allows platform code to manipulate GPIOs and brightness level as
needed.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: make LogicPD 270 use the generic PWM backlight driver
Russell King [Sun, 18 May 2008 12:11:02 +0000]
[ARM] pxa: make LogicPD 270 use the generic PWM backlight driver

Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: make mainstone use the generic PWM backlight driver
Russell King [Sun, 13 Apr 2008 20:47:01 +0000]
[ARM] pxa: make mainstone use the generic PWM backlight driver

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: make zylonite use the generic PWM backlight driver
eric miao [Sun, 13 Apr 2008 20:46:34 +0000]
[ARM] pxa: make zylonite use the generic PWM backlight driver

Patch mostly by Eric Miao, minor edits by rmk.

Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: add generic PWM backlight driver
eric miao [Mon, 14 Apr 2008 08:35:08 +0000]
[ARM] pxa: add generic PWM backlight driver

Patch mostly from Eric Miao, with minor edits by rmk to convert
Eric's driver to a generic PWM-based backlight driver.

Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5087/1: Get the PWM layer to handle clock enable/disable properly.
Robert Jarzmik [Tue, 10 Jun 2008 22:02:31 +0000]
[ARM] 5087/1: Get the PWM layer to handle clock enable/disable properly.

Allow pwm_enable()/pwm_disable() to be called as many times
as the driver wants (and not even count them).
The PWM model is different from things like the clock API
where we need enable counting, because PWMs have one
exclusive user per PWM whereas the clock API can have
multiple users of the same clock.

Acked-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Robert Jarzmik <rjarzmik@free.fr>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5078/1: pxa-pwm: Add missing MODULE_LICENSE to be able to build the driver
Guennadi Liakhovetski [Thu, 5 Jun 2008 09:45:02 +0000]
[ARM] 5078/1: pxa-pwm: Add missing MODULE_LICENSE to be able to build the driver
 as a module

Without a GPL-compatible license this driver cannot be built as a module,
because the platform_driver_* API is only exported to GPL modules.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5136/1: pxa: fix PWM device order for pxa27x
Philipp Zabel [Mon, 30 Jun 2008 17:09:03 +0000]
[ARM] 5136/1: pxa: fix PWM device order for pxa27x

Currently PWM0/2 (pxa27x_device_pwm0 at 0x40b00000 and 0x40b00010
are registered as as pwm_id 0 and 1, PWM1/3 (pxa27x_device_pwm1 at
0x40c00000 and 0x40c00010) are registered as pwm_id 2 and 3.
This patch corrects the pwm_ids to match the documented register names.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5082/1: pxa: Definition for the third USB port control register UP3OCR
Stefan Schmidt [Tue, 10 Jun 2008 07:57:27 +0000]
[ARM] 5082/1: pxa: Definition for the third USB port control register UP3OCR

This adds the definition for the third USB port control register UP3OCR. It is
used on the EZX GSM mobile phones.

Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5080/1: touch PSSR_OTGPH only on pxa27x in ohci-pxa27x and pxa27x_udc
Philipp Zabel [Fri, 6 Jun 2008 17:40:47 +0000]
[ARM] 5080/1: touch PSSR_OTGPH only on pxa27x in ohci-pxa27x and pxa27x_udc

and include pxa2xx-regs.h as build fix since PSSR definitions
moved from pxa-regs.h into pxa2xx-regs.h.

Note: This change is temporary as pxa27x processor specific
code will be finally moved elsewhere (both drivers should
support pxa3xx, too).

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5071/2: Drop PXA_SHARPSL_25x/27x case from PXA Kconfig.
Dmitry Baryshkov [Sat, 31 May 2008 15:14:48 +0000]
[ARM] 5071/2: Drop PXA_SHARPSL_25x/27x case from PXA Kconfig.

As nothing in the code references to the PXA_SHARPSL_25x/27x,
we can drop that Kconfig case and permit all-zaurus builds.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5073/1: spitz_pm: don't register devices on non-spitz machines
Dmitry Baryshkov [Sat, 31 May 2008 15:17:32 +0000]
[ARM] 5073/1: spitz_pm: don't register devices on non-spitz machines

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5072/1: corgi_pm: don't register devices on non-corgi machines
Dmitry Baryshkov [Sat, 31 May 2008 15:16:54 +0000]
[ARM] 5072/1: corgi_pm: don't register devices on non-corgi machines

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5036/2: Combine cm_x270_defconfig and em_x270_defconfig into xm_x270_defconfig
Mike Rapoport [Mon, 12 May 2008 10:36:28 +0000]
[ARM] 5036/2: Combine cm_x270_defconfig and em_x270_defconfig into xm_x270_defconfig

Combine cm_x270_defconfig and em_x270_defconfig to allow running the
same kernel on both machines

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: allow PXA to be built for multiple platforms
Russell King [Sun, 20 Apr 2008 16:36:20 +0000]
[ARM] pxa: allow PXA to be built for multiple platforms

Convert the 'choice' into a 'menu' to allow multiple platforms to be
selected.

This means to do a build check across PXA, you don't end up spending
a lifetime building _twenty_ sodding kernels.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5035/1: Ensure that zone adjustment is done only on CM-X270
Mike Rapoport [Mon, 12 May 2008 05:41:13 +0000]
[ARM] 5035/1: Ensure that zone adjustment is done only on CM-X270

Adjust zones for PCI DMA only if machine_is_armcore() to allow running
the same kernel on different PXA machines.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: separate out power manager and clock registers
Russell King [Sun, 18 May 2008 13:59:36 +0000]
[ARM] pxa: separate out power manager and clock registers

The power manager and core clock registers aren't present in PXA3
CPUs.  Move them out of pxa-regs.h into pxa2xx-regs.h, and include
pxa2xx-regs.h where necessary.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5075/1: i2c-pxa: move i2c pin setup and PCFR_PI2CEN handling into arch/arm...
Philipp Zabel [Mon, 2 Jun 2008 17:49:27 +0000]
[ARM] 5075/1: i2c-pxa: move i2c pin setup and PCFR_PI2CEN handling into arch/arm/mach-pxa

This fixes a build error introduced when the power manager
register definitions were moved into pxa2xx-regs.h.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: Add PXA3_ prefix to PXA3 specific constants
Russell King [Sun, 18 May 2008 13:57:59 +0000]
[ARM] pxa: Add PXA3_ prefix to PXA3 specific constants

standby.S contains both PXA2 and PXA3 specific code.  The PXA3
specific constants clash with the PXA2 ones, so give them a prefix.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: avoid kfreeing static data if platform device fails to register
Russell King [Thu, 24 Apr 2008 14:28:11 +0000]
[ARM] pxa: avoid kfreeing static data if platform device fails to register

When a dynamically allocated platform device is 'put', the platform
device's platform_data is kfree'd.  This is bad if it's pointing at
static data.  Use the provided function to register platform data
for these devices.

This also means we can mark the pcmcia ops structures as __initdata.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: avoid registering multiple pxa2xx_pcmcia devices
Russell King [Thu, 24 Apr 2008 14:23:25 +0000]
[ARM] pxa: avoid registering multiple pxa2xx_pcmcia devices

cm_x270 and mainstone both register their PCMCIA devices using the same
name, resulting in a warning message from the kernel.  Avoid this by
making the cm_x270 and mainstone PCMCIA initialisation conditional on
the machine type we're running on.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: don't register lpd270 cpld_irq sysdev if !lpd270
Russell King [Thu, 24 Apr 2008 14:13:36 +0000]
[ARM] pxa: don't register lpd270 cpld_irq sysdev if !lpd270

Don't register the LPD270 cpld_irq system device when we're not running
on a LPD270 machine - "cpld_irq" is also registered (separately) by
Lubbock and Mainstone.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5074/1: fix warning: missing terminating ' character
Dmitry Baryshkov [Sat, 31 May 2008 15:18:11 +0000]
[ARM] 5074/1: fix warning: missing terminating ' character

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: separate PXA25x and PXA27x UDC register definitions
Russell King [Sun, 20 Apr 2008 16:32:16 +0000]
[ARM] pxa: separate PXA25x and PXA27x UDC register definitions

The PXA25x and PXA27x USB device controller register definitions are
different.  Currently, they live side by side in pxa-regs.h, but only
one set is available depending on the setting of PXA25x or PXA27x.

This means that if we build to support both PXA25x and PXA27x, the
PXA27x definitions are unavailable, even to PXA27x specific code.

Remove these definitions from pxa-regs.h, and place them in separate
files.  Include these files where appropriate.

Note: according to the dependencies in drivers/usb/gadget/Kconfig,
we do not support the UDC on PXA27x nor PXA3xx CPUs, so remove the
platform devices from pxa27x.c and pxa3xx.c.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: corgibl_limit_intensity build errors
Russell King [Sun, 20 Apr 2008 16:15:32 +0000]
[ARM] pxa: corgibl_limit_intensity build errors

If CONFIG_BACKLIGHT_CORGI is not selected, then corgibl_limit_intensity()
is not present.  However, both corgi_pm.c and sharp_pm.c reference this
symbol, resulting in a link error.

Wrap the references with the relevant ifdefs, and avoid the resulting
NULL pointer dereference by making the code in sharpsl_pm.c also
conditional on the config symbol.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: Add PXA support for PWM API
eric miao [Sun, 13 Apr 2008 20:44:04 +0000]
[ARM] pxa: Add PXA support for PWM API

Patch mainly from Eric Miao, with minor edits by rmk.

Note: PWM0 and PWM2 share the same register I/O space and clock gating
on pxa{27x, 3xx}, thus PWM2 is treated in the driver as a child PWM of
PWM0. And this is also true for PWM1/3.

Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: Add bare bones PWM API
Russell King [Sun, 13 Apr 2008 20:41:55 +0000]
[ARM] pxa: Add bare bones PWM API

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years agoLinux 2.6.26-rc3
Linus Torvalds [Sun, 18 May 2008 21:36:41 +0000]
Linux 2.6.26-rc3

11 years agoMerge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
Linus Torvalds [Sun, 18 May 2008 20:56:54 +0000]
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c/max6875: Really prevent 24RF08 corruption
  i2c-amd756: Fix functionality flags
  i2c: Kill the old driver matching scheme
  i2c: Convert remaining new-style drivers to use module aliasing
  i2c: Switch pasemi to the new device/driver matching scheme
  i2c: Clean up Blackfin BF527 I2C device declarations
  i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert
  i2c: New co-maintainer

11 years agom68k: Add multi_defconfig
Geert Uytterhoeven [Sun, 18 May 2008 18:47:24 +0000]
m68k: Add multi_defconfig

Add multi_defconfig, to build a kernel for all supported m68k platforms,
excluding Sun 3 (Sun 3 kernels are incompatible with all other m68k platforms)

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Update defconfigs
Geert Uytterhoeven [Sun, 18 May 2008 18:47:23 +0000]
m68k: Update defconfigs

Update the m68k defconfigs

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Correctly handle multi-ISA at runtime
Geert Uytterhoeven [Sun, 18 May 2008 18:47:22 +0000]
m68k: Correctly handle multi-ISA at runtime

m68k: Correctly handle multi-ISA at runtime in multi-platform kernels

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Prefix ISA type with ISA_TYPE_
Geert Uytterhoeven [Sun, 18 May 2008 18:47:21 +0000]
m68k: Prefix ISA type with ISA_TYPE_

The *_ISA type defines are quite generic and cause namespace conflicts
(e.g. with `AMIGAHW_DECLARE(GG2_ISA)' in <asm/amigahw.h>) for some kernel
configurations. Use ISA_TYPE_* to avoid such conflicts.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: export m68k_mmutype
Geert Uytterhoeven [Sun, 18 May 2008 18:47:20 +0000]
m68k: export m68k_mmutype

UIO needs m68k_mmutype:

ERROR: "m68k_mmutype" [drivers/uio/uio.ko] undefined!

(noticed by Christian T. Steigies)

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Q40/Q60 floppy support is broken
Geert Uytterhoeven [Sun, 18 May 2008 18:47:19 +0000]
m68k: Q40/Q60 floppy support is broken

Mark Q40/Q60 floppy support broken:

    arch/m68k/q40/q40ints.c: In function 'q40_irq_handler':
    arch/m68k/q40/q40ints.c:214: error: implicit declaration of function 'floppy_hardint'

Including <asm/floppy.h> doesn't help, as it causes a lot of additional error
messages (cfr. Sun 3x).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Return -ENODEV if no device is found
Geert Uytterhoeven [Sun, 18 May 2008 18:47:18 +0000]
m68k: Return -ENODEV if no device is found

According to the tests in do_initcalls(), the proper error code in case no
device is found is -ENODEV, not -ENXIO or -EIO.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Some input drivers do not check the platform
Geert Uytterhoeven [Sun, 18 May 2008 18:47:17 +0000]
m68k: Some input drivers do not check the platform

Some input drivers do not check whether they're actually running on the
correct platform, causing multi-platform kernels to crash if they are not.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Some network drivers do not check the platform
Geert Uytterhoeven [Sun, 18 May 2008 18:47:16 +0000]
m68k: Some network drivers do not check the platform

Some network drivers do not check whether they're actually running on the
correct platform, causing multi-platform kernels to crash if they are not.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: dnfb doesnt check for Apollo
Geert Uytterhoeven [Sun, 18 May 2008 18:47:15 +0000]
m68k: dnfb doesnt check for Apollo

The Apollo frame buffer device driver (dnfb) doesn't check whether it's
actually running on Apollo hardware, causing a crash if it isn't.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: macide doesnt check for Mac
Geert Uytterhoeven [Sun, 18 May 2008 18:47:14 +0000]
m68k: macide doesnt check for Mac

The Macintosh IDE driver (macide) doesn't check whether it's actually running
on Mac hardware, causing a crash if it isn't.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Correct jump if not running on HP300
Geert Uytterhoeven [Sun, 18 May 2008 18:47:13 +0000]
m68k: Correct jump if not running on HP300

When running a HP300-enabled kernel on non-HP300 hardware, a test in the early
startup code jumps to the wrong label, causing a double bus fault.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Make gcc aware that BUG() does not return
Geert Uytterhoeven [Sun, 18 May 2008 18:47:12 +0000]
m68k: Make gcc aware that BUG() does not return

Use `__builtin_trap()' instead of `asm volatile("illegal")' in the m68k BUG()
macros (as suggested by Andrew Pinski), to kill warnings in code that assumes
BUG() does not return.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k vme_scc: avoid global namespace pollution
Geert Uytterhoeven [Sun, 18 May 2008 18:47:11 +0000]
m68k vme_scc: avoid global namespace pollution

m68k vme_scc:
  - make scc_ports[] static
  - kill unused global scc_initialized

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Kill CONFIG_WHIPPET_SERIAL
Geert Uytterhoeven [Sun, 18 May 2008 18:47:10 +0000]
m68k: Kill CONFIG_WHIPPET_SERIAL

The Hisoft Whippet PCMCIA serial driver has been removed a long time ago, but
it's Kconfig symbol still existed.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: FB_HP300 depends on DIO and doesnt need FB_CFB_FILLRECT
Geert Uytterhoeven [Sun, 18 May 2008 18:47:09 +0000]
m68k: FB_HP300 depends on DIO and doesnt need FB_CFB_FILLRECT

Correct FB_HP300 dependencies:
  - FB_HP300 doesn't depend only on HP300, but also on DIO (which depends on
    HP300)
  - FB_HP300 does not need FB_CFB_FILLRECT

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Kill CONFIG_FB_DAFB
Geert Uytterhoeven [Sun, 18 May 2008 18:47:08 +0000]
m68k: Kill CONFIG_FB_DAFB

CONFIG_FB_DAFB is a leftover from pre-Kconfig

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agom68k: Convert access_ok() to an inline function
Geert Uytterhoeven [Sun, 18 May 2008 18:47:07 +0000]
m68k: Convert access_ok() to an inline function

Convert access_ok() from a macro to an inline function, so the compiler no
longer complains about unused variables:

    fs/read_write.c: In function 'rw_copy_check_uvector':
    fs/read_write.c:556: warning: unused variable 'buf'

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agoi2c/max6875: Really prevent 24RF08 corruption
Jean Delvare [Sun, 18 May 2008 18:49:41 +0000]
i2c/max6875: Really prevent 24RF08 corruption

i2c-core takes care of the possible corruption of 24RF08 chips for
quite some times, so device devices no longer need to do it. And they
really should not, as applying the prevention twice voids it.

I thought that I had fixed all drivers long ago but apparently I had
missed that one.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Ben Gardner <bgardner@wabtec.com>

11 years agoi2c-amd756: Fix functionality flags
Jean Delvare [Sun, 18 May 2008 18:49:41 +0000]
i2c-amd756: Fix functionality flags

The i2c-amd756 driver pretends to support SMBus process call
transactions but actually does not. Fix it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

11 years agoi2c: Kill the old driver matching scheme
Jean Delvare [Sun, 18 May 2008 18:49:41 +0000]
i2c: Kill the old driver matching scheme

Remove the old driver_name/type scheme for i2c driver matching. Only the
standard aliasing model will be used from now on.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

11 years agoi2c: Convert remaining new-style drivers to use module aliasing
Jean Delvare [Sun, 18 May 2008 18:49:40 +0000]
i2c: Convert remaining new-style drivers to use module aliasing

Update all the remaining new-style i2c drivers to use standard module
aliasing instead of the old driver_name/type driver matching scheme.

Note that the tuner driver is a bit quirky at the moment, as it
overwrites i2c_client.name with arbitrary strings. We write "tuner"
back on remove, to make sure that driver cycling will work properly,
but there may still be troublesome corner cases.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

11 years agoi2c: Switch pasemi to the new device/driver matching scheme
Jean Delvare [Sun, 18 May 2008 18:49:40 +0000]
i2c: Switch pasemi to the new device/driver matching scheme

The old device/driver matching scheme is going away so stop using it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Olof Johansson <olof@lixom.net>

11 years agoi2c: Clean up Blackfin BF527 I2C device declarations
Jean Delvare [Sun, 18 May 2008 18:49:40 +0000]
i2c: Clean up Blackfin BF527 I2C device declarations

I2C_BOARD_INFO() now sets the type field so no need to set it
separatetly.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Bryan Wu <cooloney@kernel.org>

11 years agoi2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert
Jean Delvare [Sun, 18 May 2008 18:49:40 +0000]
i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert

There is a strange chip at 0x2e on the second SMBus channel of the
DFI Lanparty NF4 Expert motherboard. Accessing the chip reboots the
system. As there's nothing interesting on this SMBus channel, the
easiest and safest thing to do is to disable it on that board.

This is a better fix to bug #5889 than the it87 driver update that was
done originally:
http://bugzilla.kernel.org/show_bug.cgi?id=5889

Signed-off-by: Jean Delvare <khali@linux-fr.org>

11 years agoi2c: New co-maintainer
Jean Delvare [Sun, 18 May 2008 18:49:40 +0000]
i2c: New co-maintainer

Ben Dooks agreed to become my co-maintainer for the i2c subsystem. In
particular, Ben will help with drivers for embedded systems, of which
my experience is inexistent. Thanks Ben and welcome on board!

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Ben Dooks <ben-linux@fluff.org>

11 years agoMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Sat, 17 May 2008 22:17:10 +0000]
Merge branch 'for-linus' of /home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] pxa: spitz wants PXA27x UDC definitions
  [ARM] pxa: fix pxafb build when cpufreq is enabled
  [ARM] fix parenthesis in include/asm-arm/arch-omap/control.h
  [ARM] colibri: fix support for DM9000 ethernet device
  [ARM] arm/kernel/arthur.c: add MODULE_LICENSE
  [ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation
  [ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode
  [ARM] export copy_page
  [ARM] 5026/1: locomo: add .settype for gpio and several small fixes
  ARM: OMAP: Fixed comments on global PRM register usage
  ARM: OMAP: Add PARENT_CONTROLS_CLOCK flag to dpll5_m2_ck
  ARM: OMAP: PRCM fixes to ssi clock handling
  ARM: OMAP: Add fuctional clock enabler for iva2
  ARM: OMAP: Fix 34xx to use correct shift values for gpio2-6 fclks
  ARM: OMAP: Keymap fix for palmte and palmz71
  ARM: OMAP: Fix Unbalanced enable for IRQ in omap mailbox
  ARM: OMAP: DMA: Fix incorrect channel linking
  ARM: OMAP: Warn on disabling clocks with no users
  ARM: OMAP: Add calls to omap2_set_globals_*()
  ARM: OMAP: Update MMC header to fix compile

11 years agoMerge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
Russell King [Sat, 17 May 2008 21:56:08 +0000]
Merge branch 'omap-fixes' of git://git./linux/kernel/git/tmlind/linux-omap-2.6

11 years agoMerge branch 'sa1100'
Russell King [Sat, 17 May 2008 21:55:51 +0000]
Merge branch 'sa1100'

11 years ago[ARM] pxa: spitz wants PXA27x UDC definitions
Russell King [Sat, 17 May 2008 21:51:35 +0000]
[ARM] pxa: spitz wants PXA27x UDC definitions

... so include the header file.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] pxa: fix pxafb build when cpufreq is enabled
Russell King [Sat, 17 May 2008 21:51:14 +0000]
[ARM] pxa: fix pxafb build when cpufreq is enabled

If cpufreq is enabled, pxafb wants to call the removed
get_clk_frequency_khz() function for a debug printk.  Remove
this reference.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] fix parenthesis in include/asm-arm/arch-omap/control.h
Mariusz Kozlowski [Thu, 15 May 2008 18:52:24 +0000]
[ARM] fix parenthesis in include/asm-arm/arch-omap/control.h

Parenthesis fix in include/asm-arm/arch-omap/control.h

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] colibri: fix support for DM9000 ethernet device
Michael Abbott [Wed, 14 May 2008 23:29:24 +0000]
[ARM] colibri: fix support for DM9000 ethernet device

Two changes are necessary to enable proper operation of the DM9000 device with
the Colibri PXA 270 board: firstly, the IRQ type needs to be configured for
rising edge interrupts, and secondly this configuration needs to be
communicated through to the DM9000.

[akpm@linux-foundation.org: remove set_irq_type() call as per ben-linux request]
Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>
Cc: Daniel Mack <daniel@caiaq.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] arm/kernel/arthur.c: add MODULE_LICENSE
Adrian Bunk [Mon, 31 Mar 2008 09:08:16 +0000]
[ARM] arm/kernel/arthur.c: add MODULE_LICENSE

This patch adds the missing MODULE_LICENSE("GPL").

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation
Lennert Buytenhek [Thu, 15 May 2008 09:31:14 +0000]
[ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation

Whereas most Orion 5x machine support code would initialise the PCI
subsystem with nr_controllers in their struct hw_pci set to 2, the
DNS323 and Kurobox Pro machine support code had nr_controllers set
to 1.

This was presumably done because on those two machines, the PCI(-X)
controller (nr == 1) isn't used, requiring initialisation of only
the PCIe controller (nr == 0.)  However, not initialising the PCI(-X)
controller on boards that don't use it leads to a situation where
both the PCIe and the PCI(-X) controller think that their root bus is
zero, and it messes up IRQ assignment.

This patch changes the DNS323 and Kurobox Pro support code to always
use nr_controllers == 2.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode
Lennert Buytenhek [Sat, 10 May 2008 20:05:31 +0000]
[ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode

The CPU's dma_flush_range() operation needs to clean+invalidate the
given memory area if the cache is in writeback mode, or do just the
invalidate part if the cache is in writethrough mode, but the current
proc-arm{925,926,940,946} (incorrectly) do a cache clean in the
latter case.  This patch fixes that.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] export copy_page
Russell King [Sun, 11 May 2008 21:36:03 +0000]
[ARM] export copy_page

Martin Michlmayr reported that fuse complains:
  ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!

so export the needed function.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years ago[ARM] 5026/1: locomo: add .settype for gpio and several small fixes
Thomas Kunze [Tue, 29 Apr 2008 16:44:54 +0000]
[ARM] 5026/1: locomo: add .settype for gpio and several small fixes

irqs.h:
    * rename IRQ_LOCOMO_SPI_OVRN to IRQ_LOCOMO_SPI_REND
locomo.h:
    * add some definition for locomo spi controller
    * correct some errors
locomo.c:
    * correct some errors
    * add set_type for locomo gpio irq chip

Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

11 years agoMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Sat, 17 May 2008 21:21:43 +0000]
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: disable mwait for AMD family 10H/11H CPUs
  x86: fix crash on cpu hotplug on pat-incapable machines
  x86: remove mwait capability C-state check

11 years agox86: disable mwait for AMD family 10H/11H CPUs
Thomas Gleixner [Fri, 16 May 2008 20:55:26 +0000]
x86: disable mwait for AMD family 10H/11H CPUs

The previous revert of 0c07ee38c9d4eb081758f5ad14bbffa7197e1aec left
out the mwait disable condition for AMD family 10H/11H CPUs.

Andreas Herrman said:

It depends on the CPU. For AMD CPUs that support MWAIT this is wrong.
Family 0x10 and 0x11 CPUs will enter C1 on HLT. Powersavings then
depend on a clock divisor and current Pstate of the core.

If all cores of a processor are in halt state (C1) the processor can
enter the C1E (C1 enhanced) state. If mwait is used this will never
happen.

Thus HLT saves more power than MWAIT here.

It might be best to switch off the mwait flag for these AMD CPU
families like it was introduced with commit
f039b754714a422959027cb18bb33760eb8153f0 (x86: Don't use MWAIT on AMD
Family 10)

Re-add the AMD families 10H/11H check and disable the mwait usage for
those.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

11 years agox86: fix crash on cpu hotplug on pat-incapable machines
Avi Kivity [Wed, 14 May 2008 09:20:32 +0000]
x86: fix crash on cpu hotplug on pat-incapable machines

pat_disable() is __init, which means it goes away after booting is complete.
Unfortunately it is used by the hotplug code if the machine is not
pat-capable, causing a crash.

Fix by marking pat_disable() as __cpuinit.

Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

11 years agox86: remove mwait capability C-state check
Ingo Molnar [Wed, 14 May 2008 06:47:40 +0000]
x86: remove mwait capability C-state check

Vegard Nossum reports:

| powertop shows between 200-400 wakeups/second with the description
| "<kernel IPI>: Rescheduling interrupts" when all processors have load (e.g.
| I need to run two busy-loops on my 2-CPU system for this to show up).
|
| The bisect resulted in this commit:
|
| commit 0c07ee38c9d4eb081758f5ad14bbffa7197e1aec
| Date:   Wed Jan 30 13:33:16 2008 +0100
|
|     x86: use the correct cpuid method to detect MWAIT support for C states

remove the functional effects of this patch and make mwait unconditional.

A future patch will turn off mwait on specific CPUs where that causes
power to be wasted.

Bisected-by: Vegard Nossum <vegard.nossum@gmail.com>
Tested-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

11 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Fri, 16 May 2008 22:39:28 +0000]
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Update defconfig.
  sparc64: Fix lmb_reserve() args in find_ramdisk().

11 years agosparc64: Update defconfig.
David S. Miller [Fri, 16 May 2008 20:36:27 +0000]
sparc64: Update defconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>

11 years agosparc64: Fix lmb_reserve() args in find_ramdisk().
David S. Miller [Thu, 15 May 2008 06:10:33 +0000]
sparc64: Fix lmb_reserve() args in find_ramdisk().

This fixes the missing ram regression reported by
Mikael Pettersson <mikpe@it.uu.se>, much thanks for
all of this help in diagnosing this.

The second argument to lmb_reserve() is a size,
not an end address bounds.

Tested-by: Mikael Pettersson <mikpe@it.uu.se>

Signed-off-by: David S. Miller <davem@davemloft.net>

11 years agobyteorder: don't directly include linux/byteorder/generic.h
Harvey Harrison [Fri, 16 May 2008 18:20:25 +0000]
byteorder: don't directly include linux/byteorder/generic.h

Use asm/byteorder.h instead.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Linus Torvalds [Fri, 16 May 2008 01:28:46 +0000]
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] macintosh: Replace deprecated __initcall with device_initcall
  [POWERPC] cell: Fix section mismatches in io-workarounds code
  [POWERPC] spufs: Fix compile error
  [POWERPC] Fix uninitialized variable bug in copy_{to|from}_user
  [POWERPC] Add null pointer check to of_find_property
  [POWERPC] vmemmap fixes to use smaller pages
  [POWERPC] spufs: Fix pointer reference in find_victim
  [POWERPC] 85xx: SBC8548 - Add flash support and HW Rev reporting
  [POWERPC] 85xx: Fix some sparse warnings for 85xx MDS
  [POWERPC] 83xx: Enable DMA engine on the MPC8377 MDS board.
  [POWERPC] 86xx: mpc8610_hpcd: fix second serial port
  [POWERPC] 86xx: mpc8610_hpcd: add support for NOR and NAND flashes
  [POWERPC] 85xx: Add 8568 PHY workarounds to board code
  [POWERPC] 86xx: mpc8610_hpcd: use ULI526X driver for on-board ethernet

11 years agoMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Linus Torvalds [Fri, 16 May 2008 01:28:28 +0000]
Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  jbd2: update transaction t_state to T_COMMIT fix
  ext4: Retry block allocation if new blocks are allocated from system zone.
  ext4: mballoc fix mb_normalize_request algorithm for 1KB block size filesystems
  ext4: fix typos in messages and comments (journalled -> journaled)
  ext4: fix synchronization of quota files in journal=data mode
  ext4: Fix mount messages when quota disabled
  ext4: correct mount option parsing to detect when quota options can be changed

11 years agoinitcalls: Fix m68k build and possible buffer overflow
Cyrill Gorcunov [Thu, 15 May 2008 20:52:41 +0000]
initcalls: Fix m68k build and possible buffer overflow

This patch fixes a build bug on m68k - gcc decides to emit a call to the
strlen library function, which we don't implement.

More importantly - my previous patch "init: don't lose initcall return
values" (commit e662e1cfd434aa234b72fbc781f1d70211cb785b) had introduced
potential buffer overflow by wrong calculation of string accumulator
size.

Use strlcat() instead, fixing both bugs.

Many thanks Andreas Schwab and Geert Uytterhoeven for helping
to catch and fix the bug.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agoSplit up 'do_initcalls()' into two simpler functions
Linus Torvalds [Fri, 16 May 2008 01:14:01 +0000]
Split up 'do_initcalls()' into two simpler functions

One function to just loop over the entries, one function to actually do
the call and the associated debugging code.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agoClean up 'print_fn_descriptor_symbol()' types
Linus Torvalds [Fri, 16 May 2008 00:50:37 +0000]
Clean up 'print_fn_descriptor_symbol()' types

Everybody wants to pass it a function pointer, and in fact, that is what
you _must_ pass it for it to make sense (since it knows that ia64 and
ppc64 use descriptors for function pointers and fetches the actual
address from there).

So don't make the argument be a 'unsigned long' and force everybody to
add a cast.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Thu, 15 May 2008 20:56:42 +0000]
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix personality(PER_LINUX32) performance issue
  [IA64] Properly unregister legacy interrupts
  [IA64] Remove NULL pointer check for argument never passed as NULL.
  [IA64] trivial cleanup for perfmon.c
  [IA64] trivial cleanup for entry.S
  [IA64] fix interrupt masking for pending works on kernel leave
  [IA64] allow user to force_pal_cache_flush
  [IA64] Don't reserve crashkernel memory > 4 GB
  [IA64] machvec support for SGI UV platform
  [IA64] Add header files for SGI UV platform

11 years agojbd2: update transaction t_state to T_COMMIT fix
Mingming Cao [Thu, 15 May 2008 18:46:17 +0000]
jbd2: update transaction t_state to T_COMMIT fix

Updating the current transaction's t_state is protected by j_state_lock.  We
need to do the same when updating the t_state to T_COMMIT.

Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

11 years agoext4: Retry block allocation if new blocks are allocated from system zone.
Aneesh Kumar K.V [Thu, 15 May 2008 18:43:20 +0000]
ext4: Retry block allocation if new blocks are allocated from system zone.

If the block allocator gets blocks out of system zone ext4 calls
ext4_error. But if the file system is mounted with errors=continue
retry block allocation. We need to mark the system zone blocks as
in use to make sure retry don't pick them again

System zone is the block range mapping block bitmap, inode bitmap and inode
table.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

11 years agotty: fix BKL related leak and crash
Ingo Molnar [Wed, 14 May 2008 15:11:46 +0000]
tty: fix BKL related leak and crash

Enabling the BKL to be lockdep tracked uncovered the following
upstream kernel bug in the tty code, which caused a BKL
reference leak:

  ================================================
  [ BUG: lock held when returning to user space! ]
  ------------------------------------------------
  dmesg/3121 is leaving the kernel with locks still held!
  1 lock held by dmesg/3121:
   #0:  (kernel_mutex){--..}, at: [<c02f34d9>] opost+0x24/0x194

this might explain some of the atomicity warnings and crashes
that -tip tree testing has been experiencing since the BKL
was converted back to a spinlock.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 years ago[IA64] fix personality(PER_LINUX32) performance issue
Huang, Xiaolan [Thu, 15 May 2008 02:18:41 +0000]
[IA64] fix personality(PER_LINUX32) performance issue

The patch aims to fix a performance issue for the syscall
personality(PER_LINUX32).

On IA-64 box, the syscall personality (PER_LINUX32) has poor performance
because it failed to find the Linux/x86 execution domain. Then it tried
to load the kernel module however it failed always and it used the default
execution domain PER_LINUX instead. Requesting kernel modules is very
expensive. It caused the performance issue. (see the function
lookup_exec_domain in kernel/exec_domain.c).

To resolve the issue, execution domain Linux/x86 is always registered in
initialization time for IA-64 architecture.

Signed-off-by: Xiaolan Huang <xiaolan.huang@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

11 years agoMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
Linus Torvalds [Thu, 15 May 2008 16:10:13 +0000]
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] show_interrupts: prevent cpu hotplug when walking cpu_online_map.
  [S390] smp: __smp_call_function_map vs cpu_online_map fix.
  [S390] tape: Use ccw_dev_id to build cdev_id.
  [S390] dasd: fix timeout handling in interrupt handler
  [S390] s390dbf: Use const char * for dbf name.
  [S390] dasd: Use const in busid functions.
  [S390] blacklist.c: removed duplicated include
  [S390] vmlogrdr: module initialization function should return negative errors
  [S390] sparsemem vmemmap: initialize memmap.
  [S390] Remove last traces of cio_msg=.
  [S390] cio: Remove CCW_CMD_SUSPEND_RECONN in front of CCW_CMD_SET_PGID.

11 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
Linus Torvalds [Thu, 15 May 2008 16:09:43 +0000]
Merge git://git./linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  arch/parisc/kernel/perf_asm.S: build fix
  parisc: remove -traditional from assembler flags
  parisc: use conditional macro for 64-bit wide ops
  parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
  arch/parisc/kernel/unaligned.c: use time_* macros
  parisc: remove redundant display of free swap space in show_mem()
  drivers/parisc: replace remaining __FUNCTION__ occurrences
  parisc: replace remaining __FUNCTION__ occurrences
  parisc: new termios definitions
  parisc: fix trivial section name warnings

11 years agoarch/parisc/kernel/perf_asm.S: build fix
Kyle McMartin [Thu, 15 May 2008 14:57:33 +0000]
arch/parisc/kernel/perf_asm.S: build fix

Missing <linux/init.h> header for __HEAD macro.

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

11 years agoparisc: remove -traditional from assembler flags
Kyle McMartin [Thu, 15 May 2008 14:56:36 +0000]
parisc: remove -traditional from assembler flags

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

11 years agoparisc: use conditional macro for 64-bit wide ops
Kyle McMartin [Thu, 15 May 2008 14:53:57 +0000]
parisc: use conditional macro for 64-bit wide ops

This work enables us to remove -traditional from $AFLAGS on
parisc.

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

11 years agoparisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
Robert P. J. Day [Wed, 14 May 2008 19:14:52 +0000]
parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.

Now that <asm-generic/ioctl.h> allows overriding of the most commonly
changed macro values, take advantage of that.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>