commit 4b85df0419d1fb135d9d845876e8c7ee1393f83c Merge: 6044ab3... be2864b... Author: Linus Torvalds Date: Mon May 21 10:01:36 2007 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] More verbose show_mem() like other architectures. [S390] Make use of kretprobe_assert. [S390] Wire up signald, timerfd and eventfd syscalls. [S390] Wire up sys_utimensat. [S390] cio: Update documentation. commit 6044ab324ce4c180bce17aa9be00157c611d7d48 Merge: d07b3c2... 9093bbb... Author: Linus Torvalds Date: Mon May 21 10:00:57 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: Fix race condition about network device name allocation. [IPV4]: icmp: fix crash with sysctl_icmp_errors_use_inbound_ifaddr [NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name [NETFILTER]: nf_conntrack: fix use-after-free in helper destroy callback invocation [IPSEC] pfkey: Load specific algorithm in pfkey_add rather than all [TCP] FRTO: Prevent state inconsistency in corner cases [TCP] FRTO: Add missing ECN CWR sending to one of the responses [NET]: Fix net/core/skbuff.c gcc-3.2.3 compilation error [RFKILL]: Fix check for correct rfkill allocation [IPV6]: Add ip6_tunnel.h to headers_install commit d07b3c25327c5ae3792d0ed0c135dee4727200a1 Merge: dde3334... 6cbdc8c... Author: Linus Torvalds Date: Mon May 21 10:00:22 2007 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits) [ARM] spelling fixes [ARM] at91_adc parenthesis balance [ARM] 4400/1: S3C24XX: Add high-speed MMC device definition [ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings [ARM] 4398/1: S3C2443: Fix watchdog IRQ number [ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity [ARM] 4396/1: S3C2443: Add missing HCLK clocks [ARM] 4395/1: S3C24XX: add include of to relevant machines [ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu [ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts [ARM] ARMv6: add CPU_HAS_ASID configuration [ARM] integrator: fix pci_v3 compile error with DEBUG_LL [ARM] gic: Fix gic cascade irq handling [ARM] Silence OMAP kernel configuration warning [ARM] Update ARM syscalls [ARM] 4384/1: S3C2412/13 SPI registers offset correction [ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files [ARM] 4382/1: iop13xx: fix msi support [ARM] Remove Integrator/CP SMP platform support [ARM] 4378/1: KS8695: Serial driver fix ... commit dde33348e53ecab687a9768bf5262f0b8f79b7f2 Author: Anton Altaparmakov Date: Mon May 21 09:37:42 2007 +0100 LDM: Fix for Windows Vista dynamic disks This fixes the LDM driver so that it works with Windows Vista dynamic disks which are subtly different to Windows 2000/XP ones. The patch was needed to get a Vista formatted dynamic disk to be recognized and parsed successfully. Thanks go to Chris Teachworth for the report and testing. Cc: Richard Russon Signed-off-by: Anton Altaparmakov Signed-off-by: Linus Torvalds commit 17304383ebc1ce68a88030ac4d18ea549d9578c7 Author: Brian Gerst Date: Mon May 21 14:31:53 2007 +0200 i386: fix PGE mask cr4 is a 32-bit register, so casting the mask to an unsigned char is wrong, as it clears more than the PGE bit. Signed-off-by: Brian Gerst Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d0aff6e6f4e54f79f9c89d147d371bad384454e9 Author: john stultz Date: Mon May 21 14:31:52 2007 +0200 x86_64: vsyscall time() fix The vsyscall time() function basically returns the second portion of xtime directly. This however means that there is about a ticks worth of time each second where time() will return a second value less then what gettimeofday() does. Additionally, this window where vtime() is behind vgettimeofday() grows when dynticks is enabled, so its probably good to get this in before dynticks lands. Big thanks to Sripathi for noticing this issue and creating a test case to work with! This patch changes the vtime() implemenation to call vgettimeofday(), much as syscall time() implementation calls gettimeofday(). 2.6.21 stable candidate too Signed-off-by: John Stultz Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d8902bfcacde6001e1b11bb06137c3bae3ae52d0 Author: Yinghai Lu Date: Mon May 21 14:31:51 2007 +0200 x86_64: early_print kernel console should send CRLF not LFCR In commit d358788f3f30113e49882187d794832905e42592 Author: Russell King Date: Mon Mar 20 20:00:09 2006 +0000 Glen Turner reported that writing LFCR rather than the more traditional CRLF causes issues with some terminals. Since this afflicts many serial drivers, extract the common code to a library function (uart_console_write) and arrange for each driver to supply a "putchar" function. but early_printk is left out. Signed-off-by: Yinghai Lu Cc: Russell King Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 39427d6e595ebee38fdd77bcf55d6b13d7a4324a Author: Andi Kleen Date: Mon May 21 14:31:50 2007 +0200 i386: Enable CX8/PGE CPUID bits early on VIA C3 Fix boot failures with the early CPUID checking on VIA C3 Includes fixes from Christian Volkmann Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4c1f59d8be7e5da75d9380da23671005b363c45c Author: Christian Volkmann Date: Mon May 21 14:31:48 2007 +0200 i386: Fix wrong CPU error message in early boot path - boot/setup.S did not print "PANIC: CPU too old for this kernel" ( not visible, also the message did not match ) - I add "# missed before: set ds" => somebody should check if I am right with the way to set. => seems to be a generic error in setup.S not to set "ds" for error messages. AK: extracted patch out of other changes AK: also couldn't find any other case where ds is wrong Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c12ceb766eb5ac975c1145d51236fcdcf81a6578 Author: Andi Kleen Date: Mon May 21 14:31:47 2007 +0200 i386: Clear MCE flag on AMD K6 It reports machine check capability in CPUID, but doesn't actually implement all the necessary MSRs of the standard Intel machine check architecture. This fixes a boot failure on K6s recently introduced. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 21124a82bb82e100369846ff2044dd5ea65fc934 Author: Andi Kleen Date: Mon May 21 14:31:46 2007 +0200 x86_64: Support gcc 5 properly The ifdef tests were broken. Assume it acts like gcc 4 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6c977aad03a18019015035958c65b6729cd0574c Author: Andi Kleen Date: Mon May 21 14:31:45 2007 +0200 i386: Fix K8/core2 oprofile on multiple CPUs Only try to allocate MSRs once instead of for every CPU. This assumes the MSRs are the same on all CPUs which is currently true. P4-HT is a special case for different SMT threads, but the code always saves/restores all MSRs so it works identical. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4c87b948b258829f0bdffe51baa72fba5c42d359 Author: Andi Kleen Date: Mon May 21 14:31:44 2007 +0200 x86_64: Support x86_64 in make buildtar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 20c3a3d0dd5a91ee8986b94071da0cae8c057af5 Author: Andi Kleen Date: Mon May 21 14:31:43 2007 +0200 i386: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5e200c28955802b26d831f098a67402fa9d20ffc Author: Andi Kleen Date: Mon May 21 14:31:42 2007 +0200 x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 88b4036934b5a6d8cda810487503d2fc4c46d448 Author: Bryan Wu Date: Mon May 21 18:32:16 2007 +0800 Blackfin SPI: cleanup according to David Brownell's review a) platorm_driver_probe(...) instead of platform_driver_register(&driver); b) set bfin_spi_enable and bfin_spi_disable static c) Why is the width flag a u32? d) maybe use dev_dbg() instead of pr_debug() Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 2ac5ee4738cbd9c146ccda53f02006eaf6a43352 Author: Mike Frysinger Date: Mon May 21 18:09:39 2007 +0800 Blackfin serial driver: implement support for ignoring parity/break errors properly setting up and respecting the read_status_mask / ignore_status_mask fields of the serial core Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5c4e472b0af57553f9584e0b33c491b168ac1dff Author: Aubrey Li Date: Mon May 21 18:09:38 2007 +0800 Blackfin serial driver: fix overhead issue Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 9d7b6677ac35fdfee93e8f50589e04bcc95649c1 Author: Bryan Wu Date: Mon May 21 18:09:37 2007 +0800 Blackfin arch: update pm.c according to power management API change. Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c4d1889f7be0a7f34d29e5c4ce00a2b4b78ebb26 Author: Bryan Wu Date: Mon May 21 18:09:36 2007 +0800 Blackfin arch: update defconfig files Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ca9cb6fd4405a1e2276e17c895297004dd81734d Author: Mike Frysinger Date: Mon May 21 18:09:35 2007 +0800 Blackfin arch: add board default configs to blackfin arch Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit bde7db8608cab31c6d92982b00e8064bd492a85b Author: Sonic Zhang Date: Mon May 21 18:09:34 2007 +0800 Blackfin arch: Change NO_ACCESS_CHECK to ACCESS_CHECK Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c824498db47285aeff430c007685a193b673c949 Author: Bernd Schmidt Date: Mon May 21 18:09:33 2007 +0800 Blackfin arch: fix signal handling bug There's a forum thread at https://blackfin.uclinux.org/gf/project/uclinux-dist/forum/?action=ForumBrowse&_forum_action=MessageReply&message_id=24741 which has a testcase involving signal handling that crashes quite readily. Inspecting the code I believe what happens is that signal handling can become confused when it is invoked on return from an interrupt, if the contents of P0 and R0 at the time of the interrupt happen to be such that P0 is larger than zero (indicating to the signal code that we're in a syscall), and R0 happens to have a value of something like -EINTR or -ERESTARTSYS. Fixed by setting orig_p0 to -1 if we're returning from an interrupt. The testcase now seems to run without problems. Signed-off-by: Bernd Schmidt Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit a9c59c2746c7e773839d51027c0e16ccf41f8fef Author: Mike Frysinger Date: Mon May 21 18:09:32 2007 +0800 Blackfin arch: cache SWRST value at bootup so other things like watchdog can non-destructively query it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 19381f024b01413d83cec1655c3fc4c9c09ae274 Author: Bryan Wu Date: Mon May 21 18:09:31 2007 +0800 Blackfin arch: update blackfin header files to latest one in VDSP. a) add new processor BF52x/BF54x header files b) update blackfin BF533/BF537/BF561 header files to latest one in VDSP. c) scrub watchdog/rtc masks from headers as we dont need/want them (too generic and the drivers dont use them) Signed-off-by: Mike Frysinger Signed-off-by: Roy Huang Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c09c4e006590210001ced90d59e62182bfd396f9 Author: Mike Frysinger Date: Mon May 21 18:09:30 2007 +0800 Blackfin arch: make sure we use local labels Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ac57ac39e4f92f327451ad4084c4d5f60bcfa999 Author: Mike Frysinger Date: Mon May 21 18:09:29 2007 +0800 Blackfin arch: dont clear the bit that tells coreb to start booting Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5f9a3e899897201a49965cd9e1bb2570b3bde2b5 Author: Aubrey Li Date: Mon May 21 18:09:28 2007 +0800 Blackfin arch: dma_memcpy borken for > 64K Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 5079df993c3ab45af10dc9a45b3b9e712fd56f23 Author: Mike Frysinger Date: Mon May 21 18:09:27 2007 +0800 Blackfin arch: document why we have to touch the UART peripheral in our boot up code Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ef9256d2831df0896566c3823cd2bdf0e55df984 Author: Mike Frysinger Date: Mon May 21 18:09:26 2007 +0800 Blackfin arch: issue reset via SWRST so we dont clobber the watchdog state Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit c0fc525dcc407a516132fc11af82375319ebdadb Author: Mike Frysinger Date: Mon May 21 18:09:25 2007 +0800 Blackfin arch: move board specific setup out of common init code and into the board specific init code Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 95e493c00ac0d2371c3f627fdb99d776d29a8166 Author: Mike Frysinger Date: Mon May 21 18:09:24 2007 +0800 Blackfin arch: finish removing p* volatile defines for MMRs Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 30870b93cd76bdfa7385f8d471345f5f6269fb00 Author: Mike Frysinger Date: Mon May 21 18:09:23 2007 +0800 Blackfin arch: dont clear status register bits in SWRST so we can actually use it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit eb8d5f6c0322e641ec32ed632dd3b02586205673 Author: Mike Frysinger Date: Mon May 21 18:09:22 2007 +0800 Blackfin arch: make sure we declare the revid functions as pure (since they are) Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 0a290593a053752d9629fb1276392ce35c26b348 Author: Mike Frysinger Date: Mon May 21 18:09:21 2007 +0800 Blackfin arch: initial tepla-bf561 board support Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 6e537e9329d133526a576b741f85b3d48edc4ac1 Author: Michael Hennerich Date: Mon May 21 18:09:20 2007 +0800 Blackfin arch: Fix bug using usb keyboard crashes kernel Without conswitchp preset, we have the following situation: - During initcalls: con_init is called, and returns because of !display_desc. - At this point there is no memory allocated for vc_cons[].d A bit later vty_init calls kbd_init. - From now on events are passed to kbd_event which will then call kbd_keycode. - kbd_keycode will oops on a NULL pointer dereference on vc->vc_tty Signed-off-by: Michael Hennerich Cc: Pekka Enberg Signed-off-by: Bryan Wu [ Added commit description based on email thread. - Linus ] Signed-off-by: Linus Torvalds commit 8a0e6656030ffe9bcb81b725e956917bafc7522d Author: Mike Frysinger Date: Mon May 21 18:09:19 2007 +0800 Blackfin arch: fix trace output for FLAT binaries Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 678402709602a5e62bb79454f0f41bd952373300 Author: Michael Hennerich Date: Mon May 21 18:09:18 2007 +0800 Blackfin arch: GPIO fix some defines Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 23ee968d96ef5ad564c0f0b8a30412fb93137ebb Author: Michael Hennerich Date: Mon May 21 18:09:17 2007 +0800 Blackfin arch: DMA operation cleanup 1) Disable Interrupts during DMA memcpy to avoid raise conditions. 2) Mark MDMA channel 0 as reserved, since were using it internally. 3) Add DMA based equivalents for insX and outsX. 4) Our insX and outsX only handles len <= 2^16. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit d1b945fdb62f3e6852fea5a8779c0151ac1e55a8 Author: Michael Hennerich Date: Mon May 21 18:09:16 2007 +0800 Blackfin arch: Move write to VR_CTL closer to IDLE Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 9ae246cd85e05d3fb31b9770588c1fe0914872fe Author: Michael Hennerich Date: Mon May 21 18:09:15 2007 +0800 Blackfin arch: Fix reserved map after we changed PORT_H definition Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit a161bb0510d793a450127c12160309907af3d3f7 Author: Mike Frysinger Date: Mon May 21 18:09:14 2007 +0800 Blackfin arch: mark a bunch of local functions as static Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 140a9aec22f454120d1953f24cd2b5338b6141e2 Author: Michael Hennerich Date: Mon May 21 18:09:13 2007 +0800 Blackfin arch: Add configuration data for ISP176x on BF561 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 6dae211411448dd9a12895b802bdedca8296f23d Author: Mike Frysinger Date: Mon May 21 18:09:12 2007 +0800 Blackfin arch: fix a few random warnings Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit e3defffe915961cf9c6e1f16486ae83fb7212f29 Author: Aubrey Li Date: Mon May 21 18:09:11 2007 +0800 Blackfin arch: ISP1761 doesn't work for USB flash disk ZONE_DMA is required for some drivers subsystem, such as USB/SCSI. Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit ed2fbf57ea8d2ec1c0f6758bd5f9f98cef519049 Author: Bryan Wu Date: Mon May 21 18:09:10 2007 +0800 Blackfin arch: add SPI MMC driver support on bf533-stamp, tested on STAMP-BF533 Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit 8af10b79877ff5dfd5c7b1928d57cf38483e819d Author: Michael Hennerich Date: Mon May 21 18:09:09 2007 +0800 Blackfin arch: Add Workaround for ANOMALY 05000257 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds commit e8edc6e03a5c8562dc70a6d969f732bdb355a7e7 Author: Alexey Dobriyan Date: Mon May 21 01:22:52 2007 +0400 Detach sched.h from mm.h First thing mm.h does is including sched.h solely for can_do_mlock() inline function which has "current" dereference inside. By dealing with can_do_mlock() mm.h can be detached from sched.h which is good. See below, why. This patch a) removes unconditional inclusion of sched.h from mm.h b) makes can_do_mlock() normal function in mm/mlock.c c) exports can_do_mlock() to not break compilation d) adds sched.h inclusions back to files that were getting it indirectly. e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were getting them indirectly Net result is: a) mm.h users would get less code to open, read, preprocess, parse, ... if they don't need sched.h b) sched.h stops being dependency for significant number of files: on x86_64 allmodconfig touching sched.h results in recompile of 4083 files, after patch it's only 3744 (-8.3%). Cross-compile tested on all arm defconfigs, all mips defconfigs, all powerpc defconfigs, alpha alpha-up arm i386 i386-up i386-defconfig i386-allnoconfig ia64 ia64-up m68k mips parisc parisc-up powerpc powerpc-up s390 s390-up sparc sparc-up sparc64 sparc64-up um-x86_64 x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig as well as my two usual configs. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit ff1be9ad61e3e17ba83702d8ed0b534e5b8ee15c Author: OGAWA Hirofumi Date: Sun May 20 23:39:40 2007 +0900 Fix "fs: convert core functions to zero_user_page" The bug was introduced by 01f2705daf5a36208e69d7cf95db9c330f843af6. It misses to convert the first argument, it should be "new_page". This became a cause of fatfs corruption. Cc: Nate Diller Signed-off-by: OGAWA Hirofumi Signed-off-by: Linus Torvalds commit 5f663404b27fa72546a592c5c932b0605b9c93a6 Merge: 55b637c... da7cd59... Author: Linus Torvalds Date: Mon May 21 09:00:25 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] api: Read module pointer before freeing algorithm commit be2864b5ee46e0d5ed626de6cbfeb9abbd9c2e6f Author: Heiko Carstens Date: Mon May 21 11:25:23 2007 +0200 [S390] More verbose show_mem() like other architectures. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a5a60a2beea07c23e242ad8e7398e761935d669a Author: Heiko Carstens Date: Mon May 21 11:25:22 2007 +0200 [S390] Make use of kretprobe_assert. s390 change for git commit 0f95b7fc839bc3272b1bf2325d8748a649bd3534. That is print kprobes debug data before BUG(). Cc: Ananth N Mavinakayanahalli Cc: Maneesh Soni Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 913f11ee48edfa78b531e0db9385b640fbf9f6d7 Author: Heiko Carstens Date: Mon May 21 11:25:21 2007 +0200 [S390] Wire up signald, timerfd and eventfd syscalls. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit fd5d8bf03a9843ec3cdb10c820f409aa04048b52 Author: Heiko Carstens Date: Mon May 21 11:25:20 2007 +0200 [S390] Wire up sys_utimensat. Wire up sys_utimensat, reserve syscall number for sys_fallocate and add a couple of syscalls to the ignore list to get rid of warings. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 85ee32d02901bfd2e287ac669709758e04d73c4d Author: Cornelia Huck Date: Mon May 21 11:25:19 2007 +0200 [S390] cio: Update documentation. - read_dev_chars()/read_conf_data() are deprecated. Don't document them, but advise to issue the channel program from the driver itself. - Remove some really obsolete and incorrect stuff. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 6cbdc8c5357276307a77deeada3f04626ff17da6 Author: Simon Arlott Date: Fri May 11 20:40:30 2007 +0100 [ARM] spelling fixes Spelling fixes in arch/arm/. Signed-off-by: Simon Arlott Signed-off-by: Russell King commit fc432e1952a3899ce35e84b417e5d60f74cb901b Author: Mariusz Kozlowski Date: Sat May 19 00:39:36 2007 +0200 [ARM] at91_adc parenthesis balance Trivial unbalanced parenthesis macro fix. Signed-off-by: Mariusz Kozlowski Signed-off-by: Russell King commit 69e9c93d0d7d9dfa6bdf5144274dbe65a627b63a Author: Ben Dooks Date: Sun May 20 18:13:32 2007 +0100 [ARM] 4400/1: S3C24XX: Add high-speed MMC device definition Add definition for high-speed MMC/SD device and add to SMDK2443 device list. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 42482e3c77bcb310affdf13e92b93f077d44a7fc Author: Ben Dooks Date: Sun May 20 19:58:10 2007 +0100 [ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings Reduce the Twrph0 timing slightly to fit on an SMDK2443. This should still produce valid timings for the NAND devices as it is still over the smallest device fitted to these boards. Signed-off-by: Ben Dooks <(address hidden)> Signed-off-by: Russell King commit 7e966f3c392ffb5297a6ba0ea701d6a20d1d7292 Author: Ben Dooks Date: Sun May 20 18:02:50 2007 +0100 [ARM] 4398/1: S3C2443: Fix watchdog IRQ number Fix the IRQ number for watchdog on S3C2443 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5f2ef21703564d3e6f18fd92f2e72f723a5c3402 Author: Ben Dooks Date: Sun May 20 17:32:39 2007 +0100 [ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity Change the name of the S3C2443_SDI1 to S3C2443_HSMMC to ensure that it is correctly identified. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 67364334681503655fbff6c2f2dacfb17f04cadc Author: Ben Dooks Date: Sun May 20 17:17:32 2007 +0100 [ARM] 4396/1: S3C2443: Add missing HCLK clocks Add the clocks missing form HCLKCON back into the set of clocks being registered at initalisation time. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 333a42e1f4c5c5c2ed7c652254c35b9e98d5c789 Author: Ben Dooks Date: Sun May 20 11:55:53 2007 +0100 [ARM] 4395/1: S3C24XX: add include of to relevant machines Include in any machines that use the PM functions which require struct sys_device. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 95ba71f76f1cce550cb2e2b345a204d4a926d29c Author: Greg Ungerer Date: Thu May 17 06:22:41 2007 +0100 [ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu We don't need valid_phys_addr_range() or valid_mmap_phys_addr_range() for the !CONFIG_MMU case. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit 1d28bff7c4ea138032b44d514351b7caceb9fba5 Author: Greg Ungerer Date: Thu May 17 06:12:22 2007 +0100 [ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts Fix the formating of the "CPU part" field to be consistent with the other fields for pre-ARM7 parts. One tab to many for them to all line up. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit 9093bbb2d96d0184f037cea9b4e952a44ebe7c32 Author: Stephen Hemminger Date: Sat May 19 15:39:25 2007 -0700 [NET]: Fix race condition about network device name allocation. Kenji Kaneshige found this race between device removal and registration. On unregister it is possible for the old device to exist, because sysfs file is still open. A new device with 'eth%d' will select the same name, but sysfs kobject register will fial. The following changes the shutdown order slightly. It hold a removes the sysfs entries earlier (on unregister_netdevice), but holds a kobject reference. Then when todo runs the actual last put free happens. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d8cf27287ac7fb5cbfcc4139917a997c39d841ca Author: Patrick McHardy Date: Sat May 19 14:44:15 2007 -0700 [IPV4]: icmp: fix crash with sysctl_icmp_errors_use_inbound_ifaddr When icmp_send is called on the local output path before the packet hits ip_output, skb->dev is not set, causing a crash when sysctl_icmp_errors_use_inbound_ifaddr is set. This can happen with the netfilter REJECT target or IPsec tunnels. Let routing decide the ICMP source address in that case, since the packet is locally generated there is no inbound interface and the sysctl should not apply. The option actually seems to be unfixable broken, on the path after ip_output() skb->dev points to the outgoing device and we don't know the incoming device anymore, so its going to do the absolute wrong thing and pick the address of the outgoing interface. Add a comment about this. Reported by Curtis Doty . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3ad2a6fb6bcc2f464cdde093a76b76b90b90c66c Author: Patrick McHardy Date: Sat May 19 14:24:16 2007 -0700 [NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name The option is named CONFIG_NF_NAT not CONFIG_IP_NF_NAT. Remove the ifdef completely since helpers also expect defragmented packet even without NAT. Noticed by Robert P. J. Day Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 5397e97d7533a03b28a7b8aeee648cbb36a8afc6 Author: Patrick McHardy Date: Sat May 19 14:23:52 2007 -0700 [NETFILTER]: nf_conntrack: fix use-after-free in helper destroy callback invocation When the helper module is removed for a master connection that has a fulfilled expectation, but has already timed out and got removed from the hash tables, nf_conntrack_helper_unregister can't find the master connection to unset the helper, causing a use-after-free when the expected connection is destroyed and releases the last reference to the master. The helper destroy callback was introduced for the PPtP helper to clean up expectations and expected connections when the master connection times out, but doing this from destroy_conntrack only works for unfulfilled expectations since expected connections hold a reference to the master, preventing its destruction. Move the destroy callback to the timeout function, which fixes both problems. Reported/tested by Gabor Burjan . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c92b3a2f1f11655ecf6774b745017a414241d07c Author: Herbert Xu Date: Sat May 19 14:21:18 2007 -0700 [IPSEC] pfkey: Load specific algorithm in pfkey_add rather than all This is a natural extension of the changeset [XFRM]: Probe selected algorithm only. which only removed the probe call for xfrm_user. This patch does exactly the same thing for af_key. In other words, we load the algorithm requested by the user rather than everything when adding xfrm states in af_key. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 580e572a4a1bfea2f42af63ba4785ac7dfbcb45d Author: Ilpo Järvinen Date: Sat May 19 13:56:57 2007 -0700 [TCP] FRTO: Prevent state inconsistency in corner cases State could become inconsistent in two cases: 1) Userspace disabled FRTO by tuning sysctl when one of the TCP flows was in the middle of FRTO algorithm (and then RTO is again triggered) 2) SACK reneging occurs during FRTO algorithm A simple solution is just to abort the previous FRTO when such obscure condition occurs... Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 463236557db4b5d4de9eb3fafa2e7d7905ac65ab Author: Ilpo Järvinen Date: Sat May 19 13:56:23 2007 -0700 [TCP] FRTO: Add missing ECN CWR sending to one of the responses The conservative spurious RTO response did not queue CWR even though the sending rate was lowered. Whenever reduction happens regardless of reason, CWR should be sent (forgetting to send it is not very fatal though). A better approach would be to queue CWR when one of the sending rate reducing responses (rate-halving one or this conservative response) is used already at RTO. Doing that would allow CWR to be sent along with the two new data segments that are sent during FRTO. However, it's a bit "racy" because userland could tune the response sysctl to a more aggressive one in between. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit b6ccc67d8e42e38936df330b26ee6d022dda8a64 Author: Mikael Pettersson Date: Sat May 19 13:55:25 2007 -0700 [NET]: Fix net/core/skbuff.c gcc-3.2.3 compilation error Compiling 2.6.22-rc1 with gcc-3.2.3 for i486 fails with: gcc -m32 -Wp,-MD,net/core/.skbuff.o.d -nostdinc -isystem /home/mikpe/pkgs/linux-x86/gnu/lib/gcc-lib/i486-pc-linux-gnu/3.2.3/include -D__KERNEL__ -Iinclude -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -O2 -pipe -msoft-float -mregparm=3 -freg-struct-return -mpreferred-stack-boundary=4 -march=i486 -ffreestanding -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -Iinclude/asm-i386/mach-default -fomit-frame-pointer -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(skbuff)" -D"KBUILD_MODNAME=KBUILD_STR(skbuff)" -c -o net/core/skbuff.o net/core/skbuff.c net/core/skbuff.c:648:1: directives may not be used inside a macro argument net/core/skbuff.c:647:39: unterminated argument list invoking macro "memcpy" net/core/skbuff.c: In function `pskb_expand_head': net/core/skbuff.c:651: `memcpy' undeclared (first use in this function) net/core/skbuff.c:651: (Each undeclared identifier is reported only once net/core/skbuff.c:651: for each function it appears in.) net/core/skbuff.c:651: syntax error before "skb" make[2]: *** [net/core/skbuff.o] Error 1 make[1]: *** [net/core] Error 2 make: *** [net] Error 2 The patch below implements a simple workaround which is to clone the offending memcpy() call and specialise it for the two different scenarios. Other workarounds are of course possible: e.g. bind the varying parameter in a local variable, or use a macro or inline function to perform the varying computation. Signed-off-by: Mikael Pettersson Signed-off-by: David S. Miller commit d007da1fa6f0ad5e01ceae4a1f60cdbb23ecd706 Author: Ivo van Doorn Date: Sat May 19 12:24:39 2007 -0700 [RFKILL]: Fix check for correct rfkill allocation coverity has spotted a bug in rfkill.c (bug id #1627), in rfkill_allocate() NULL was returns if the kzalloc() works, and deref the NULL pointer if it fails, Signed-off-by: Ivo van Doorn Signed-off-by: David S. Miller commit c34b19fb4e243b26fa90a322bf32238356493674 Author: Deepak Saxena Date: Sat May 19 12:00:11 2007 -0700 [IPV6]: Add ip6_tunnel.h to headers_install The Mobile IPv6 package (http://www.mobile-ipv6.org/software/) needs this header file to build the tunnelctl component. The header already looks sanitized so is safe to export. Signed-off-by: Deepak Saxena Signed-off-by: David S. Miller commit da7cd59ab9c8ed233df4809f6c8c90c636f676c7 Author: Herbert Xu Date: Sat May 19 14:51:00 2007 +1000 [CRYPTO] api: Read module pointer before freeing algorithm The function crypto_mod_put first frees the algorithm and then drops the reference to its module. Unfortunately we read the module pointer which after freeing the algorithm and that pointer sits inside the object that we just freed. So this patch reads the module pointer out before we free the object. Thanks to Luca Tettamanti for reporting this. Signed-off-by: Herbert Xu commit 516793c61b3db1f60e0b0d0e3c382bcca9ae84fd Author: Russell King Date: Thu May 17 10:19:23 2007 +0100 [ARM] ARMv6: add CPU_HAS_ASID configuration Presently, we check for the minimum ARM architecture that we're building for to determine whether we need ASID support. This is wrong - if we're going to support a range of CPUs which include ARMv6 or higher, we need the ASID. Convert the checks to use a new configuration symbol, and arrange for ARMv6 and higher CPU entries to select it. Signed-off-by: Russell King commit c6af66b9fe93990c70aaee53ce3ce7e53a83676a Author: Russell King Date: Thu May 17 10:16:55 2007 +0100 [ARM] integrator: fix pci_v3 compile error with DEBUG_LL If DEBUG_LL is enabled, we want to use get_irq_regs(), but this causes a build error due to the inline function missing. Add the necessary header file. Signed-off-by: Russell King commit 0f347bb9136f55ff575d55441a29e92c16e87fb0 Author: Russell King Date: Thu May 17 10:11:34 2007 +0100 [ARM] gic: Fix gic cascade irq handling No need for the cascade irq function to have a "fastcall" annotation. Fix the range checking for valid IRQ numbers - comparing the value returned by the GIC with NR_IRQS is meaningless since we translate the GIC irq number to a Linux IRQ number afterwards. Check the GIC returned IRQ number is within limits first, then add the IRQ offset, and only then compare with NR_IRQS. Signed-off-by: Russell King commit f3270f6ef7d60251617f9d4c08f76ec01c647aa4 Author: Russell King Date: Wed May 16 17:36:17 2007 +0100 [ARM] Silence OMAP kernel configuration warning arch/arm/mach-omap1/Kconfig:41:warning: 'select' used by config symbol 'MACH_OMAP_H3' refers to undefined symbol 'GPIOEXPANDER_OMAP' Signed-off-by: Russell King commit c05107911a38235fec87892d83dc54aba9aaf3bd Author: Russell King Date: Wed May 16 12:41:15 2007 +0100 [ARM] Update ARM syscalls Add utimensat, signalfd, timerfd, eventfd syscalls. Add ignore defines for sync_file_range and fadvise64_64 which we implement differently. Signed-off-by: Russell King commit e903382ceae1dd85e650ffc7e98facdd59cc7a3f Author: Sandeep Sanjay Patil Date: Wed May 16 10:51:45 2007 +0100 [ARM] 4384/1: S3C2412/13 SPI registers offset correction Change the SPI Channel 1 register offset in s3c_spi1_resource[], and s3c2412_dma_mappings[]. Offset has to be 0x100 in s3c2412/13's case. Also, total SPI memory resource size changed to 0x24 for s3c2412/13. Signed-off-by: Sandeep Patil Signed-off-by: Ben Dooks Signed-off-by: Russell King commit d73d8011779292788def2cd2520d6f39d9b406de Author: Dan Williams Date: Tue May 15 01:03:36 2007 +0100 [ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files WARNING: arch/arm/mach-iop13xx/built-in.o - Section mismatch: reference to .init.text:iop13xx_pcie_map_irq from .text between 'iop13xx_pci_setup' (at offset 0x7fc) and 'iop13xx_map_pci_memory' While fixing this warning I also recalled Adrian Bunk's recommendation to not use inline in .c files, as 'iop13xx_map_pci_memory' is needlessly inlined. Removing 'inline' uncovered some dead code so that is cleaned up as well. Signed-off-by: Dan Williams Signed-off-by: Russell King commit e702a7155d14a6e11645e17d829217ae98fd45bb Author: Dan Williams Date: Tue May 15 01:03:31 2007 +0100 [ARM] 4382/1: iop13xx: fix msi support updates iop13xx msi support for a msi api change in 2.6.22 rev7: * update for Michael Ellerman's "MSI: arch must connect the irq and the msi_desc" patch Signed-off-by: Dan Williams Signed-off-by: Russell King commit 06ba255571b0a2f1fb7e49e7406364e4194f4e10 Author: Russell King Date: Mon May 14 22:56:32 2007 +0100 [ARM] Remove Integrator/CP SMP platform support The Integrator/CP SMP platform support was never fully merged, and now it's causing build breakage. Remove it. Signed-off-by: Russell King commit e45c7a43825b0feb161ef2ebe5324cd517dd4388 Author: Andrew Victor Date: Mon May 14 14:32:43 2007 +0100 [ARM] 4378/1: KS8695: Serial driver fix A fix for a really stupid typo in the KS8695 serial driver. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 8858e9afdf31bab05247b1680b16c65fe7edbbe1 Author: Milan Svoboda Date: Mon May 14 07:50:42 2007 +0100 [ARM] 4376/1: Selects GENERIC_GPIO for ARCH_IXP4XX in Kconfig Selects GENERIC_GPIO for ARCH_IXP4XX in Kconfig. IXP4XX has generic GPIO support; however, ARCH_IXP4XX Kconfig entry currently does not select GENERIC_GPIO like other arch entries. Signed-off-by: Milan Svoboda Signed-off-by: Russell King commit aceb6f0b6da20a86516d59f73ecdc7ea3c4a23da Author: Richard Purdie Date: Sun May 13 13:32:23 2007 +0100 [ARM] 4375/1: sharpsl_pm: Fix compile warnings Fix compile warnings from sharpsl_pm.c. Attribute registration failure doesn't stop the driver working so just warn about it. Signed-off-by: Richard Purdie Signed-off-by: Russell King