sfrench/cifs-2.6.git
14 years ago[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 4
Wim Van Sebroeck [Fri, 17 Nov 2006 22:50:06 +0000 (23:50 +0100)]
[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 4

a number of small patches:
- include notifier.h include file
- re-arrange prototype functions
- remove =0 initializations
- change printk logging levels to what's used in other drivers
- /dev/watchdog is a VFS so use nonseekable_open
- Style: Instead of "if (constant op function_or_variable)"
  we prefer "if (function_or_variable op constant)"
- arg is a __user pointer
- use MAX_TIMEOUT_SECONDS instead of 32 in WDIOC_SETTIMEOUT

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 3
Wim Van Sebroeck [Fri, 17 Nov 2006 22:36:08 +0000 (23:36 +0100)]
[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 3

Move start and stop code into seperate functions

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 2
Wim Van Sebroeck [Fri, 17 Nov 2006 22:15:48 +0000 (23:15 +0100)]
[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 2

Reorganize source code so that it is structured as follows:
- Function prototypes
- Local variables
- Module arguments
- Interrupt handler
- Watchdog functions
- /dev/watchdog operations
- Shutdown notifier
- Kernel interfaces
- Init & exit procedures
- Device driver init & exit

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 1
Wim Van Sebroeck [Fri, 17 Nov 2006 20:51:35 +0000 (21:51 +0100)]
[WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 1

Locate parameter descriptions close to parameter definition -
not in bottom of file.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] MIPS RM9000 on-chip watchdog device
Thomas Koeller [Mon, 14 Aug 2006 19:55:29 +0000 (21:55 +0200)]
[WATCHDOG] MIPS RM9000 on-chip watchdog device

This is a driver for the on-chip watchdog device found on some
MIPS RM9000 processors.

Signed-off-by: Thomas Koeller <thomas.koeller@baslerweb.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] Add iTCO vendor specific support
Wim Van Sebroeck [Sun, 12 Nov 2006 17:05:09 +0000 (18:05 +0100)]
[WATCHDOG] Add iTCO vendor specific support

Add vendor specific support to the intel TCO timer based watchdog
devices. At this moment we only have additional support for some
SuperMicro Inc. motherboards.

Signed-off-by: Robert Seretny <lkpatches@paypc.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] sc1200wdt.c pnp unregister fix.
Akinobu Mita [Sat, 28 Oct 2006 18:43:19 +0000 (03:43 +0900)]
[WATCHDOG] sc1200wdt.c pnp unregister fix.

If no devices found or invalid parameter is specified,
scl200wdt_pnp_driver is left unregistered.
It breaks global list of pnp drivers.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
14 years ago[WATCHDOG] config.h removal
Andrew Morton [Sat, 28 Oct 2006 00:20:42 +0000 (17:20 -0700)]
[WATCHDOG] config.h removal

config.h got removed

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
14 years ago[WATCHDOG] NS pc87413-wdt Watchdog driver - fixes
Wim Van Sebroeck [Mon, 23 Oct 2006 16:21:52 +0000 (18:21 +0200)]
[WATCHDOG] NS pc87413-wdt Watchdog driver - fixes

Some small fixes:
* the status should return 0 and not 1 (1 means:
* wdt_io is not a module-param, io is.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] NS pc87413-wdt Watchdog driver v1.1
Sven Anders & Marcus Junker [Mon, 16 Oct 2006 16:18:09 +0000 (18:18 +0200)]
[WATCHDOG] NS pc87413-wdt Watchdog driver v1.1

Change the driver for proper spin_locking,
remove the TEMP_MINOR stuff,
make sure the device works as a Virtual File System
that is non_seekable,
...

Signed-off-by: Sven Anders <anders@anduras.de>
Signed-off-by: Marcus Junker <junker@anduras.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] NS pc87413-wdt Watchdog driver
Sven Anders & Marcus Junker [Thu, 24 Aug 2006 15:11:50 +0000 (17:11 +0200)]
[WATCHDOG] NS pc87413-wdt Watchdog driver

New watchdog driver for the NS pc87413-wdt Watchdog Timer.

Signed-off-by: Sven Anders <anders@anduras.de>
Signed-off-by: Marcus Junker <junker@anduras.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] remove experimental on iTCO_wdt.c
Wim Van Sebroeck [Sat, 14 Oct 2006 18:18:47 +0000 (20:18 +0200)]
[WATCHDOG] remove experimental on iTCO_wdt.c

The iTCO_wdt.c driver has been tested enough. So we can
remove the experimental classification.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] Atmel AT91RM9200 rename.
Andrew Victor [Tue, 26 Sep 2006 15:49:30 +0000 (17:49 +0200)]
[WATCHDOG] Atmel AT91RM9200 rename.

The new Atmel AT91SAM9261 and AT91SAM9260 processors use a different
internal watchdog peripheral.  This watchdog driver is therefore
AT91RM9200-specific.

This patch renames at91_wdt.c to at91rm9200_wdt.c, and changes the name
of the configuration option.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] includes for sample watchdog program.
Jean Delvare [Thu, 28 Sep 2006 07:35:27 +0000 (09:35 +0200)]
[WATCHDOG] includes for sample watchdog program.

