aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-11-05[MMC] Use controller id instead of driver name for printksPierre Ossman
The printks that aren't for debugging should use the name of the controller, not the driver name. Multiple MMC controllers aren't that common today, but this is the right way to do things. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-05[MMC] Fix chip config in wbsdPierre Ossman
There is a broken if clause in the wbsd driver that can cause the driver to try and configure the chip even though none is found. This results in i/o on invalid ports. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-04[MMC] Response to write commands is R1 nor R1bRussell King
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds
2005-11-04[XFS] Remove no-longer-used qsort source.Nathan Scott
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-04[XFS] Fix an inode32 regression - if no options are presented, must stillNathan Scott
set default flags. SGI-PV: 945242 SGI-Modid: xfs-linux-melb:xfs-kern:24292a Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-03[XFS] Remove several no-longer-used files.Nathan Scott
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-03[XFS] Cleanup cosmetic differences between source trees.Nathan Scott
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02[PATCH] x86-64: bitops fix for -OsAlexandre Oliva
This fixes the x86-64 find_[first|next]_zero_bit() function for the end-of-range case. It didn't test for a zero size, and the "rep scas" would do entirely the wrong thing. Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-03[XFS] fix XFS quota for modular XFS buildsNathan Scott
Cannot build XFS filesystem support as module with quota support. It works only when the XFS filesystem support is compiled into the kernel. Menuconfig prevents from setting CONFIG_XFS_FS=m and CONFIG_XFS_QUOTA=y. How to reproduce: configure the XFS filesystem with quota support as module. The resulting kernel won't have quota support compiled into xfs.ko. Fix: Changing the fs/xfs/Kconfig file from tristate to bool lets you configure the quota support to be compiled into the XFS module. The Makefile-linux-2.6 checks only for CONFIG_XFS_QUOTA=y. Signed-off-by: Dimitri Puzin <tristan-777@ddkom-online.de> Signed-off-by: Adrian Bunk <bunk@stusta.de> signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-03[XFS] Add a mechanism for XFS to use the generic quota sync method.Nathan Scott
This is now used to issue a delayed allocation flush before reporting quota, which allows the used space quota report to match reality. Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-03[XFS] Add the project quota type into the XFS quota header.Nathan Scott
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-03[XFS] Update XFS quota header license to match the SGI boilerplate.Nathan Scott
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-03[XFS] Update XFS documentation.Nathan Scott
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
2005-11-02Merge branch 'swiotlb' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2005-11-03[XFS] Fixed the inconsistency between attribute b-tree intermidiate nodeYingping Lu
and leaf blocks. The problem cam from xfsqa test 117. SGI-PV: 940655 SGI-Modid: xfs-linux:xfs-kern:201527a Signed-off-by: Yingping Lu <yingping@sgi.com> Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02[ARM SMP] Add hotplug CPU infrastructureRussell King
This patch adds the infrastructure to support hotplug CPU on ARM platforms. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM SMP] Fix a couple of warningsRussell King
Use *cpus_addr() to display the mask of pending/to be called CPUs. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM SMP] Track CPU idle threadsRussell King
Track the idle thread task_struct for each CPU. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02Merge git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds
2005-11-02[ARM] Fix ARM rwlock implementationsRussell King
fb1c8f93d869b34cacb8b8932e2b83d96a19d720 broke the ARM rwlock code since it only partially updated the rwlock implementation. Properly update it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM] AMBA CLCD driver can drive PL110 and PL111 primecellsRussell King
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM] Fix Realview machine for patch 3016/1Russell King
3016/1 changed the map_desc structure to take a PFN instead of a physical address. Fixup Realview machine support for this change. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM] Fix mm initialisation with write buffered write allocate cachesRussell King
It seems that without the extra tlb flush, we may end up faulting during the early kernel initialisation because the TLB can't see the updated page tables. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM] 3083/1: include/asm-arm/arch-ixp4xx/io.h: eliminate warnings for ↵John Bowler
pointer passed to integral function argument Patch from John Bowler Fix for a compiler warning, this wasn't apparent in 2.6.12, I believe the compiler options have been changed (somewhere) so that passing a (void*) to a (u32) argument is now warned. This accounts for the majority of the warnings in my builds of the 2.6.14 kernel for NSLU2. The patch changes pointer parameters declared as u32 to be declared as either, for read parameters: const volatile void __iomem * and for write parameters: volatile void __iomem * Signed-off-by: John Bowler <jbowler@acm.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM] Fix realview machine type for patch 3060/1Russell King
Realview was missed in this cleanup... Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-01[PATCH] blk: fix dangling pointer access in __elv_add_requestTejun Heo
cfq's add_req_fn callback may invoke q->request_fn directly and depending on low-level driver used and timing, a queued request may be finished & deallocated before add_req_fn callback returns. So, __elv_add_request must not access rq after it's passed to add_req_fn callback. This patch moves rq_mergeable test above add_req_fn(). This may result in q->last_merge pointing to REQ_NOMERGE request if add_req_fn callback sets it but as RQ_NOMERGE is checked again when blk layer actually tries to merge requests, this does not cause any problem. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] ibmveth fix panic in initial replenish cycleSantiago Leon
This patch fixes a panic in the current tree caused by a race condition between the initial replenish cycle and the rx processing of the first packets trying to replenish the buffers. Signed-off-by: Santiago Leon <santil@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] missing platform_device.h includesAl Viro
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6Linus Torvalds
Manual fixups for some clashes due to re-indenting.
2005-11-01[PATCH] tlclk build fixAndrew Morton
drivers/char/tlclk.c: In function `tlclk_init': drivers/char/tlclk.c:775: warning: implicit declaration of function `platform_device_register_simple' Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] audit_sysctl_exit can only be used with CONF_AUDIT_SYSCTLHorms
This section of code calls .audit_syscal_exit, but is inside CONFIG_AUDIT, so it will fail to build if CONFIG_AUDITSYSCALL is not defined. After discussion with David Woodhouse, change the ifdef to CONFIG_AUDITSYSCALL Signed-off-by: Horms <horms@verge.net.au> Acked-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] TPM compile fixChris Wright
CC drivers/char/tpm/tpm_nsc.o drivers/char/tpm/tpm_nsc.c:277: error: `platform_bus_type' undeclared here (not in a function) ... CC drivers/char/tpm/tpm_atmel.o drivers/char/tpm/tpm_atmel.c:175: error: `platform_bus_type' undeclared here (not in a function) Make sure to include proper headers. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: add 5208 ColdFire reset/reboot supportGreg Ungerer
Add reset/reboot code to support the ColdFire 5208 family. Patch originally from Matt Wadell (from code originally written by Mike Lavender). Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: add 5208 ColdFire UART supportGreg Ungerer
Add support for the UARTs on the ColdFire 5208 family. Patch originally from Matt Wadell (from code originally written by Mike Lavender). Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: add 5208 ColdFire pit interrupt supportGreg Ungerer
The PIT timer in the 5208 ColdFire has slightly different interrupt bit definitions than the PIT timer used on other ColdFire parts. Define the commonly used bit and mask numbers here, and let part specific defines take precedence if they are defined. Patch originally from Matt Wadell (from code originally written by Mike Lavender). Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: add 5208 ColdFire pit timer supportGreg Ungerer
Add support for the PIT timer used in the 5208 ColdFire fmaily. Patch originally from Matt Wadell (from code originally modified by Mike Lavender). Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: use board defines to distinguish boardsGreg Ungerer
Use board name defines to distinguish boards, instead of combinations of more generic defines. Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: add 5208 ColdFire cache supportGreg Ungerer
Add support for the cpu cache of the 5208 ColdFire fmaily. Patch originally from Matt Wadell (from code originally written by Mike Lavender). Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: add 5208 ColdFire support definesGreg Ungerer
Add support for the internal register map of the 5208 ColdFire fmaily. Patch originally from Matt Wadell (from code originally written by Mike Lavender). Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: add 5208 ColdFire support defines for its internal mapGreg Ungerer
Define the register space of the new 5208 ColdFire family (which includes to 5207). It is mostly similar to the other ColdFire parts. Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: use board name defines to differentiate board definitionsGreg Ungerer
Use board name define to differentiate boards, not combination of more generic defines. Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: updated defconfigGreg Ungerer
Updated m68knommu defconfig. Part of changing the "Motorola" names to their new name "Freescale". Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: remove unmaintained asm-m68knommu/ide.hGreg Ungerer
Remove unmaintained asm-m68knommu/ide.h. It is completely out of date - and there is no underlying support for it. Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: remove auto-generated asm-offsets.hGreg Ungerer
Remove auto-generated file from source base. Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] m68knommu: change use of extern inline to static inline in headersGreg Ungerer
"extern inline" doesn't make much sense here. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6Linus Torvalds
2005-11-01Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds
2005-11-01Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds