linux-2.6.git
14 years ago[MIPS] Fix Kconfig typo bug
Ralf Baechle [Thu, 8 Feb 2007 12:44:19 +0000 (12:44 +0000)]
[MIPS] Fix Kconfig typo bug

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Fix double signal on trap and break instruction
Atsushi Nemoto [Tue, 6 Feb 2007 07:02:21 +0000 (16:02 +0900)]
[MIPS] Fix double signal on trap and break instruction

This commit broke gdb, since any BREAK or TRAP instruction cause SIGSEGV.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] sigset_32 has been made redundand by compat_sigset_t.
Ralf Baechle [Sun, 11 Feb 2007 18:22:36 +0000 (18:22 +0000)]
[MIPS] sigset_32 has been made redundand by compat_sigset_t.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] emma2rh: Remove needless <asm/i8259.h> inclusion.
Yoichi Yuasa [Thu, 8 Feb 2007 01:30:29 +0000 (10:30 +0900)]
[MIPS] emma2rh: Remove needless <asm/i8259.h> inclusion.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Add MTD device support for Cobalt
Yoichi Yuasa [Tue, 20 Feb 2007 05:11:57 +0000 (14:11 +0900)]
[MIPS] Add MTD device support for Cobalt

This patch has added MTD device support for Cobalt.
Moreover, removes old type FlashROM support.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[PATCH] tick management: make broadcast dependent on local APIC
Thomas Gleixner [Sat, 17 Feb 2007 19:03:21 +0000 (20:03 +0100)]
[PATCH] tick management: make broadcast dependent on local APIC

The broadcast functionality is only necessary when a local APIC is
available. Make the config switch depend on X86_LOCAL_APIC. This
resolves the mach-voyager breakage introduced by the tick managament
code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years ago[PATCH] Declare init_irq_proc before we use it.
Andrew Morton [Sun, 18 Feb 2007 05:22:39 +0000 (21:22 -0800)]
[PATCH] Declare init_irq_proc before we use it.

powerpc gets:

init/main.c: In function `do_basic_setup':
init/main.c:714: warning: implicit declaration of function `init_irq_proc'

but we cannot include linux/irq.h in generic code.

Fix it by moving the declaration into linux/interrupt.h instead.

And make sure all code that defines init_irq_proc() is including
linux/interrupt.h.

And nuke an ifdef-in-C

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years ago[PATCH] fs/stack.c: Copy i_nlink after all other attributes are copied
Erez Zadok [Mon, 19 Feb 2007 04:57:45 +0000 (23:57 -0500)]
[PATCH] fs/stack.c: Copy i_nlink after all other attributes are copied

A user-specified get_nlinks may depend on other inode attributes.

Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years ago[PATCH] NOHZ: Produce debug output instead of a BUG()
Thomas Gleixner [Mon, 19 Feb 2007 18:12:05 +0000 (18:12 +0000)]
[PATCH] NOHZ: Produce debug output instead of a BUG()

The BUG_ON() in tick_nohz_stop_sched_tick() triggers on some boxen.
Remove the BUG_ON and print information about the pending softirq
to allow better debugging of the problem.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years ago[PATCH] NOHZ: Fix RCU handling
Ingo Molnar [Mon, 19 Feb 2007 18:11:56 +0000 (18:11 +0000)]
[PATCH] NOHZ: Fix RCU handling

When a CPU is needed for RCU the tick has to continue even when it was
stopped before.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
Linus Torvalds [Mon, 19 Feb 2007 22:16:51 +0000 (14:16 -0800)]
Merge /linux/kernel/git/wim/linux-2.6-watchdog

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] machzwd warning fix