Add missing includes to sample watchdog program.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning
Jeff Garzik [Tue, 10 Oct 2006 07:40:44 +0000 (03:40 -0400)]
[WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning

gcc emits the following warning:

drivers/char/watchdog/iTCO_wdt.c: In function ‘iTCO_wdt_ioctl’:
drivers/char/watchdog/iTCO_wdt.c:429: warning: ‘time_left’ may be used uninitialized in this function

This indicates a condition near enough to a bug, to want to fix.
iTCO_wdt_get_timeleft() stores a value in 'time_left' iff
iTCO_version==(1 or 2).  This driver only supports versions
1 or 2, so this is ok.  However, since (a) the return value of
iTCO_wdt_get_timeleft() is handled anyway, (b) it fixes the warning,
and (c) it future-proofs the driver, we go ahead and add the obvious
return value.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
14 years ago[WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2)
Wim Van Sebroeck [Sun, 8 Oct 2006 19:05:21 +0000 (21:05 +0200)]
[WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2)

Add ICH8 support to the iTCO_wdt driver.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] add ich8 support to iTCO_wdt.c
Arnaud Patard (Rtp) [Wed, 4 Oct 2006 12:18:29 +0000 (14:18 +0200)]
[WATCHDOG] add ich8 support to iTCO_wdt.c

