summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2005-11-04[ARM] 3086/1: ixp2xxx error irq handlingDave Jiang2-1/+80
Patch from Dave Jiang This provides support for IXP2xxx error interrupt handling. Previously there was a patch to remove this (although the original stuff was broken). Well, now the error bits are needed again. These are used extensively by the micro-engine drivers according to Deepak and also we will need it for the new EDAC code that Alan Cox is trying to push into the main kernel. Re-submit of 3072/1, generated against git tree pulled today. AFAICT, this git tree pulled in all the ARM changes that's in arm.diff. Please let me know if there are additional changes. Thx! Signed-off-by: Dave Jiang <djiang@mvista.com> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-04[ARM] 3094/1: remove PLD stuff from old uaccess codeNicolas Pitre1-116/+16
Patch from Nicolas Pitre ARM processors that have pld instructions are not using those copy_user implementation anymore. Let's remove the useless PLD lines which were half wrong anyway. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03[ARM] Fix IXDP2x01 config filesDeepak Saxena2-3/+3
IXDP2401 config file has wrong baudrate and both boards have 3 UARTs. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03[ARM] Merge SMP treeRussell King4-2/+16
2005-11-03[ARM] 3092/1: remove excessive print format paddingNicolas Pitre1-4/+4
Patch from Nicolas Pitre Using a llx format to print addresses that might possibly be (only) 36 bits wide make sense. However making it a zero padded 16 char wide field is a bit excessive and useless. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03[ARM SMP] Do not clear cpu_vm_mask for VIPT cachesRussell King1-1/+2
Since we do not invalidate TLBs/caches on MM switches, we should not clear the cpu_vm_mask for the CPU. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03[ARM SMP] Add configuration option for ARMv6K processorsRussell King3-1/+14
The 'K' extension adds several new instructions to the ARMv6 ISA which are primerily useful for SMP. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03[ARM] Fix another build error with IOP3xx platformsRussell King1-1/+1
ld doesn't like comments starting with // in its scripts Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03[ARM] Add Realview default configuration fileRussell King1-0/+789
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-03[ARM] Fix more 3016/1 breakageRussell King2-10/+10
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[PATCH] x86-64: bitops fix for -OsAlexandre Oliva1-16/+50
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-02Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds13-57/+250
2005-11-02Merge branch 'swiotlb' of ↵Linus Torvalds7-52/+139
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2005-11-02[ARM SMP] Add hotplug CPU infrastructureRussell King6-0/+143
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 King1-2/+2
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 King2-7/+14
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 Torvalds13-116/+70
2005-11-02[ARM] Fix ARM rwlock implementationsRussell King1-3/+3
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 King1-2/+2
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-02[ARM] Fix Realview machine for patch 3016/1Russell King1-7/+37
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 King1-1/+8
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 Bowler1-34/+40
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 King1-1/+1
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 Heo1-1/+6
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 Leon1-1/+1
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 Viro3-4/+8
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 Torvalds93-19144/+19273
Manual fixups for some clashes due to re-indenting.
2005-11-01[PATCH] tlclk build fixAndrew Morton1-0/+1
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_SYSCTLHorms1-1/+1
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 Wright2-0/+2
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 Ungerer1-0/+13
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 Ungerer1-0/+4
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 Ungerer1-0/+15
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 Ungerer1-2/+6
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 Ungerer1-9/+9
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 Ungerer1-0/+14
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 Ungerer1-0/+54
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 Ungerer1-2/+8
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 Ungerer1-2/+2
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 Ungerer1-2/+1
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 Ungerer1-437/+0
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 Ungerer1-49/+0
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 Ungerer8-20/+20
"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 Torvalds13-219/+415
2005-11-01Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds3-13/+64
2005-11-01Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds53-491/+3573
2005-11-01Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds5-3/+8
2005-11-01Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds27-722/+2442
2005-11-01[PATCH] toshiba_ohci1394_dmi_table should be __devinitdata, not __devinitRoland Dreier1-1/+1
I don't really understand why gcc gives the error it does, but without this patch, when building with CONFIG_HOTPLUG=n, I get errors like: CC arch/x86_64/pci/../../i386/pci/fixup.o arch/x86_64/pci/../../i386/pci/fixup.c: In function `pci_fixup_i450nx': arch/x86_64/pci/../../i386/pci/fixup.c:13: error: pci_fixup_i450nx causes a section type conflict The change is obviously correct: an array should be declared __devinitdata rather that __devinit. Signed-off-by: Roland Dreier <rolandd@cisco.com> Acked-by: Martin J. Bligh <mbligh@mbligh.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[ARM] 3081/1: Remove GTWX5715 from ixp4xx_defconfigDeepak Saxena1-1/+1
Patch from Deepak Saxena CONFIG_MACH_GTWX5715 hardcodes the machine type in head-xscale.S so we can no longer boot on any other machine types. The proper fix would be to remove the hardcoding, but that machine is an off-the-shelf system and most users won't have access to the bootloader. :( Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>