aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [ARM] 2918/1: [update] Base port of Comdial MP1000 platfromJon Ringle2005-10-28
| | | | | | | | | | | | | Patch from Jon Ringle Updated 2898/1 per comments: - Removed fixup - Moved code in mach-mp1000/ to mach-clps711x/ - Cleaned up code in mp1000-seprom.c. Eliminated code that displayed the contents of the eeprom Please comment. Signed-off-by: Jon Ringle Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3048/1: register i2s resources not i2c resources for the pxa i2s ↵Ian Campbell2005-10-28
| | | | | | | | | | | platform device Patch from Ian Campbell As noted by Uli Luckas in the comments of 3025 there is a typo in the i2s platform device. The i2s platform device refers to the i2c resources. Signed-off-by: Ian Campbell <icampbell@arcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3047/1: SMDK2440 - add framebuffer platform dataBen Dooks2005-10-28
| | | | | | | | | | Patch from Ben Dooks Add platform data for framebuffer for the onboard LCD module Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3046/1: BAST - add framebuffer platform dataBen Dooks2005-10-28
| | | | | | | | | Patch from Ben Dooks Add framebuffer platform data Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3045/2: S3C2410 - change init for lcd platform dataBen Dooks2005-10-28
| | | | | | | | | | | Patch from Ben Dooks Change set_s3c2410fb_info to s3c2410_fb_set_platdata and use kmalloc() for the copy of the information it is passed. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2908/1: add register definitions for ixp2000 msfLennert Buytenhek2005-10-28
| | | | | | | | | | | Patch from Lennert Buytenhek We already had a mapping for the msf, but we didn't have any register definitions for it yet. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3044/1: Fix sparse warnings about incompatible pointer types for ↵Ian Campbell2005-10-28
| | | | | | | | | | | | | | | | | | | | | | | | register defined in pxa-regs.h Patch from Ian Campbell The sparse warning initially surfaced in sound/arm/pxa2xx-ac97.c because it was using u32 * variables to hold the unsigned long * register addresses. I submitted an ALSA patch for this http://thread.gmane.org/gmane.linux.alsa.devel/27804 issue and it was suggested that it might be preferable to change the register definitions to use u32. Most other subarches seem to use u32 for their register type, at least the ones which use a __REG macro (like the PXA) do. Nico indicated in the thread above that he wouldn't mind this patch. Changing the type required fixes for opposite warnings in the pxa2xx usb gadget code but that was the only new warning introduced on defconfig or lubbock, mainstone and our own PXA255 boards. Signed-off-by: Ian Campbell <icampbell@arcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3034/1: S3C2410 - fix size of devices in devs.cBen Dooks2005-10-28
| | | | | | | | | | | | | | Patch from Ben Dooks From: Guillaume GOURAT <guillaume.gourat@nexvision.fr> A number of devices have an extra byte on the end of their areas due to mis-calculating the .end field of their resources Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3033/1: S3C2410 - add generic gpio_cfgpin optionsBen Dooks2005-10-28
| | | | | | | | | | | | | | | | Patch from Ben Dooks Add generic values for the parameters to the s3c2410_gpio_cfgpin() function, so that a caller does not need to know the exact constant for the specified pin. This is very useful for the case where a driver is passed a gpio pin number and needs to reconfigure the pin's function. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2930/1: optimized sha1 implementation for ARMNicolas Pitre2005-10-28
| | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre Here's an ARM assembly SHA1 implementation to replace the default C version. It is approximately 50% faster than the generic C version. On an XScale processor running at 400MHz: generic C version: 9.8 MB/s my version: 14.5 MB/s This code is useful to quite a few callers in the tree: crypto/sha1.c: sha_transform(sctx->state, sctx->buffer, temp); crypto/sha1.c: sha_transform(sctx->state, &data[i], temp); drivers/char/random.c: sha_transform(buf, (__u8 *)r->pool+i, buf + 5); drivers/char/random.c: sha_transform(buf, (__u8 *)data, buf + 5); net/ipv4/syncookies.c: sha_transform(tmp + 16, (__u8 *)tmp, tmp + 16 + 5); Signed-off-by: Nicolas Pitre <nico@cam.org> Seems to work fine on big-endian as well. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3017/1: Add support for 36-bit addresses to create_mapping()Deepak Saxena2005-10-28
| | | | | | | | | | | | | | | | | | | | | Patch from Deepak Saxena This patch adds support for 36-bit static mapped I/O. While there are no platforms in the tree ATM that use it, it has been tested tested on the IXP2350 NPU and I would like to get the support for that chipset upstream one piece at a time. There are also other Intel chipset ports in development that are waiting on this to go upstream. The patch replaces the print formats for physical addresses with %016llx which will create a bit extraneous output on 32-bit systems, but I think that is cleaner than having #ifdefs, specially since users will only see the output in error cases. Depends on 3016/1. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3016/1: Replace map_desc.physical with map_desc.pfnDeepak Saxena2005-10-28
| | | | | | | | | | | Patch from Deepak Saxena Convert map_desc.physical to map_desc.pfn. This allows us to add support for 36-bit addressed physical devices in the static maps without having to resort to u64 variables. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3001/1: Replace map_desc.physical with map_desc.pfn: IntegratorDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena Integrator map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3000/1: Replace map_desc.physical with map_desc.pfn: iMXDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena iMX map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2999/1: Replace map_desc.physical with map_desc.pfn: H720xDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena H720x map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2998/1: Replace map_desc.physical with map_desc.pfn: FootbridgeDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena Footbridge map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2997/1: Replace map_desc.physical with map_desc.pfn: EBSA110Deepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena EBSA110 map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2996/1: Replace map_desc.physical with map_desc.pfn: EPXA10DBDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena EPXA10DB mapd_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2995/1: Replace map_desc.physical with map_desc.pfn: VersatileDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena Versatile map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2994/1: Replace map_desc.physical with map_desc.pfn: CLPS7500Deepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena CLSP7500 map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2993/1: Replace map_desc.physical with map_desc.pfn: CLPS711xDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena CLSP711x map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2992/1: Replace map_desc.physical with map_desc.pfn: SA1100Deepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena SA1100 map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2991/1: Replace map_desc.physical with map_desc.pfn: SharkDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena Shark map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2990/1: Replace map_desc.physical with map_desc.pfn: S3C2410Deepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena S3C2410 map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2989/1: Replace map_desc.physical with map_desc.pfn: RiscPCDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena RiscPC map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2988/1: Replace map_desc.physical with map_desc.pfn: PXADeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena PXA map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2987/1: Replace map_desc.physical with map_desc.pfn: OMAPDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena OMAP map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2986/1: Replace map_desc.physical with map_desc.pfn: LH7A40xDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena LH7A40x map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2985/1: Replace map_desc.physical with map_desc.pfn: IXP4xxDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena IXP4xx map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2984/1: Replace map_desc.physical with map_desc.pfn: IXP2000Deepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena IXP2000 map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2983/1: Replace map_desc.physical with map_desc.pfn: IOP3xxDeepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena IOP3xx map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2982/1: Replace map_desc.physical with map_desc.pfn: aaec2000Deepak Saxena2005-10-28
| | | | | | | | | Patch from Deepak Saxena aaec2000 map_desc.pfn conversion Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 4/4 Combine oprofile common and init codeRussell King2005-10-28
| | | | | | | There is nothing special about having the init code separate from the common code, so combine the two. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3/4 Rename common oprofile codeRussell King2005-10-28
| | | | | | | | | | The common oprofile code assumes the name "PMU" (from Intel's performance management unit). This is misleading when we start adding oprofile support for other machine types which don't use the same terminology. Call it op_arm_* instead of pmu_*. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2/4 Fix oprofile suspend/resumeRussell King2005-10-28
| | | | | | | | The oprofile suspend/resume was missing locking. If we failed to start oprofile on resume, we still reported that it was enabled. Instead, disable oprofile on error. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 1/4 Move oprofile driver model codeRussell King2005-10-28
| | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] Re-jig bootmem initialisationRussell King2005-10-28
| | | | | | | | Make ARM independent of the way bootmem operates internally. We now map each node as we initialise it, and place the bootmem bitmap inside each node, rather than all in the first node. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] Fix sparse warningsRussell King2005-10-28
| | | | | | | | Fix sparse warnings in arch/arm/kernel/module.c, arch/arm/mm/consistent.c, drivers/pcmcia/sa1111_generic.c, and platform support files. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3/4: Remove asm/hardware.h from SA1100 io.hRussell King2005-10-28
| | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3/4: Remove asm/hardware.h from Versatile and Integrator io.hRussell King2005-10-28
| | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 2/4: Remove asm/hardware.h from asm-arm/arch-ebsa110/io.hRussell King2005-10-28
| | | | | | | EBSA110 only requires hardware.h to be included for a couple of files. Move the include there. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 1/4: Move include of asm/hardware.h to asm-arm/arch-*/io.hRussell King2005-10-28
| | | | | | | Including asm/hardware.h into asm/io.h can cause #define clashes between platform specific definitions and driver local definitions. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Linux v2.6.14v2.6.14Linus Torvalds2005-10-27
| | | | "Better late than never"
* Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6Linus Torvalds2005-10-27
|\
| * [TCP]: Clear stale pred_flags when snd_wnd changesHerbert Xu2005-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is responsible for causing the infamous "Treason uncloaked" messages that's been popping up everywhere since the printk was added. It has usually been blamed on foreign operating systems. However, some of those reports implicate Linux as both systems are running Linux or the TCP connection is going across the loopback interface. In fact, there really is a bug in the Linux TCP header prediction code that's been there since at least 2.1.8. This bug was tracked down with help from Dale Blount. The effect of this bug ranges from harmless "Treason uncloaked" messages to hung/aborted TCP connections. The details of the bug and fix is as follows. When snd_wnd is updated, we only update pred_flags if tcp_fast_path_check succeeds. When it fails (for example, when our rcvbuf is used up), we will leave pred_flags with an out-of-date snd_wnd value. When the out-of-date pred_flags happens to match the next incoming packet we will again hit the fast path and use the current snd_wnd which will be wrong. In the case of the treason messages, it just happens that the snd_wnd cached in pred_flags is zero while tp->snd_wnd is non-zero. Therefore when a zero-window packet comes in we incorrectly conclude that the window is non-zero. In fact if the peer continues to send us zero-window pure ACKs we will continue making the same mistake. It's only when the peer transmits a zero-window packet with data attached that we get a chance to snap out of it. This is what triggers the treason message at the next retransmit timeout. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
* | [PATCH] cpufreq: SMP fix for conservative governorDave Jones2005-10-27
| | | | | | | | | | | | | | | | | | | | | | | | Don't try to access not-present CPUs. Conservative governor will always oops on SMP without this fix. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=4781 Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Revert "x86-64: Avoid unnecessary double bouncing for swiotlb"Linus Torvalds2005-10-27
| | | | | | | | | | | | | | | | | | Commit id 6142891a0c0209c91aa4a98f725de0d6e2ed4918 Andi Kleen reports that it seems to break things for some people, and since it's purely a small optimization, revert it for now. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Yet more posix-cpu-timer fixesRoland McGrath2005-10-27
| | | | | | | | | | | | | | | | | | | | This just makes sure that a thread's expiry times can't get reset after it clears them in do_exit. This is what allowed us to re-introduce the stricter BUG_ON() check in a362f463a6d316d14daed0f817e151835ce97ff7. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Revert "remove false BUG_ON() from run_posix_cpu_timers()"Linus Torvalds2005-10-27
|/ | | | | | | | | | | | This reverts commit 3de463c7d9d58f8cf3395268230cb20a4c15bffa. Roland has another patch that allows us to leave the BUG_ON() in place by just making sure that the condition it tests for really is always true. That goes in next. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix cpu timers expiration timeOleg Nesterov2005-10-26
| | | | | | | | | | | There's a silly off-by-one error in the code that updates the expiration of posix CPU timers, causing them to not be properly updated when they hit exactly on their expiration time (which should be the normal case). This causes them to then fire immediately again, and only _then_ get properly updated. Signed-off-by: Linus Torvalds <torvalds@osdl.org>