Add ICH8 support to the iTCO_wdt driver.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c
Amol Lad [Fri, 6 Oct 2006 20:41:12 +0000 (13:41 -0700)]
[WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c

ioremap must be balanced by an iounmap and failing to do so can result
in a memory leak.

Signed-off-by: Amol Lad <amol@verismonetworks.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - Kconfig patch
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - Kconfig patch

Update Kconfig for the w83697hf/hg watchdog driver.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - autodetect patch
Wim Van Sebroeck [Fri, 15 Sep 2006 15:59:07 +0000 (17:59 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - autodetect patch

Change the autodetect code so that it is more generic.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 16
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 16

This is patch 16 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Add copyright notice for Samuel Tardieu also.

This is the last patch in this series.

The original description for Samuel's driver was:
driver for the Winbond W83697HF/W83697HG watchdog timer

The Winbond SuperIO W83697HF/HG includes a watchdog that can count from
1 to 255 seconds (or minutes). This drivers allows the seconds mode to
be used. It exposes a standard /dev/watchdog interface. This chip is
currently being used on some motherboards designed by VIA.

By default, the module looks for a chip at I/O port 0x2e. The chip can
be configured to be at 0x4e on some motherboards, the address can be
chosen using the wdt_io module parameter. Using 0 will try to autodetect
the address.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 15
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 15

This is patch 15 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Clean-up initialization code - part 2:
   * the line reading "set second mode & disable keyboard ..."
     is plain wrong, the register being manipulated (CRF4) is
     the counter itself, not the control byte (CRF3) -- looks
     like it has been copied from another driver.
   * I think garbage is being written in CRF3 (the control word)
     as the timeout value is being stored in this register (such
     as 60 for 60 seconds).
   * We only want to set pin 119 to WDTO# mode and leave the rest
     of CR29 like it is.
   * Set count mode to seconds and not minutes.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 14
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 14

This is patch 14 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Clean-up initialization code (part 1: remove
   w83697hf_select_wd_register() and
   w83697hf_unselect_wd_register() functions).
 - Make sure that the watchdog device is stopped
   as soon as we found it.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 13
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 13

This is patch 13 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Remove wdt_ctrl (it has been replaced with the
   w83697hf_write_timeout() function) and redo/clean-up
   the start/stop/ping code.
 - Make sure that the watchdog is enabled or disabled
   When starting or stoping the device (with a call
   to w83697hf_set_reg(0x30, ?); ).

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 12
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 12

This is patch 12 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Add w83697hf_write_timeout() to set the
   watchdog's timeout value.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 11
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 11

This is patch 11 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Add w83697hf_select_wdt() and w83697hf_deselect_wdt()
   so that the start/stop/ping code can directly talk to
   the watchdog.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 10
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 10

This is patch 10 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - check whether the device is really present
   (we *can* probe for the device now).

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 9
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 9

This is patch 9 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - add w83697hf_get_reg() and w83697hf_set_reg()
   functions.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 8
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 8

This is patch 8 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - add w83697hf_lock function to leave the
   chipsets extended function mode.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 7
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 7

This is patch 7 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - add w83697hf_unlock function to enter the
   chipsets extended function mode.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 6
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 6

This is patch 6 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - The driver works for both the w83697hf
   and the w83697hg chipset's.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 5
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 5

This is patch 5 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Rename the Extended Function Registers to the names
   used in the data-sheet.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 4
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 4

This is patch 4 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - limits the watchdog timeout to 1-63 while this
   device accepts 1-255.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 3
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 3

This is patch 3 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - Fix identation.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 2
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 2

This is patch 2 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - wdt_io is 2 bytes long. We should do a
   request_region for 2 bytes instead of 1.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf/hg WDT driver - patch 1
Samuel Tardieu [Thu, 7 Sep 2006 09:57:00 +0000 (11:57 +0200)]
[WATCHDOG] w83697hf/hg WDT driver - patch 1

This is patch 1 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - the note concerning tyan motherboards has been copied from
   another driver, This doesn't apply here.
 - the comments concerning CRF6 are wrong as CRF3 is manipulated
   and CRF6 is never read nor written.
 - the comments concerning CRF5 are wrong as CRF4 is manipulated
   and CRF5 is never read nor written.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
Wim Van Sebroeck [Wed, 13 Sep 2006 19:27:29 +0000 (21:27 +0200)]
[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()

Return ENOTTY instead of ENOIOCTLCMD in user-visible ioctl() results

The watchdog drivers used to return ENOIOCTLCMD for bad ioctl() commands.
ENOIOCTLCMD should not be visible by the user, so use ENOTTY instead.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
14 years ago[WATCHDOG] Kconfig clean up
Wim Van Sebroeck [Sat, 2 Sep 2006 17:04:02 +0000 (19:04 +0200)]
[WATCHDOG] Kconfig clean up

fixed some more trailing spaces.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w836?7hf_wdt spinlock fixes.
Wim Van Sebroeck [Sat, 2 Sep 2006 16:50:20 +0000 (18:50 +0200)]
[WATCHDOG] w836?7hf_wdt spinlock fixes.

Add io spinlocks to prevent possible race
conditions between start and stop operations
that are issued from different child processes
where the master process opened /dev/watchdog.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] Kconfig clean-up
Wim Van Sebroeck [Sat, 2 Sep 2006 15:59:54 +0000 (17:59 +0200)]
[WATCHDOG] Kconfig clean-up

* fix typo's according to spellings checker
* Fix some leading and trailing spaces

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] w83697hf WDT driver
Marcus Junker [Thu, 24 Aug 2006 15:11:50 +0000 (17:11 +0200)]
[WATCHDOG] w83697hf WDT driver

New watchdog driver for the Winbond W83697HF chipset.

Signed-off-by: Marcus Junker <junker@anduras.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] Winbond SMsC37B787 watchdog fixes
Wim Van Sebroeck [Sat, 2 Sep 2006 18:53:19 +0000 (20:53 +0200)]
[WATCHDOG] Winbond SMsC37B787 watchdog fixes

* Added io spinlocking
* Deleted WATCHDOG_MINOR (it's in the miscdevice include
* Changed timer_enabled to use set_bit functions
* WDIOC_GETSUPPORT should return -EFAULT or 0
* timeout should be correct before we initialize the watchdog
* we should initialize the watchdog before we give access
  to userspace
* Third parameter of module_param is not the default or
  initial value

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] Winbond SMsC37B787 - remove trailing whitespace
Wim Van Sebroeck [Sat, 2 Sep 2006 17:32:26 +0000 (19:32 +0200)]
[WATCHDOG] Winbond SMsC37B787 - remove trailing whitespace

Remove trailing whitespace.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[WATCHDOG] Winbond SMsC37B787 watchdog driver
Sven Anders [Thu, 24 Aug 2006 15:11:50 +0000 (17:11 +0200)]
[WATCHDOG] Winbond SMsC37B787 watchdog driver

New watchdog driver for the Winbond SMsC37B787 chipset.

Signed-off-by: Sven Anders <anders@anduras.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
14 years ago[S390] cio: improve unit check handling for internal operations
Peter Oberparleiter [Wed, 4 Oct 2006 18:02:30 +0000 (20:02 +0200)]
[S390] cio: improve unit check handling for internal operations

Retry internal operation after unit check instead of aborting them.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years ago[S390] cio: add timeout handler for internal operations.
Peter Oberparleiter [Wed, 4 Oct 2006 18:02:26 +0000 (20:02 +0200)]
[S390] cio: add timeout handler for internal operations.

Add timeout handler for common-I/O-layer-internal I/O operations.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years ago[S390] Remove open-coded mem_map usage.
Heiko Carstens [Wed, 4 Oct 2006 18:02:23 +0000 (20:02 +0200)]
[S390] Remove open-coded mem_map usage.

Use page_to_phys and pfn_to_page to avoid open-coded mem_map usage.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
14 years ago[S390] Have s390 use add_active_range() and free_area_init_nodes.
Heiko Carstens [Wed, 4 Oct 2006 18:02:19 +0000 (20:02 +0200)]
[S390] Have s390 use add_active_range() and free_area_init_nodes.

Size zones and holes in an architecture independent manner for s390.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
14 years ago[S390] Remove crept in whitespace from head*.S again.
Heiko Carstens [Wed, 4 Oct 2006 18:02:15 +0000 (20:02 +0200)]
[S390] Remove crept in whitespace from head*.S again.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
14 years ago[S390] incorrect placement of include.
Martin Schwidefsky [Wed, 4 Oct 2006 18:02:12 +0000 (20:02 +0200)]
[S390] incorrect placement of include.

The include of linux/smp.h needs to be done before the #if that
checks for the compiler version. Seems like fallout from the
inline assembly cleanup patch vs. the directed yield patch.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years ago[S390] Wire up sys_getcpu system call.
Heiko Carstens [Wed, 4 Oct 2006 18:02:09 +0000 (20:02 +0200)]
[S390] Wire up sys_getcpu system call.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
14 years ago[S390] zcrypt device registration/unregistration race.
Ralph Wuerthner [Wed, 4 Oct 2006 18:02:05 +0000 (20:02 +0200)]
[S390] zcrypt device registration/unregistration race.

Fix a race condition during AP device registration and unregistration.

Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years ago[S390] Add timeouts during sense PGID, path verification and disband PGID.
Cornelia Huck [Wed, 4 Oct 2006 18:02:02 +0000 (20:02 +0200)]
[S390] Add timeouts during sense PGID, path verification and disband PGID.

While the machine owns us an interrupt in these cases (and we should get
one), reality isn't always like that...

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years ago[S390] user-copy optimization fallout.
Martin Schwidefsky [Wed, 4 Oct 2006 18:01:58 +0000 (20:01 +0200)]
[S390] user-copy optimization fallout.

Fix new restore_sigregs function. It copies the user space copy of the
old psw without correcting the psw.mask and the psw.addr high order bit.
While we are at it, simplify save_sigregs a bit.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years ago[S390] update default configuration
Martin Schwidefsky [Wed, 4 Oct 2006 18:01:52 +0000 (20:01 +0200)]
[S390] update default configuration

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
14 years agoMerge branch 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-block
Linus Torvalds [Wed, 4 Oct 2006 17:44:01 +0000 (10:44 -0700)]
Merge branch 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Document bi_sector and sector_t
  [PATCH] helper function for retrieving scsi_cmd given host based block layer tag

14 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Wed, 4 Oct 2006 17:43:31 +0000 (10:43 -0700)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Remove remaining reference to ite_gpio.h from Kbuild
  [MIPS] PNX8550 fixups

14 years ago[PATCH] Document bi_sector and sector_t
Roger Gammans [Wed, 4 Oct 2006 11:37:45 +0000 (13:37 +0200)]
[PATCH] Document bi_sector and sector_t

Signed-Off-By: Roger Gammans <rgammans@computer-surgery.co.uk>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
14 years ago[PATCH] helper function for retrieving scsi_cmd given host based block layer tag
David C Somayajulu [Wed, 4 Oct 2006 06:27:25 +0000 (08:27 +0200)]
[PATCH] helper function for retrieving scsi_cmd given host based block layer tag

This was necessitated by the need for a function to get back
to a scsi_cmnd, when an hba the posts its (corresponding) completion
interrupt with a block layer tag as its reference.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: David Somayajulu <david.somayajulu@qlogic.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Linus Torvalds [Wed, 4 Oct 2006 17:30:07 +0000 (10:30 -0700)]
Merge /pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4712): Fix warning when compiling on x86_i64
  V4L/DVB (4711): Radio: No need to return void
  V4L/DVB (4708): Add tveeprom support for Philips FM1236/FM1216ME MK5
  V4L/DVB (4707): 4linux: complete conversion to hotplug safe PCI API
  V4L/DVB (4706): Do not enable VIDEO_V4L2 unconditionally
  V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixup
  V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM board
  V4L/DVB (4702): Fix: set antenna input for DVB-T for Asus P7131 Dual hybrid
  V4L/DVB (4701): Saa713x audio fixes
  V4L/DVB (4676a): Remove Kconfig item for DiB7000M support