14 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Mon, 19 Feb 2007 21:38:42 +0000 (13:38 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Update defconfigs
  [MIPS] Support for several more SNI RM models.
  [MIPS] Include <asm/bugs> to for declaration of check_bugs32.
  [MIPS] Add external declaration of pagetable_init() to pgalloc.h
  [MIPS] Make kernel_thread_helper() static
  [MIPS] Make __declare_dbe_table static and avoid it getting optimized away
  [MIPS] Use MIPS R2 instructions for bitops.
  [MIPS] signals: Share even more code.
  [MIPS] Fix CONFIG_MIPS32_N32=y CONFIG_MIPS32_O32=n build
  [MIPS] Iomap implementation.
  [MIPS] <asm/compat-signal.h> needs to include <asm/uaccess.h>.
  [MIPS] IP27: Fix warning.
  [MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.

14 years agoMerge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
Linus Torvalds [Mon, 19 Feb 2007 21:36:16 +0000 (13:36 -0800)]
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon/vt1211: Add probing of alternate config index port
  hwmon/f71805f: Fix a race condition
  hwmon/abituguru: Fix unchecked return status
  hwmon: New driver for the Analog Devices ADM1029
  hwmon/w83627ehf: Add support for the W83627DHG chip
  hwmon: Use subsys_initcall
  hwmon/lm70: Make lm70_remove a __devexit function
  hwmon: Cleanup a bogus legacy comment
  hwmon: Simplify the locking model of two drivers
  hwmon: Drop unused mutexes in two drivers
  hwmon/it87: Add PWM base frequency control

14 years agoMerge git://git.infradead.org/mtd-2.6
Linus Torvalds [Mon, 19 Feb 2007 21:34:11 +0000 (13:34 -0800)]
Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (49 commits)
  [MTD] [NAND] S3C2412 fix hw ecc
  [MTD] [NAND] Work around false compiler warning in CAFÉ driver
  [JFFS2] printk warning fixes
  [MTD] [MAPS] ichxrom warning fix
  [MTD] [MAPS] amd76xrom warning fix
  [MTD] [MAPS] esb2rom warning fixes
  [MTD] [MAPS] ck804xrom warning fix
  [MTD] [MAPS] netsc520 warning fix
  [MTD] [MAPS] sc520cdp warning fix
  [MTD] [ONENAND] onenand_base warning fix
  [MTD] [NAND] eXcite nand flash driver
  [MTD] Improve heuristic for detecting wrong-endian RedBoot partition table
  [MTD] Fix RedBoot partition parsing regression harder.
  [MTD] [NAND] S3C2410: Hardware ECC correction code
  [JFFS2] Use MTD_OOB_AUTO to automatically place cleanmarker on NAND
  [MTD] Clarify OOB-operation interface comments
  [MTD] remove unused ecctype,eccsize fields from struct mtd_info
  [MTD] [NOR] Intel: remove ugly PROGREGION macros
  [MTD] [NOR] STAA: use writesize instead off eccsize to represent ECC block
  [MTD] OneNAND: Invalidate bufferRAM after erase
  ...

14 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
Linus Torvalds [Mon, 19 Feb 2007 21:33:01 +0000 (13:33 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: implement optional loose read cache
  9p: Use kthread_stop instead of sending a SIGKILL.

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Linus Torvalds [Mon, 19 Feb 2007 21:32:28 +0000 (13:32 -0800)]
Merge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
  [SCSI] SCSI core: better initialization for sdev->scsi_level
  [SCSI] scsi_proc.c: display sdev->scsi_level correctly
  [SCSI] megaraid_sas: update version and author info
  [SCSI] megaraid_sas: return sync cache call with success
  [SCSI] megaraid_sas: replace pci_alloc_consitent with dma_alloc_coherent in ioctl path
  [SCSI] megaraid_sas: add bios_param in scsi_host_template
  [SCSI] megaraid_sas: do not process cmds if hw_crit_error is set
  [SCSI] scsi_transport.h should include scsi_device.h
  [SCSI] aic79xx: remove extra newline from info message
  [SCSI] scsi_scan.c: handle bad inquiry responses
  [SCSI] aic94xx: tie driver to the major number of the sequencer firmware
  [SCSI] lpfc: add PCI error recovery support
  [SCSI] megaraid: pci_module_init to pci_register_driver
  [SCSI] tgt: fix the user/kernel ring buffer interface
  [SCSI] sgiwd93: interfacing to wd33c93
  [SCSI] wd33c93: Fast SCSI with WD33C93B

14 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Linus Torvalds [Mon, 19 Feb 2007 21:31:34 +0000 (13:31 -0800)]
Merge branch 'for-linus' of /linux/kernel/git/dtor/input

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
  Input: remove obsolete setup parameters from input drivers
  Input: HIL - fix improper call to release_region()
  Input: hid-lgff - treat devices as joysticks unless told otherwise
  Input: HID - add support for Logitech Formula Force EX
  Input: gpio-keys - switch to common GPIO API
  Input: do not lock device when showing name, phys and uniq
  Input: i8042 - let serio bus suspend ports
  Input: psmouse - properly reset mouse on shutdown/suspend

14 years agoMerge branch 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
Linus Torvalds [Mon, 19 Feb 2007 21:29:54 +0000 (13:29 -0800)]
Merge branch 'audit.b37' of git://git./linux/kernel/git/viro/audit-current

* 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] AUDIT_FD_PAIR
  [PATCH] audit config lockdown
  [PATCH] minor update to rule add/delete messages (ver 2)

14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Linus Torvalds [Mon, 19 Feb 2007 21:29:02 +0000 (13:29 -0800)]
Merge git://git./linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
  Documentation/kernel-docs.txt update.
  arch/cris: typo in KERN_INFO
  Storage class should be before const qualifier
  kernel/printk.c: comment fix
  update I/O sched Kconfig help texts - CFQ is now default, not AS.
  Remove duplicate listing of Cris arch from README
  kbuild: more doc. cleanups
  doc: make doc. for maxcpus= more visible
  drivers/net/eexpress.c: remove duplicate comment
  add a help text for BLK_DEV_GENERIC
  correct a dead URL in the IP_MULTICAST help text
  fix the BAYCOM_SER_HDX help text
  fix SCSI_SCAN_ASYNC help text
  trivial documentation patch for platform.txt
  Fix typos concerning hierarchy
  Fix comment typo "spin_lock_irqrestore".
  Fix misspellings of "agressive".
  drivers/scsi/a100u2w.c: trivial typo patch
  Correct trivial typo in log2.h.
  Remove useless FIND_FIRST_BIT() macro from cardbus.c.
  ...

14 years agoMerge branch 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Linus Torvalds [Mon, 19 Feb 2007 21:25:36 +0000 (13:25 -0800)]
Merge branch 'kill-jffs' of /linux/kernel/git/jgarzik/misc-2.6

* 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  Remove JFFS (version 1), as scheduled.

14 years agoMerge branch 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Linus Torvalds [Mon, 19 Feb 2007 21:23:50 +0000 (13:23 -0800)]
Merge branch 'acpi' of /linux/kernel/git/jgarzik/libata-dev

* 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: wrong sizeof for BUFFER
  [PATCH] libata: change order of _SDD/_GTF execution (resend #3)
  [PATCH] libata: ACPI _SDD support
  [PATCH] libata: ACPI and _GTF support

14 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Mon, 19 Feb 2007 21:23:26 +0000 (13:23 -0800)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (51 commits)
  sk98lin: mark deprecated in Kconfig
  Hostess SV-11 depends on INET
  Fix link autonegotiation timer.
  sk98lin: planned removal
  B44: increase wait loop
  b44: replace define
  e1000: allow ethtool to see link status when down
  e1000: remove obsolete custom pci_save_state code
  e1000: fix shared interrupt warning message
  atm: Use ARRAY_SIZE macro when appropriate
  bugfixes and new hardware support for arcnet driver
  pcnet32 NAPI no longer experimental
  MAINTAINER
  macb: Remove inappropriate spinlocks around mii calls
  Convert meth to netdev_priv
  sky2: v1.13
  sky2: receive error handling improvements
  sky2: transmit timeout
  sky2: flow control negotiation for Yukon-FE
  sky2: no need to reset pause bits on shutdown
  ...

14 years agoMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 19 Feb 2007 21:18:39 +0000 (13:18 -0800)]
Merge branch 'for-linus' of /home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (117 commits)
  [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports
  [ARM] 4140/1: AACI stability add ac97 timeout and retries
  [ARM] 4139/1: AACI record support
  [ARM] 4138/1: AACI: multiple channel support for IRQ handling
  [ARM] 4211/1: Provide a defconfig for ns9xxx
  [ARM] 4210/1: base for new machine type "NetSilicon NS9360"
  [ARM] 4222/1: S3C2443: Remove reference to missing S3C2443_PM
  [ARM] 4221/1: S3C2443: DMA support
  [ARM] 4220/1: S3C24XX: DMA system initialised from sysdev
  [ARM] 4219/1: S3C2443: DMA source definitions
  [ARM] 4218/1: S3C2412: fix CONFIG_CPU_S3C2412_ONLY wrt to S3C2443
  [ARM] 4217/1: S3C24XX: remove the dma channel show at startup
  [ARM] 4090/2: avoid clash between PXA and SA1111 defines
  [ARM] 4216/1: add .gitignore entries for ARM specific files
  [ARM] 4214/2: S3C2410: Add Armzone QT2410
  [ARM] 4215/1: s3c2410 usb device:  per-platform vbus_draw
  [ARM] 4213/1: S3C2410 - Update definition of ADCTSC_XY_PST
  [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
  [ARM] 4137/1: Add kexec support
  [ARM] 4201/1: SMP barriers pair needed for the secondary boot process
  ...

Fix up conflict due to typedef removal in sound/arm/aaci.h

14 years agoMerge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
Linus Torvalds [Mon, 19 Feb 2007 21:07:19 +0000 (13:07 -0800)]
Merge branch 'for-linus' of ssh:///linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: fix another deadlock in nodemgr
  ieee1394: cycle timer read extension for raw1394

14 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Linus Torvalds [Mon, 19 Feb 2007 21:05:14 +0000 (13:05 -0800)]
Merge git://git./linux/kernel/git/paulus/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (34 commits)
  [POWERPC] 86xx: Cleaned up platform dts files
  [POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards
  [POWERPC] 85xx: Cleaning up machine probing
  [POWERPC] QE: clean up ucc_slow.c and ucc_fast.c
  [POWERPC] 85xx: Cleaned up platform dts files
  [POWERPC] 83xx: Renamed MPC8323 MDS dts and defconfig to match other boards
  [POWERPC] 83xx: Updated and renamed MPC8360PB to MPC836x MDS
  [POWERPC] 83xx: Use of_platform_bus_probe to setup QE devices
  [POWERPC] 83xx: use default value of loops_per_jiffy
  [POWERPC] 83xx: Remove obsolete setting of ROOT_DEV.
  [POWERPC] 83xx: Cleaning up machine probing and board initcalls
  [POWERPC] Dispose irq mapping when done in mpc52xx_serial.c
  [POWERPC] 86xx: Add missing of_node_put() in mpc86xx_hpcn_init_irq().
  [POWERPC] 8[56]xx: Remove obsolete setting of ROOT_DEV for 85xx and 86xx platforms.
  [POWERPC] pseries: Enabling auto poweron after power is restored.
  [POWERPC] use winbond libata instead of ide driver for pseries CD drives
  [POWERPC] powerpc: remove references to the obsolete linux,platform property
  [POWERPC] add of_get_mac_address and update fsl_soc.c to use it
  [POWERPC] 83xx: Cleaned up 83xx platform dts files
  [POWERPC] Fix bug with early ioremap and 64k pages
  ...

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Mon, 19 Feb 2007 21:01:30 +0000 (13:01 -0800)]
Merge /pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (30 commits)
  ide: make ide_hwif_t.ide_dma_host_on void (v2)
  ide: make ide_hwif_t.ide_dma_{host_off,off_quietly} void (v2)
  ide: add ide_set_dma() helper (v2)
  sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
  ide: disable DMA in ->ide_dma_check for "no IORDY" case (v2)
  ide: convert ide_hwif_t.mmio into flag (v2)
  ide: use PIO/MMIO operations directly where possible (v2)
  ide: add ide_use_fast_pio() helper (v3)
  ide: unexport ide_set_xfer_rate() (v2)
  ide: remove ide_drive_t.usage
  ide: remove ide_pci_device_t tables with only one entry
  ide: remove write-only ide_hwif_t.no_dsc flag
  ide: remove write-only ide_pio_data_t.blacklisted
  sis5513: sis5513_config_xfer_rate() cleanup
  piix: cleanup
  svwks: small cleanup
  cs5530: small cleanup
  hpt366: remove redundant check from init_dma_hpt366()
  trm290: remove redundant CONFIG_BLK_DEV_IDEDMA #ifdef-s
  au1xxx-ide: remove dead code
  ...

14 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Mon, 19 Feb 2007 21:00:26 +0000 (13:00 -0800)]
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/core: Set static rate in ib_init_ah_from_path()
  IB/ipath: Make ipath_map_sg() static
  IB/core: Fix sparse warnings about shadowed declarations
  RDMA/cma: Add multicast communication support
  IB/sa: Track multicast join/leave requests
  IPoIB: CM error handling thinko fix
  RDMA/cxgb3: Remove Open Grid Computing copyrights in iw_cxgb3 driver
  RDMA/cxgb3: Fail posts synchronously when in TERMINATE state
  RDMA/iwcm: iw_cm_id destruction race fixes
  IB/ehca: Change query_port() to return LINK_UP instead UNKNOWN
  IB/ehca: Allow en/disabling scaling code via module parameter
  IB/ehca: Fix race condition/locking issues in scaling code
  IB/ehca: Rework irq handler
  IPoIB: Only allow root to change between datagram and connected mode
  IB/mthca: Fix allocation of ICM chunks in coherent memory
  IB/mthca: Allow the QP state transition RESET->RESET

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Linus Torvalds [Mon, 19 Feb 2007 20:59:55 +0000 (12:59 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: Make PCI device numa-node attribute visible in sysfs
  PCI: add systems for automatic breadth-first device sorting
  PCI: PCI devices get assigned redundant IRQs
  PCI: Make CARDBUS_MEM_SIZE and CARDBUS_IO_SIZE boot options
  PCI: pci.txt fix __devexit() usage
  PCI/sysfs/kobject kernel-doc fixes

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Linus Torvalds [Mon, 19 Feb 2007 20:59:26 +0000 (12:59 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  sysfs: fix build errors: uevent with CONFIG_SYSFS=n
  pcmcia: some class_device fallout
  Driver core: device_add_attrs() cleanup
  debugfs: Remove misleading comments.
  debugfs: implement symbolic links
  Driver: remove redundant kobject_unregister checks
  kobject: kobj->k_name verification fix
  serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
  Driver core: let request_module() send a /sys/modules/kmod/-uevent
  Driver.h copyright update

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Linus Torvalds [Mon, 19 Feb 2007 20:59:04 +0000 (12:59 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (39 commits)
  USB: at91-ohci, handle extra at91sam9261 ahb clock
  USB: another id for cp2101 driver
  USB: ueagle-atm.c needs sched.h
  USB: at91_udc, shrink runtime footprint
  usbnet: add missing Kconfig for KC2190 cables
  usbnet: init fault (oops) cleanup, whitespace fixes
  usbnet: recognize SiteCom CN-124
  usb: Remove Airprime device from option.c
  USB: change __init to __devinit for isp116x_probe
  USB: ps3: don't call ps3_system_bus_driver_register on other platforms
  USB: hid-core.c: Removes GTCO CalComp Interwrite IPanel PIDs from blacklist
  USB: kernel-doc fixes
  USB: quirky device for cdc-acm
  USB: cdc-acm: fix incorrect throtteling, make set_control optional
  USB: unconfigure devices which have config 0
  USB: make usb_iso_packet_descriptor.status signed
  USB: fix g_serial small error
  USB: use __u32 rather than u32 in userspace ioctls in usbdevice_fs.h
  USB Storage: US_FL_IGNORE_RESIDUE needed for Aiptek MP3 Player
  USB: Fix misspelled "USBNET_MII" kernel config option.
  ...

14 years ago[MIPS] Update defconfigs
Ralf Baechle [Sun, 18 Feb 2007 00:50:57 +0000 (00:50 +0000)]
[MIPS] Update defconfigs

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Support for several more SNI RM models.
Thomas Bogendoerfer [Thu, 28 Dec 2006 17:22:32 +0000 (18:22 +0100)]
[MIPS] Support for several more SNI RM models.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Include <asm/bugs> to for declaration of check_bugs32.
Ralf Baechle [Sun, 18 Feb 2007 19:07:31 +0000 (19:07 +0000)]
[MIPS] Include <asm/bugs> to for declaration of check_bugs32.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Add external declaration of pagetable_init() to pgalloc.h
Atsushi Nemoto [Sun, 18 Feb 2007 16:27:34 +0000 (01:27 +0900)]
[MIPS] Add external declaration of pagetable_init() to pgalloc.h

This fixes some sparse warnings.

pgtable-32.c:15:6: warning: symbol 'pgd_init' was not declared. Should it be static?
pgtable-32.c:32:13: warning: symbol 'pagetable_init' was not declared. Should it be static?

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Make kernel_thread_helper() static
Atsushi Nemoto [Sun, 18 Feb 2007 15:54:27 +0000 (00:54 +0900)]
[MIPS] Make kernel_thread_helper() static

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Make __declare_dbe_table static and avoid it getting optimized away
Ralf Baechle [Sun, 18 Feb 2007 15:57:09 +0000 (15:57 +0000)]
[MIPS] Make __declare_dbe_table static and avoid it getting optimized away

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Use MIPS R2 instructions for bitops.
Ralf Baechle [Fri, 16 Feb 2007 17:18:50 +0000 (17:18 +0000)]
[MIPS] Use MIPS R2 instructions for bitops.

Add R2 optimized variants of clear_bit, set_bit and test_and_clear_bit.
With gcc 4.1.1 this saves 1592 bytes on a defconfig (minus IPv6) kernel.
Turns out that R2 bitop instructions are no gain for the other bitop
functions.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] signals: Share even more code.
Ralf Baechle [Thu, 15 Feb 2007 11:40:37 +0000 (11:40 +0000)]
[MIPS] signals: Share even more code.

native and compat do_signal and handle_signal are identical and can easily
be unified.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Fix CONFIG_MIPS32_N32=y CONFIG_MIPS32_O32=n build
Ralf Baechle [Thu, 15 Feb 2007 01:53:00 +0000 (01:53 +0000)]
[MIPS] Fix CONFIG_MIPS32_N32=y CONFIG_MIPS32_O32=n build

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Iomap implementation.
Ralf Baechle [Thu, 7 Dec 2006 14:35:43 +0000 (15:35 +0100)]
[MIPS] Iomap implementation.

This implementation has support for the concept of one separate ioport
address space by PCI domain.  A pointer to the virtual address where
the port space of a domain has been mapped has been added to struct
pci_controller and systems should be fixed to fill in this value. For
single domain systems this will be the same value as passed to
set_io_port_base().

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] <asm/compat-signal.h> needs to include <asm/uaccess.h>.
Ralf Baechle [Wed, 14 Feb 2007 10:40:05 +0000 (10:40 +0000)]
[MIPS] <asm/compat-signal.h> needs to include <asm/uaccess.h>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] IP27: Fix warning.
Ralf Baechle [Wed, 14 Feb 2007 10:18:59 +0000 (10:18 +0000)]
[MIPS] IP27: Fix warning.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.
Atsushi Nemoto [Wed, 14 Feb 2007 05:41:01 +0000 (14:41 +0900)]
[MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.

access_ok in compat-signal.h is wrong (checking destination instead of
source) and redundant (already checked before calling this function).

Also sf_mask in struct sigframe32 should be compat_sigset_t type.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
14 years ago[MTD] [NAND] S3C2412 fix hw ecc
Matthieu CASTET [Tue, 13 Feb 2007 11:30:38 +0000 (12:30 +0100)]
[MTD] [NAND] S3C2412 fix hw ecc

S3C2412 use differents registers than s3c2440 for hw ecc handling.

Signed-off-by: Matthieu CASTET <matthieu.castet@parrot.fr>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[MTD] [NAND] Work around false compiler warning in CAFÉ driver
Andrew Morton [Sun, 18 Feb 2007 00:02:11 +0000 (16:02 -0800)]
[MTD] [NAND] Work around false compiler warning in CAFÉ driver

drivers/mtd/nand/cafe.c: In function 'cafe_nand_cmdfunc':
drivers/mtd/nand/cafe.c:269: warning: 'irqs' may be used uninitialized in this function

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[JFFS2] printk warning fixes
Andrew Morton [Sun, 18 Feb 2007 00:02:10 +0000 (16:02 -0800)]
[JFFS2] printk warning fixes

fs/jffs2/wbuf.c: In function 'jffs2_check_oob_empty':
fs/jffs2/wbuf.c:993: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
fs/jffs2/wbuf.c:993: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
fs/jffs2/wbuf.c: In function 'jffs2_check_nand_cleanmarker':
fs/jffs2/wbuf.c:1036: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
fs/jffs2/wbuf.c:1036: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'
fs/jffs2/wbuf.c: In function 'jffs2_write_nand_cleanmarker':
fs/jffs2/wbuf.c:1062: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
fs/jffs2/wbuf.c:1062: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[MTD] [MAPS] ichxrom warning fix
Andrew Morton [Sun, 18 Feb 2007 00:02:09 +0000 (16:02 -0800)]
[MTD] [MAPS] ichxrom warning fix

drivers/mtd/maps/ichxrom.c: In function 'ichxrom_init_one':
drivers/mtd/maps/ichxrom.c:231: warning: format '%08lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t'
drivers/mtd/maps/ichxrom.c:231: warning: format '%08lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t'

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[MTD] [MAPS] amd76xrom warning fix
Andrew Morton [Sun, 18 Feb 2007 00:02:09 +0000 (16:02 -0800)]
[MTD] [MAPS] amd76xrom warning fix

drivers/mtd/maps/amd76xrom.c: In function 'amd76xrom_init_one':
drivers/mtd/maps/amd76xrom.c:209: warning: format '%08lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t'

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[MTD] [MAPS] esb2rom warning fixes
Andrew Morton [Sun, 18 Feb 2007 00:02:08 +0000 (16:02 -0800)]
[MTD] [MAPS] esb2rom warning fixes

drivers/mtd/maps/esb2rom.c: In function 'esb2rom_init_one':
drivers/mtd/maps/esb2rom.c:293: warning: format '%08lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t'

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[MTD] [MAPS] ck804xrom warning fix
Andrew Morton [Sun, 18 Feb 2007 00:02:07 +0000 (16:02 -0800)]
[MTD] [MAPS] ck804xrom warning fix

drivers/mtd/maps/ck804xrom.c: In function 'ck804xrom_init_one':
drivers/mtd/maps/ck804xrom.c:211: warning: format '%08lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t'
drivers/mtd/maps/ck804xrom.c:211: warning: format '%08lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t'

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[MTD] [MAPS] netsc520 warning fix
Andrew Morton [Sun, 18 Feb 2007 00:02:07 +0000 (16:02 -0800)]
[MTD] [MAPS] netsc520 warning fix

drivers/mtd/maps/netsc520.c: In function 'init_netsc520':
drivers/mtd/maps/netsc520.c:97: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t'

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[MTD] [MAPS] sc520cdp warning fix
Andrew Morton [Sun, 18 Feb 2007 00:02:06 +0000 (16:02 -0800)]
[MTD] [MAPS] sc520cdp warning fix

drivers/mtd/maps/sc520cdp.c:241: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t'
drivers/mtd/maps/netsc520.c: In function 'init_netsc520':

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago[MTD] [ONENAND] onenand_base warning fix
Andrew Morton [Sun, 18 Feb 2007 00:02:05 +0000 (16:02 -0800)]
[MTD] [ONENAND] onenand_base warning fix

drivers/mtd/onenand/onenand_base.c: In function 'onenand_bbt_read_oob':
drivers/mtd/onenand/onenand_base.c:1033: warning: format '%i' expects type 'int', but argument 3 has type 'size_t'

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
14 years ago9p: implement optional loose read cache
Eric Van Hensbergen [Sun, 11 Feb 2007 19:21:39 +0000 (13:21 -0600)]
9p: implement optional loose read cache

While cacheing is generally frowned upon in the 9p world, it has its
place -- particularly in situations where the remote file system is
exclusive and/or read-only.  The vacfs views of venti content addressable
store are a real-world instance of such a situation.  To facilitate higher
performance for these workloads (and eventually use the fscache patches),
we have enabled a "loose" cache mode which does not attempt to maintain
any form of consistency on the page-cache or dcache.  This results in over
two orders of magnitude performance improvement for cacheable block reads
in the Bonnie benchmark.  The more aggressive use of the dcache also seems
to improve metadata operational performance.

Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
14 years ago9p: Use kthread_stop instead of sending a SIGKILL.
Eric W. Biederman [Tue, 12 Dec 2006 22:26:07 +0000 (15:26 -0700)]
9p: Use kthread_stop instead of sending a SIGKILL.

Since the kthread api does not bump the reference count on
processes that tracked it is not safe allow user space to
kill the threads, as I still retain a pointer to the task_struct.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Eric Van Hensbergen <ericvh@gmail.com>
14 years agoMerge branch '86xx' into for_paulus
Kumar Gala [Sun, 18 Feb 2007 14:34:33 +0000 (08:34 -0600)]
Merge branch '86xx' into for_paulus

14 years ago[POWERPC] 86xx: Cleaned up platform dts files
Kumar Gala [Sat, 17 Feb 2007 22:09:56 +0000 (16:09 -0600)]
[POWERPC] 86xx: Cleaned up platform dts files

* Removed explicit linux,phandle usage. Use references and labels now
* Removed interrupts property from openpic node
* Removed interrupt-parent property from openpic node that pointed to itself

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Jon Loeliger <jdl@freescale.com>
14 years agoMerge the easy part of the IOP branch
Russell King [Sun, 18 Feb 2007 11:31:14 +0000 (11:31 +0000)]
Merge the easy part of the IOP branch

14 years agoMerge NetSilicon NS93xx tree
Russell King [Sun, 18 Feb 2007 11:27:07 +0000 (11:27 +0000)]
Merge NetSilicon NS93xx tree

Fixed conflicts:

arch/arm/Makefile
arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports
Lennert Buytenhek [Thu, 8 Feb 2007 00:03:17 +0000 (01:03 +0100)]
[ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports

On the n2100, both onboard r8169 ports exhibit PCI parity problems.
Set the ->broken_parity_status flag for both ports so that the r8169
drivers knows it should ignore error interrupts.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4140/1: AACI stability add ac97 timeout and retries
Kevin Hilman [Wed, 7 Feb 2007 04:46:47 +0000 (05:46 +0100)]
[ARM] 4140/1: AACI stability add ac97 timeout and retries

Add timeouts to hardware read/write/probe functions in order
to avoid lockups on buggy/broken hardware.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4139/1: AACI record support
Kevin Hilman [Wed, 7 Feb 2007 04:45:32 +0000 (05:45 +0100)]
[ARM] 4139/1: AACI record support

Add PCM audio capture support for AACI audio on Versatile platform.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years ago[ARM] 4138/1: AACI: multiple channel support for IRQ handling
Kevin Hilman [Wed, 7 Feb 2007 04:41:37 +0000 (05:41 +0100)]
[ARM] 4138/1: AACI: multiple channel support for IRQ handling

Add AACI channel support to interrupt handler.
Also, clear underrun interrupt for correct channel.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
14 years agoInput: remove obsolete setup parameters from input drivers
Dmitry Torokhov [Sun, 18 Feb 2007 06:44:58 +0000 (01:44 -0500)]
Input: remove obsolete setup parameters from input drivers

They have been marked as __obsolete_setup() for several years,
it is time for them to go.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
14 years agoInput: HIL - fix improper call to release_region()
Cyrill V. Gorcunov [Sun, 18 Feb 2007 06:44:02 +0000 (01:44 -0500)]
Input: HIL - fix improper call to release_region()

Do not call release_region() if the code has been compiled
without CONFIG_HP300 support.

Signed-off-by: Cyrill V. Gorcunov <gorcunov@gmail.com>
Acked-by: Helge Deller <deller@gmx.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
14 years agoInput: hid-lgff - treat devices as joysticks unless told otherwise
Dmitry Torokhov [Sun, 18 Feb 2007 06:42:11 +0000 (01:42 -0500)]
Input: hid-lgff - treat devices as joysticks unless told otherwise

By default threat devices as joysticks with constant force-feedback
effect.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
14 years agoInput: HID - add support for Logitech Formula Force EX
Valentin Zagura [Sun, 18 Feb 2007 06:41:27 +0000 (01:41 -0500)]
Input: HID - add support for Logitech Formula Force EX

Signed-off-by: Johann Deneux <johann.deneux@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
14 years agoInput: gpio-keys - switch to common GPIO API
Philipp Zabel [Sun, 18 Feb 2007 06:40:46 +0000 (01:40 -0500)]
Input: gpio-keys - switch to common GPIO API

This adds support for at least SA1100 and S3C24xx CPUs.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
14 years agoInput: do not lock device when showing name, phys and uniq
Dmitry Torokhov [Sun, 18 Feb 2007 06:40:37 +0000 (01:40 -0500)]
Input: do not lock device when showing name, phys and uniq

Now that sysfs attributes return -ENODEV once driver requests their
removal we do not need to handle scenario when data is deleted from
under our feet and can simplify the code.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
14 years agoInput: i8042 - let serio bus suspend ports
Dmitry Torokhov [Sun, 18 Feb 2007 06:40:30 +0000 (01:40 -0500)]
Input: i8042 - let serio bus suspend ports

Let serio subsystem take care of suspending the ports; concentrate
on suspending/resuming the controller itself.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
14 years agoInput: psmouse - properly reset mouse on shutdown/suspend
Dmitry Torokhov [Sun, 18 Feb 2007 06:40:24 +0000 (01:40 -0500)]
Input: psmouse - properly reset mouse on shutdown/suspend

Some people report that they need psmouse module unloaded
for suspend to ram/disk to work properly. Let's make port
cleanup behave the same way as driver unload.

This fixes "bad state" roblem on various HP laptops, such
as nx7400.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
14 years ago[PATCH] AUDIT_FD_PAIR
Al Viro [Wed, 7 Feb 2007 06:48:00 +0000 (01:48 -0500)]
[PATCH] AUDIT_FD_PAIR

Provide an audit record of the descriptor pair returned by pipe() and
socketpair().  Rewritten from the original posted to linux-audit by
John D. Ramsdell <ramsdell@mitre.org>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
14 years ago[PATCH] audit config lockdown
Steve Grubb [Fri, 19 Jan 2007 19:39:55 +0000 (14:39 -0500)]
[PATCH] audit config lockdown

The following patch adds a new mode to the audit system. It uses the
audit_enabled config option to introduce the idea of audit enabled, but
configuration is immutable. Any attempt to change the configuration
while in this mode is audited. To change the audit rules, you'd need to
reboot the machine.

To use this option, you'd need a modified version of auditctl and use "-e 2".
This is intended to go at the end of the audit.rules file for people that
want an immutable configuration.

This patch also adds "res=" to a number of configuration commands that did not
have it before.

Signed-off-by: Steve Grubb <sgrubb@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
14 years ago[PATCH] minor update to rule add/delete messages (ver 2)
Steve Grubb [Thu, 14 Dec 2006 16:48:47 +0000 (11:48 -0500)]
[PATCH] minor update to rule add/delete messages (ver 2)

I was looking at parsing some of these messages and found that I wanted what
it was doing next to an op= for the parser to key on. Also missing was the list
number and results.

Signed-off-by: Steve Grubb <sgrubb@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
14 years agoMerge branch '85xx' into for_paulus
Kumar Gala [Sat, 17 Feb 2007 22:32:46 +0000 (16:32 -0600)]
Merge branch '85xx' into for_paulus

14 years agoMerge branch '83xx' into for_paulus
Kumar Gala [Sat, 17 Feb 2007 22:32:41 +0000 (16:32 -0600)]
Merge branch '83xx' into for_paulus

14 years ago[POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards
Kumar Gala [Sat, 17 Feb 2007 22:29:36 +0000 (16:29 -0600)]
[POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards

Renamed the MPC8568 MDS platform code to follow other 85xx boards.  There
isn't anything specific about the 8568 MDS code that wouldn't apply to another
85xx MDS system at this point.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago[POWERPC] 85xx: Cleaning up machine probing
Kumar Gala [Sat, 17 Feb 2007 22:19:34 +0000 (16:19 -0600)]
[POWERPC] 85xx: Cleaning up machine probing

Cleaned up the probing functionality to be more consistent across all 85xx
boards and actually check to see if we should be running on a given board.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago[POWERPC] QE: clean up ucc_slow.c and ucc_fast.c
Timur Tabi [Sat, 17 Feb 2007 04:31:21 +0000 (22:31 -0600)]
[POWERPC] QE: clean up ucc_slow.c and ucc_fast.c

Refactored and cleaned up ucc_fast.c and ucc_slow.c so that the two files
look more alike and are easier to read.  Removed uccf_printk() and related
functions, because they were just front-ends to printk().  Fixed some
spacing and tabbing issues.  Minor optimizations of some code.  Changed
the type of some variables to their proper type (mostly buffer
descriptors).

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoMerge branch 'master' into 86xx
Kumar Gala [Sat, 17 Feb 2007 22:07:01 +0000 (16:07 -0600)]
Merge branch 'master' into 86xx

14 years ago[POWERPC] 85xx: Cleaned up platform dts files
Kumar Gala [Sat, 17 Feb 2007 22:04:23 +0000 (16:04 -0600)]
[POWERPC] 85xx: Cleaned up platform dts files

* Fixed up top level compatible property for all boards
* Removed explicit linux,phandle usage. Use references and labels now
* Fixed phy-phandles for TSEC3/4 in mpc8548cds.dts

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agosk98lin: mark deprecated in Kconfig
Daniel Drake [Sat, 10 Feb 2007 03:48:17 +0000 (03:48 +0000)]
sk98lin: mark deprecated in Kconfig

sk98lin is scheduled for removal in July 2007. This patch makes the
deprecation more obvious in the configuration interface. FWIW, Gentoo have
been shipping a patch very similar to this for a long time.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years ago[WATCHDOG] machzwd warning fix
Andrew Morton [Sat, 17 Feb 2007 11:13:07 +0000 (03:13 -0800)]
[WATCHDOG] machzwd warning fix
From: Andrew Morton <akpm@linux-foundation.org>

drivers/char/watchdog/machzwd.c: In function 'zf_ioctl':
drivers/char/watchdog/machzwd.c:327: warning: passing argument 1 of 'zf_ping' makes integer from pointer without a cast

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
14 years agoRemove JFFS (version 1), as scheduled.
Jeff Garzik [Sat, 17 Feb 2007 21:10:59 +0000 (16:10 -0500)]
Remove JFFS (version 1), as scheduled.

Unmaintained for years, few if any users.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoHostess SV-11 depends on INET
Baruch Even [Sat, 17 Feb 2007 14:37:52 +0000 (16:37 +0200)]
Hostess SV-11 depends on INET

Comtrol Hostess SV-11 driver uses features from INET but doesn't depend on it.
The simple solution is to make it depend on INET as happens for the sealevel
driver.

Fixes bug #7930.

Signed-Off-By: Baruch Even <baruch@ev-en.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoFix link autonegotiation timer.
Ralf Baechle [Sat, 17 Feb 2007 02:51:15 +0000 (02:51 +0000)]
Fix link autonegotiation timer.

Start link negotiation in the open method.  Previously it was started
on driver initialialization and shutdown on close so an ifdown would
have results in closing negotiation for good.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agosk98lin: planned removal
Stephen Hemminger [Fri, 16 Feb 2007 23:07:53 +0000 (15:07 -0800)]
sk98lin: planned removal

Nag message about planned sk98lin removal.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoB44: increase wait loop
Gary Zambrano [Fri, 16 Feb 2007 21:27:27 +0000 (13:27 -0800)]
B44: increase wait loop

The b44 Enet control disable bit may take longer to clear on some
systems, so the loop count is increased with this patch. Functionality
is not compromised, but a debug message can be seen when the bit is not
cleared within the count value.
Thanks to Vasileios Lourdas who reported the problem.

Signed-off by: Gary Zambrano <zambrano@broadcom.com>

Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agob44: replace define
Gary Zambrano [Fri, 16 Feb 2007 21:27:23 +0000 (13:27 -0800)]
b44: replace define

Replaced B44_DMA_MASK with DMA_30BIT_MASK.

Signed-off by: Gary Zambrano <zambrano@broadcom.com>

Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoe1000: allow ethtool to see link status when down
Kok, Auke [Fri, 16 Feb 2007 22:39:30 +0000 (14:39 -0800)]
e1000: allow ethtool to see link status when down

By reading the MAC status register we can detect whether the MAC has
seen the PHY see link. This allows us to show the link properties before
the device is up in ethtool.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoe1000: remove obsolete custom pci_save_state code
Kok, Auke [Fri, 16 Feb 2007 22:39:28 +0000 (14:39 -0800)]
e1000: remove obsolete custom pci_save_state code

Now that 2.6.19 provides a proper implementation that saves MSI, PCI-E
config space, we can have the e1000 driver use those instead of it's
custom implementation.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoe1000: fix shared interrupt warning message
Kok, Auke [Fri, 16 Feb 2007 22:39:26 +0000 (14:39 -0800)]
e1000: fix shared interrupt warning message

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoatm: Use ARRAY_SIZE macro when appropriate
Ahmed S. Darwish [Fri, 16 Feb 2007 09:42:23 +0000 (01:42 -0800)]
atm: Use ARRAY_SIZE macro when appropriate

Use ARRAY_SIZE macro already defined in kernel.h for ATM
drivers.

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: chas williams <chas@cmf.nrl.navy.mil>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agobugfixes and new hardware support for arcnet driver
Jeff Morrow [Fri, 16 Feb 2007 09:42:27 +0000 (01:42 -0800)]
bugfixes and new hardware support for arcnet driver

The modifications and bug fixes noted below were done by Realtime Control
Works and Contemporary Control Systems, Inc, Jan 2005.  They were
incorporated into the 2.6 kernel by Jeff Morrow of Sierra Analytics, Feb
2007.  <jmorrow@massspec.com>

The changes have been tested on a Contemporary Controls PCI20U-4000.

Summary of changes:

Arc-rawmode.c:
      rx():
      - Fixed error in received packet lengths; 256 byte packets were
        being received as 257 bytes packets.

      prepare_tx():
      - Fixed error in transmit length calcs; 257 byte packets were being
        transmitted as 260 byte packets.

com20020.c:
      com20020_check():
      - We now load the SETUP2 register if the 'clockm' parameter is
        non-zero, instead of checking for ARC_CAN_10MBIT. The user is
        now responsible for whether or not SETUP2 is loaded.  If the
        clock multiplier is non-zero, this means that the user wants a
        baud rate greater than 2.5Mbps. This is not possible unless the
        SETUP2 register is present (COM20020D, or COM20022). So, we're
        relying on the user to be smart about what kind of chip he's
        dealing with...

com20020-pci.c
      - Added several entries to com20020pci_id_table[].

Signed-off-by: Jeff Morrow <jmorrow@massspec.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agopcnet32 NAPI no longer experimental
pcnet32@verizon.net [Fri, 16 Feb 2007 16:09:57 +0000 (10:09 -0600)]
pcnet32 NAPI no longer experimental

Remove the experimental tag for the pcnet32 NAPI implementation.

Signed-off-by: Don Fry <pcnet32@verizon.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoMAINTAINER
pcnet32@verizon.net [Fri, 16 Feb 2007 16:07:12 +0000 (10:07 -0600)]
MAINTAINER

After being the defacto maintainer for a couple of years, I can now become the official maintainer.

Signed-off-by: Don Fry <pcnet32@verizon.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agomacb: Remove inappropriate spinlocks around mii calls
Haavard Skinnemoen [Fri, 16 Feb 2007 14:59:06 +0000 (15:59 +0100)]
macb: Remove inappropriate spinlocks around mii calls

Remove spin_lock_irqsave() around mii_ethtool_gset, mii_ethtool_sset
and generic_mii_ioctl. These are unnecessary and harmful because
the mii calls may call back into the mdio functions, which may sleep.

Pointed out by David Brownell.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agoConvert meth to netdev_priv
Ralf Baechle [Fri, 16 Feb 2007 12:52:17 +0000 (12:52 +0000)]
Convert meth to netdev_priv

And while at it loose plenty of useless casts.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agosky2: v1.13
Stephen Hemminger [Fri, 16 Feb 2007 00:40:35 +0000 (16:40 -0800)]
sky2: v1.13

New version.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
14 years agosky2: receive error handling improvements
Stephen Hemminger [Fri, 16 Feb 2007 00:40:34 +0000 (16:40 -0800)]
sky2: receive error handling improvements

Don't drop oversize frame it might be a VLAN (untagged).
Use different counter for fifo overrun vs fifo error.
Print error on fifo overrrun.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>