14 years ago[PATCH] atmel_serial: Fix roundoff error in atmel_console_get_options
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:11 +0000 (16:02 +0200)]
[PATCH] atmel_serial: Fix roundoff error in atmel_console_get_options

The atmel_console_get_options() function initializes the baud,
parity and bits settings from the actual hardware setup, in
case it has been initialized by a e.g. boot loader.

The baud rate, however, is not necessarily exactly equal to one of
the standard baud rates (115200, etc.) This means that the baud rate
calculated by this function may be slightly higher or slightly lower
than one of the standard baud rates.

If the baud rate is slightly lower than the target, this causes
problems when uart_set_option() tries to match the detected baud rate
against the standard baud rate, as it will always select a baud rate
that is lower or equal to the target rate. For example if the
detected baud rate is slightly lower than 115200, usart_set_options()
will select 57600.

This patch fixes the problem by subtracting 1 from the value in BRGR
when calculating the baud rate. The detected baud rate will thus
always be higher than the nearest standard baud rate, and
uart_set_options() will end up doing the right thing.

Tested on ATSTK1000 and AT91RM9200-EK boards. Both are broken without
this patch.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] AVR32: Allow renumbering of serial devices
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:10 +0000 (16:02 +0200)]
[PATCH] AVR32: Allow renumbering of serial devices

Allow the board to remap actual USART peripheral devices to serial
devices by calling at32_map_usart(hw_id, serial_line). This ensures
that even though ATSTK1002 uses USART1 as the first serial port, it
will still have a ttyS0 device.

This also adds a board-specific early setup hook and moves the
at32_setup_serial_console() call there from the platform code.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] atmel_serial: Support AVR32
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:09 +0000 (16:02 +0200)]
[PATCH] atmel_serial: Support AVR32

Make CONFIG_SERIAL_ATMEL selectable on AVR32 and #ifdef out some ARM-
specific code in the driver.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] atmel_serial: Pass fixed register mappings through platform_data
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:08 +0000 (16:02 +0200)]
[PATCH] atmel_serial: Pass fixed register mappings through platform_data

In order to initialize the serial console early, the atmel_serial
driver had to do a hack where it compared the physical address of the
port with an address known to be permanently mapped, and used it as a
virtual address. This got around the limitation that ioremap() isn't
always available when the console is being initalized.

This patch removes that hack and replaces it with a new "regs" field
in struct atmel_uart_data that the board-specific code can initialize
to a fixed virtual mapping for platform devices where this is possible.
It also initializes the DBGU's regs field with the address the driver
used to check against.

On AVR32, the "regs" field is initialized from the physical base
address when this it can be accessed through a permanently 1:1 mapped
segment, i.e. the P4 segment.

If regs is NULL, the console initialization is delayed until the "real"
driver is up and running and ioremap() can be used.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] atmel_serial: Rename at91_register_uart_fns
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:07 +0000 (16:02 +0200)]
[PATCH] atmel_serial: Rename at91_register_uart_fns

Rename at91_register_uart_fns and associated structs and variables
to make it consistent with the atmel_ prefix used by the rest of
the driver.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] serial: Rename PORT_AT91 -> PORT_ATMEL
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:06 +0000 (16:02 +0200)]
[PATCH] serial: Rename PORT_AT91 -> PORT_ATMEL

The at91_serial driver can be used with both AT32 and AT91 devices
from Atmel and has therefore been renamed atmel_serial. The only
thing left is to rename PORT_AT91 PORT_ATMEL.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] at91_serial -> atmel_serial: Internal names
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:05 +0000 (16:02 +0200)]
[PATCH] at91_serial -> atmel_serial: Internal names

Prefix all internal functions and variables with atmel_ instead of
at91_.

The at91_register_uart_fns() stuff is left as is since I can't find
any actual users of it.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] at91_serial -> atmel_serial: Public definitions
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:04 +0000 (16:02 +0200)]
[PATCH] at91_serial -> atmel_serial: Public definitions

Rename the following public definitions:
  * AT91_NR_UART -> ATMEL_MAX_UART
  * struct at91_uart_data -> struct atmel_uart_data
  * at91_default_console_device -> atmel_default_console_device

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] at91_serial -> atmel_serial: Platform device name
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:03 +0000 (16:02 +0200)]
[PATCH] at91_serial -> atmel_serial: Platform device name

Rename the "at91_usart" platform driver "atmel_usart" and update
platform devices accordingly.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] at91_serial -> atmel_serial: Kconfig symbols
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:02 +0000 (16:02 +0200)]
[PATCH] at91_serial -> atmel_serial: Kconfig symbols

Rename the following Kconfig symbols:
  * CONFIG_SERIAL_AT91 -> CONFIG_SERIAL_ATMEL
  * CONFIG_SERIAL_AT91_CONSOLE -> CONFIG_SERIAL_ATMEL_CONSOLE
  * CONFIG_SERIAL_AT91_TTYAT -> CONFIG_SERIAL_ATMEL_TTYAT

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] at91_serial -> atmel_serial: at91_serial.c
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:01 +0000 (16:02 +0200)]
[PATCH] at91_serial -> atmel_serial: at91_serial.c

Rename at91_serial.c atmel_serial.c

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] at91_serial -> atmel_serial: at91rm9200_usart.h
Haavard Skinnemoen [Wed, 4 Oct 2006 14:02:00 +0000 (16:02 +0200)]
[PATCH] at91_serial -> atmel_serial: at91rm9200_usart.h

Move include/asm/arch/at91rm9200_usart.h into drivers/serial and rename
it atmel_usart.h. Also delete AVR32's version of this file.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[MIPS] Remove remaining reference to ite_gpio.h from Kbuild
David Woodhouse [Wed, 4 Oct 2006 16:32:21 +0000 (17:32 +0100)]
[MIPS] Remove remaining reference to ite_gpio.h from Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] PNX8550 fixups
Vitaly Wool [Wed, 4 Oct 2006 15:19:58 +0000 (19:19 +0400)]
[MIPS] PNX8550 fixups

This patch fixes the compilation errors on PNX8550 and hard-to-track
bug in interrupt handling.
It also corresponds to the latest changes in PNX8550 serial driver.

Signed-off-by: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
Linus Torvalds [Wed, 4 Oct 2006 16:59:57 +0000 (09:59 -0700)]
Merge /pub/scm/linux/kernel/git/davej/configh

* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
  Remove all inclusions of <linux/config.h>

Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.

14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6
Linus Torvalds [Wed, 4 Oct 2006 16:06:16 +0000 (09:06 -0700)]
Merge git://git./linux/kernel/git/steve/gfs2-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6: (292 commits)
  [GFS2] Fix endian bug for de_type
  [GFS2] Initialize SELinux extended attributes at inode creation time.
  [GFS2] Move logging code into log.c (mostly)
  [GFS2] Mark nlink cleared so VFS sees it happen
  [GFS2] Two redundant casts removed
  [GFS2] Remove uneeded endian conversion
  [GFS2] Remove duplicate sb reading code
  [GFS2] Mark metadata reads for blktrace
  [GFS2] Remove iflags.h, use FS_
  [GFS2] Fix code style/indent in ops_file.c
  [GFS2] streamline-generic_file_-interfaces-and-filemap gfs fix
  [GFS2] Remove readv/writev methods and use aio_read/aio_write instead (gfs bits)
  [GFS2] inode-diet: Eliminate i_blksize from the inode structure
  [GFS2] inode_diet: Replace inode.u.generic_ip with inode.i_private (gfs)
  [GFS2] Fix typo in last patch
  [GFS2] Fix direct i/o logic in filemap.c
  [GFS2] Fix bug in Makefiles for lock modules
  [GFS2] Remove (extra) fs_subsys declaration
  [GFS2/DLM] Fix trailing whitespace
  [GFS2] Tidy up meta_io code
  ...

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 4 Oct 2006 15:26:19 +0000 (08:26 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [XFRM]: BEET mode
  [TCP]: Kill warning in tcp_clean_rtx_queue().
  [NET_SCHED]: Remove old estimator implementation
  [ATM]: [zatm] always *pcr in alloc_shaper()
  [ATM]: [ambassador] Change the return type to reflect reality
  [ATM]: kmalloc to kzalloc patches for drivers/atm
  [TIPC]: fix printk warning
  [XFRM]: Clearing xfrm_policy_count[] to zero during flush is incorrect.
  [XFRM] STATE: Use destination address for src hash.
  [NEIGH]: always use hash_mask under tbl lock
  [UDP]: Fix MSG_PROBE crash
  [UDP6]: Fix flowi clobbering
  [NET_SCHED]: Revert "HTB: fix incorrect use of RB_EMPTY_NODE"
  [NETFILTER]: ebt_mark: add or/and/xor action support to mark target
  [NETFILTER]: ipt_REJECT: remove largely duplicate route_reverse function
  [NETFILTER]: Honour source routing for LVS-NAT
  [NETFILTER]: add type parameter to ip_route_me_harder
  [NETFILTER]: Kconfig: fix xt_physdev dependencies

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6
Linus Torvalds [Wed, 4 Oct 2006 15:18:34 +0000 (08:18 -0700)]
Merge /pub/scm/linux/kernel/git/willy/parisc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6: (41 commits)
  [PARISC] Kill wall_jiffies use
  [PARISC] Honour "panic_on_oops" sysctl
  [PARISC] Fix fs/binfmt_som.c
  [PARISC] Export clear_user_page to modules
  [PARISC] Make DMA routines more stubby
  [PARISC] Define pci_get_legacy_ide_irq
  [PARISC] Fix CONFIG_DEBUG_SPINLOCK
  [PARISC] Fix HPUX compat compile with current GCC
  [PARISC] Fix iounmap compile warning
  [PARISC] Add support for Quicksilver AGPGART
  [PARISC] Move LBA and SBA register defines to the common ropes.h
  [PARISC] Create shared <asm/ropes.h> header
  [PARISC] Stash the lba_device in its struct device drvdata
  [PARISC] Generalize IS_ASTRO et al to take a parisc_device like
  [PARISC] Pretty print the name of the lba type on kernel boot
  [PARISC] Remove some obsolete comments and I checked that Reo is similar to Ike
  [PARISC] Add hardware found in the rp8400
  [PARISC] Allow nested interrupts
  [PARISC] Further updates to timer_interrupt()
  [PARISC] remove halftick and copy clocktick to local var (gcc can optimize usage)
  ...

14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Linus Torvalds [Wed, 4 Oct 2006 15:16:37 +0000 (08:16 -0700)]
Merge git://git./linux/kernel/git/paulus/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (25 commits)
  [POWERPC] Add support for the mpc832x mds board
  [POWERPC] Add initial support for the e300c2 core
  [POWERPC] Add MPC8360EMDS default dts file
  [POWERPC] Add MPC8360EMDS board support
  [POWERPC] Add QUICC Engine (QE) infrastructure
  [POWERPC] Add QE device tree node definition
  [POWERPC] Don't try to just continue if xmon has no input device
  [POWERPC] Fix a printk in pseries_mpic_init_IRQ
  [POWERPC] Get default baud rate in udbg_scc
  [POWERPC] Fix zImage.coff on oldworld PowerMac
  [POWERPC] Fix xmon=off and cleanup xmon initialisation
  [POWERPC] Cleanup include/asm-powerpc/xmon.h
  [POWERPC] Update swim3 printk after blkdev.h change
  [POWERPC] Cell interrupt rework
  POWERPC: mpc82xx merge: board-specific/platform stuff(resend)
  POWERPC: 8272ads merge to powerpc: common stuff
  POWERPC: Added devicetree for mpc8272ads board
  [POWERPC] iSeries has no legacy I/O
  [POWERPC] implement BEGIN/END_FW_FTR_SECTION
  [POWERPC] iSeries does not need pcibios_fixup_resources
  ...

14 years agoMerge branch 'audit.b32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
Linus Torvalds [Wed, 4 Oct 2006 15:15:55 +0000 (08:15 -0700)]
Merge branch 'audit.b32' of git://git./linux/kernel/git/viro/audit-current

* 'audit.b32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] message types updated
  [PATCH] name_count array overrun
  [PATCH] PPID filtering fix
  [PATCH] arch filter lists with < or > should not be accepted

14 years ago[PATCH] pata: teach ali about rev C8, keep pcmcia driver in sync
Alan Cox [Wed, 4 Oct 2006 11:47:14 +0000 (12:47 +0100)]
[PATCH] pata: teach ali about rev C8, keep pcmcia driver in sync

This fixes support for rev c8 of the ALi/ULi PATA, and keeps pcmcia in
sync so ide_cs and pata_pcmcia are interchangable, both are only changes
to constants.

Right now rev 0xC8 and higher don't work with libata but 0xc8 is in the
field now.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] RTC: build fixes
Jeff Garzik [Wed, 4 Oct 2006 08:41:53 +0000 (04:41 -0400)]
[PATCH] RTC: build fixes

Fix obvious build breakage revealed by 'make allyesconfig'
in current -git.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 4 Oct 2006 15:06:16 +0000 (08:06 -0700)]
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:
  [libata] pata_artop: kill gcc warning
  [PATCH] libata: turn off NCQ if queue depth is adjusted to 1
  [PATCH] libata: cosmetic changes to constants
  [libata] DocBook minor updates, fixes
  [libata] PCI ID table cleanup in various drivers
  [libata] Print out Status register, if a BSY-sleep takes too long
  [libata] init probe_ent->private_data in a common location
  [libata] minor PCI IDE probe fixes and cleanups
  [libata] Use new PCI_VDEVICE() macro to dramatically shorten ID lists
  [PATCH] Fix reference of uninitialised memory in ata_device_add()

14 years ago[PATCH] git-powerpc: wrapper: don't require execute permissions
Andrew Morton [Wed, 4 Oct 2006 09:17:32 +0000 (02:17 -0700)]
[PATCH] git-powerpc: wrapper: don't require execute permissions

If you lose the x bit (eg: by using patch(1)), powerpc won't build.  Be
defensive about it...

Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] kill sound/oss/*_syms.c
Adrian Bunk [Wed, 4 Oct 2006 09:17:31 +0000 (02:17 -0700)]
[PATCH] kill sound/oss/*_syms.c

Move all EXPORT_SYMBOL's from sound/oss/*_syms.c to the files with the
actual functions.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] The scheduled removal of some OSS drivers
Adrian Bunk [Wed, 4 Oct 2006 09:17:22 +0000 (02:17 -0700)]
[PATCH] The scheduled removal of some OSS drivers

This patch contains the scheduled removal of OSS drivers that:
- have ALSA drivers for the same hardware without known regressions and
- whose Kconfig options have been removed in 2.6.17.

[michal.k.k.piotrowski@gmail.com: build fix]
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] RCU: CREDITS and MAINTAINERS
Josh Triplett [Wed, 4 Oct 2006 09:17:21 +0000 (02:17 -0700)]
[PATCH] RCU: CREDITS and MAINTAINERS

Add MAINTAINERS entry for Read-Copy Update (RCU), listing Dipankar Sarma as
maintainer, and giving the URL for Paul McKenney's RCU site.  Add
MAINTAINERS entry for rcutorture, listing myself as maintainer.  Add
CREDITS entries for developers of RCU, RCU variants, and rcutorture.  Use
Paul McKenney's preferred email address in include/linux/rcupdate.h .

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Cc: Paul McKenney <paulmck@us.ibm.com>
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: simplify/improve batch tuning
Oleg Nesterov [Wed, 4 Oct 2006 09:17:17 +0000 (02:17 -0700)]
[PATCH] rcu: simplify/improve batch tuning

Kill a hard-to-calculate 'rsinterval' boot parameter and per-cpu
rcu_data.last_rs_qlen.  Instead, it adds adds a flag rcu_ctrlblk.signaled,
which records the fact that one of CPUs has sent a resched IPI since the
last rcu_start_batch().

Roughly speaking, we need two rcu_start_batch()s in order to move callbacks
from ->nxtlist to ->donelist.  This means that when ->qlen exceeds qhimark
and continues to grow, we should send a resched IPI, and then do it again
after we gone through a quiescent state.

On the other hand, if it was already sent, we don't need to do it again
when another CPU detects overflow of the queue.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: add sched torture type to rcutorture
Josh Triplett [Wed, 4 Oct 2006 09:17:16 +0000 (02:17 -0700)]
[PATCH] rcu: add sched torture type to rcutorture

Implement torture testing for the "sched" variant of RCU, which uses
preempt_disable, preempt_enable, and synchronize_sched.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: add rcu_bh_sync torture type to rcutorture
Josh Triplett [Wed, 4 Oct 2006 09:17:16 +0000 (02:17 -0700)]
[PATCH] rcu: add rcu_bh_sync torture type to rcutorture

Use the newly-generic synchronous deferred free function to implement torture
testing for rcu_bh using synchronize_rcu_bh rather than the asynchronous
call_rcu_bh.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: add rcu_sync torture type to rcutorture
Josh Triplett [Wed, 4 Oct 2006 09:17:15 +0000 (02:17 -0700)]
[PATCH] rcu: add rcu_sync torture type to rcutorture

Use the newly-generic synchronous deferred free function to implement torture
testing for RCU using synchronize_rcu rather than the asynchronous call_rcu.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: refactor srcu_torture_deferred_free to work for any implementation
Josh Triplett [Wed, 4 Oct 2006 09:17:14 +0000 (02:17 -0700)]
[PATCH] rcu: refactor srcu_torture_deferred_free to work for any implementation

Make srcu_torture_deferred_free use cur_ops->sync() so it will work for any
implementation.  Move and rename it in preparation for use in the ops of other
implementations.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] RCU: add fake writers to rcutorture
Josh Triplett [Wed, 4 Oct 2006 09:17:13 +0000 (02:17 -0700)]
[PATCH] RCU: add fake writers to rcutorture

rcutorture currently has one writer and an arbitrary number of readers.  To
better exercise some of the code paths in RCU implementations, add fake
writer threads which call the synchronize function for the RCU variant in a
loop, with a delay between calls to arrange for different numbers of
writers running in parallel.

[bunk@stusta.de: cleanup]
Acked-by: Paul McKenney <paulmck@us.ibm.com>
Cc: Dipkanar Sarma <dipankar@in.ibm.com>
Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: Fix sign bug making rcu_random always return the same sequence
Josh Triplett [Wed, 4 Oct 2006 09:17:12 +0000 (02:17 -0700)]
[PATCH] rcu: Fix sign bug making rcu_random always return the same sequence

rcu_random uses a counter rrs_count to occasionally mix data from
get_random_bytes into the state of its pseudorandom generator.  However,
the rrs_counter gets declared as an unsigned long, and rcu_random checks
for --rrs_count < 0, so this code will never mix any real random data into
the state, and will thus always return the same sequence of random numbers.

Also, change the return value of rcu_random from long to unsigned long, to
avoid potential issues caused by the use of the % operator, which can
return negative values for negative left operands.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: Avoid kthread_stop on invalid pointer if rcutorture reader startup fails
Josh Triplett [Wed, 4 Oct 2006 09:17:11 +0000 (02:17 -0700)]
[PATCH] rcu: Avoid kthread_stop on invalid pointer if rcutorture reader startup fails

rcu_torture_init kmallocs the array of reader threads, then creates each
one with kthread_run, cleaning up with rcu_torture_cleanup if this fails.
rcu_torture_cleanup calls kthread_stop on any non-NULL pointer in the
array; however, any readers after the one that failed to start up will have
invalid pointers, not null pointers.  Avoid this by using kzalloc instead.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: Mention rcu_bh in description of rcutorture's torture_type parameter
Josh Triplett [Wed, 4 Oct 2006 09:17:10 +0000 (02:17 -0700)]
[PATCH] rcu: Mention rcu_bh in description of rcutorture's torture_type parameter

The comment for rcutorture's torture_type parameter only lists the RCU
variants rcu and srcu, but not rcu_bh; add rcu_bh to the list.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] rcu: Add MODULE_AUTHOR to rcutorture module
Josh Triplett [Wed, 4 Oct 2006 09:17:09 +0000 (02:17 -0700)]
[PATCH] rcu: Add MODULE_AUTHOR to rcutorture module

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: "Paul E. McKenney" <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] cpufreq: make the transition_notifier chain use SRCU
Alan Stern [Wed, 4 Oct 2006 09:17:06 +0000 (02:17 -0700)]
[PATCH] cpufreq: make the transition_notifier chain use SRCU

This patch (as762) changes the cpufreq_transition_notifier_list from a
blocking_notifier_head to an srcu_notifier_head.  This will prevent errors
caused attempting to call down_read() to access the notifier chain at a
time when interrupts must remain disabled, during system suspend.

It's not clear to me whether this is really necessary; perhaps the chain
could be made into an atomic_notifier.  However a couple of the callout
routines do use blocking operations, so this approach seems safer.

The head of the notifier chain needs to be initialized before use; this is
done by an __init routine at core_initcall time.  If this turns out not to
be a good choice, it can easily be changed.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
Cc: Jesse Brandeburg <jesse.brandeburg@gmail.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] SRCU: report out-of-memory errors
Alan Stern [Wed, 4 Oct 2006 09:17:05 +0000 (02:17 -0700)]
[PATCH] SRCU: report out-of-memory errors

Currently the init_srcu_struct() routine has no way to report out-of-memory
errors.  This patch (as761) makes it return -ENOMEM when the per-cpu data
allocation fails.

The patch also makes srcu_init_notifier_head() report a BUG if a notifier
head can't be initialized.  Perhaps it should return -ENOMEM instead, but
in the most likely cases where this might occur I don't think any recovery
is possible.  Notifier chains generally are not created dynamically.

[akpm@osdl.org: avoid statement-with-side-effect in macro]
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
14 years ago[PATCH] Add SRCU-based notifier chains
Alan Stern [Wed, 4 Oct 2006 09:17:04 +0000 (02:17 -0700)]
[PATCH] Add SRCU-based notifier chains

This patch (as751) adds a new type of notifier chain, based on the SRCU
(Sleepable Read-Copy Update) primitives recently added to the kernel.  An
SRCU notifier chain is much like a blocking notifier chain, in that it must
be called in process context and its callout routines are allowed to sleep.
 The difference is that the chain's links are protected by the SRCU
mechanism rather than by an rw-semaphore, so calling the chain has
extremely low overhead: no memory barriers and no cache-line bouncing.  On
the other hand, unregistering from the chain is expensive and the chain
head requires special runtime initialization (plus cleanup if it is to be
deallocated).

SRCU notifiers are appropriate for notifiers that will be called very
frequently and for which unregistration occurs very seldom.  The proposed
"task notifier" scheme qualifies, as may some of the network notifiers.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Acked-by: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>