ChangeSet@1.1952, 2004-08-08 21:29:26-07:00, torvalds@ppc970.osdl.org Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk into ppc970.osdl.org:/home/torvalds/v2.6/linux ChangeSet@1.1951, 2004-08-08 14:22:10-07:00, torvalds@ppc970.osdl.org ppc64: add user annotations to rtc driver ChangeSet@1.1950, 2004-08-08 14:07:55-07:00, torvalds@ppc970.osdl.org Remove ESPIPE logic from drivers, letting the VFS layer handle it instead. This cleans up and simplifies drivers, and also allows us future simplification in the VFS layer, since it removes knowledge about internal VFS layer handling of "f_pos". ChangeSet@1.1948.1.6, 2004-08-08 19:16:21+01:00, rmk@flint.arm.linux.org.uk [ARM] Fix wdt977 sparse warnings drivers/char/watchdog/wdt977.c:291:9: warning: incorrect type in initializer (different address spaces) drivers/char/watchdog/wdt977.c:291:9: expected char const [noderef] *register __p drivers/char/watchdog/wdt977.c:291:9: got char const *buf ... ChangeSet@1.1948.1.5, 2004-08-08 18:05:49+01:00, rmk@flint.arm.linux.org.uk [ARM] Fix nwflash sparse warnings ChangeSet@1.1948.1.4, 2004-08-08 17:56:07+01:00, rmk@flint.arm.linux.org.uk [ARM] Fix nwbutton sparse warnings drivers/char/nwbutton.c:177:24: warning: incorrect type in argument 1 (different address spaces)/home/rmk/bk/linux-2.6-rmk/drivers/char/nwbutton.c:177:24: expected void [noderef] *to drivers/char/nwbutton.c:177:24: got char *buffer drivers/char/nwbutton.c:177:24: warning: incorrect type in initializer (different address spaces) drivers/char/nwbutton.c:177:24: expected void [noderef] *to drivers/char/nwbutton.c:177:24: got char *buffer drivers/char/nwbutton.c:189:11: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/char/nwbutton.c:189:11: expected int [usertype] ( *read )( ... ) drivers/char/nwbutton.c:189:11: got int ( static [addressable] [toplevel] * )( ... ) ChangeSet@1.1948.1.3, 2004-08-08 17:24:24+01:00, rmk@flint.arm.linux.org.uk [ARM] Fix sparse warnings in ds1620.c drivers/char/ds1620.c:230:19: warning: incorrect type in argument 1 (different address spaces) drivers/char/ds1620.c:230:19: expected void [noderef] *to drivers/char/ds1620.c:230:19: got char *buf drivers/char/ds1620.c:230:19: warning: incorrect type in initializer (different address spaces) drivers/char/ds1620.c:230:19: expected void [noderef] *to drivers/char/ds1620.c:230:19: got char *buf ... drivers/char/ds1620.c:383:52: warning: Using plain integer as NULL pointer ChangeSet@1.1948.1.2, 2004-08-08 16:50:31+01:00, rmk@flint.arm.linux.org.uk [ARM] Eliminate io.c sparse warnings/ gcc 3.4 errors. arch/arm/kernel/io.c:15:5: warning: generating address of non-lvalue arch/arm/kernel/io.c:15:5: warning: loading unknown expression arch/arm/kernel/io.c:29:5: warning: generating address of non-lvalue arch/arm/kernel/io.c:29:5: warning: loading unknown expression ChangeSet@1.1948.1.1, 2004-08-08 16:04:49+01:00, rmk@flint.arm.linux.org.uk [ARM] Fix sparse warnings in nwfpe. This fixes sparse warnings in fpa11_cpdt (coprocessor data transfer) instruction emulation. Note that pointers need to be cast to unsigned long not unsigned int, so convert user registers to be unsigned long type. ChangeSet@1.1949, 2004-08-07 23:43:47-07:00, torvalds@ppc970.osdl.org Make sysctl pass the pos pointer around properly. Nobody ever fixed the big FIXME in sysctl - but we really need to pass around the proper "loff_t *" to all the sysctl functions if we want them to be well-behaved wrt the file pointer position. This is all preparation for making direct f_pos accesses go away. ChangeSet@1.1948, 2004-08-07 19:15:08-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] mpoa patch done right - conversion to seq_file, overflow fixes - qos_parse sanitized (3 sscanf calls instead of insane manual parsing) leaks plugged code cleaned up We still have serious races, but they are general problem in atm code - it has no locking whatsoever for any of the lists (mpcs, qos_head, per-client lists). ChangeSet@1.1947, 2004-08-07 19:14:56-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] Teach sscanf about 'hh' and 'll' Adds support for 'hh' (store number in char *) and 'll' (proper C99 for long long) modifiers to sscanf(). ChangeSet@1.1946, 2004-08-07 19:11:39-07:00, torvalds@ppc970.osdl.org Fix up a couple of drivers - notable sg - for nonseekability. ChangeSet@1.1945, 2004-08-07 19:09:26-07:00, torvalds@ppc970.osdl.org The seq_file code already disabled pread/pwrite access, no need for the mtrr code to check any more. ChangeSet@1.1944, 2004-08-07 19:08:24-07:00, torvalds@ppc970.osdl.org Mark the sunrpc cache control file nonseekable, and remove the run-time tests for it. ChangeSet@1.1943, 2004-08-07 19:07:42-07:00, torvalds@ppc970.osdl.org Character device tape drivers are non-lseekable. You can seek the tape, but you do it with the magic tape control ioctl's, not with lseek/pread/pwrite. ChangeSet@1.1942, 2004-08-07 19:06:26-07:00, torvalds@ppc970.osdl.org Mark tty's as being non-seekable, and remove the now unnecessary tests at read/write time. ChangeSet@1.1941, 2004-08-07 19:05:19-07:00, torvalds@ppc970.osdl.org Teach sendfile() to honour non-seekable source files. Remove the test from the socket code, now that it's no longer necessary. ChangeSet@1.1940, 2004-08-07 18:54:18-07:00, torvalds@ppc970.osdl.org Add "nonseekable_open()" helper functions for nonseekable file descriptors. ChangeSet@1.1939, 2004-08-07 16:08:23-07:00, torvalds@ppc970.osdl.org Add pread/pwrite support bits to match the lseek bit. This also removes the ESPIPE logic from pipes and seq_files, since the VFS layer now supports it. ChangeSet@1.1938, 2004-08-07 15:02:35-07:00, mporter@kernel.crashing.org [PATCH] ppc32: add PPC4xx DMA engine library Adds a cleaned up version of the PPC4xx DMA engine library. Converted to new DCR access method and DMA API. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1937, 2004-08-07 14:58:35-07:00, mporter@kernel.crashing.org [PATCH] ppc32: remove pci-dma.c Remove pci-dma.c. It is cruft left over from the DMA API changes. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1936, 2004-08-07 14:58:23-07:00, geoffrey.levand@am.sony.com [PATCH] ppc32: fix ebony uart clock This patch corrects the Ebony board's uart clock value to the rate of the external Epson SG-615P clock source. Now good to 115Kbps. Signed-off-by: Geoff Levand for CELF Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1935, 2004-08-07 14:58:12-07:00, mporter@kernel.crashing.org [PATCH] ppc32: clean up PPC44x mmu_mapin_ram() Remove some old cruft in the kernel lowmem mapping code and save some memory in the process. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1934, 2004-08-07 14:58:01-07:00, haveblue@us.ibm.com [PATCH] ppc64: suppress unused var warning in get_irq_server() When normal IRQ balancing is used, the following warnings appear: arch/ppc64/kernel/xics.c: In function `get_irq_server': arch/ppc64/kernel/xics.c:242: warning: unused variable `cpumask' arch/ppc64/kernel/xics.c:243: warning: unused variable `tmp' Simply move the variables inside the #ifdef Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1933, 2004-08-07 14:57:50-07:00, haveblue@us.ibm.com [PATCH] ppc64: move SPINLINE out of global menu This somehow ended up out in the global Kconfig menu. Move it back inside debugging where it belongs. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1932, 2004-08-07 14:57:38-07:00, anton@samba.org [PATCH] ppc64: suppress 'store_purr' unused warning Some new sysfs macros declare a store_purr() function that never gets used, which makes a compiler warning happen. Suppress the warning with the used attribute. Signed-off-by: Dave Hansen Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1931, 2004-08-07 14:57:27-07:00, anton@samba.org [PATCH] ppc64: fix chrp_progress mismerge Due to a mismerge, some code in chrp_progress appears twice. While here, clean up some formatting issues. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1930, 2004-08-07 14:57:15-07:00, anton@samba.org [PATCH] ppc64: set SMT thread priority to medium for all exceptions We need to set the thread priority to medium when entering all exceptions. We may have been executing in low priority (eg the idle loop), but definitely do not want to remain in that priority for the duration of the exception (eg a device interrupt). Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1929, 2004-08-07 14:57:04-07:00, anton@samba.org [PATCH] ppc64: avoid speculative execution after rfid Due to speculative execution, a CPU may execute some instructions after the rfid. This makes profiles confusing, since profiling ticks could end up in those instructions following the rfid that are never executed. Add a branch to self after each rfid to avoid this. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1928, 2004-08-07 14:56:54-07:00, anton@samba.org [PATCH] ppc64: fix PCI allocation warning Print the correct domain when a PCI resource allocation fails. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1927, 2004-08-07 14:56:42-07:00, anton@samba.org [PATCH] ppc64: various XICS fixes - Remove unused includes. - Be consistent about printing irq numbers, avoid a mix of decimal and hexadecimal. - Remove prototypes from xics.c, they should be in xics.h. - Remove infinite loop on failure, and instead use panic. Panic has a chance to log the error message on the LED panel and reboot the box, a while(1) loop does not. - xics isnt compiled for iseries any more, so no need for the CONFIG_PPC_PSERIES hack. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1926, 2004-08-07 14:56:31-07:00, jhe@us.ibm.com [PATCH] ppc64: 32-bit ptrace geteventmsg fix Here's a fix for the 32-bit PTRACE_GETEVENTMSG ptrace call that handles the passing of a 32-bit user address. Please apply, thanks. Signed-off-by: John Engel Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1925, 2004-08-07 14:56:22-07:00, paulus@samba.org [PATCH] ppc64: pci_dn cleanups This patch just cleans up arch/ppc64/kernel/pci_dn.c a bit, including: - remove it from the iSeries build completely - small changes to Makefile - remove the "post" parameter from traverse_pci_devices as noone used it - make traverse_all_pci_devices static - remove CONFIG_PPC_PSERIES tests as we no longer build for iSeries - some reformatting (closer to "standard") - remove some of pointer casts This has been built (with default config) on pSeries and pmac and built and run on iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1924, 2004-08-07 14:56:10-07:00, pazke@donpac.ru [PATCH] ppc64: fix free_irq() Fix ppc64 free_irq. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1923, 2004-08-07 14:55:59-07:00, tspat@de.ibm.com [PATCH] s390: qeth performance. qeth network driver performance improvements. The ping time on the HiperSockets interface drops from 250 usecs to 50 usecs and the 1 bytes request/response test improves from 70000 to 110000 transactions. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1922, 2004-08-07 14:55:48-07:00, schwidefsky@de.ibm.com [PATCH] s390: zfcp host adapater. From: Heiko Carstens From: Andreas Herrmann zfcp host adapater change: - Fix call to close_physical_port to prevent devices going offline after error recovery. - Fix return value of sysfs port_remove attribute store function. - Replace reboot notifier with device driver shutdown function. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1921, 2004-08-07 14:55:36-07:00, ptiedem@de.ibm.com [PATCH] s390: ctc driver changes. Prefix debug feature variables with ctc to avoid name space problems. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1920, 2004-08-07 14:55:25-07:00, nacc@us.ibm.com [PATCH] s390: msleep vs. schedule_timeout. Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time. Signed-off-by: Nishanth Aravamudan Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1919, 2004-08-07 14:55:13-07:00, cohuck@de.ibm.com [PATCH] s390: common i/o layer changes. common i/o layer changes: - Set state of a disconnected device to offline before calling ccw_device_online, otherwise the device doesn't come up again. - Check for channel end when trying to find out if basic sense was successful. - Fix error handling in new_channel_path. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1918, 2004-08-07 14:55:02-07:00, schwidefsky@de.ibm.com [PATCH] s390: core changes. From: Martin Schwidefsky s390 core changes: - Add 32 bit compat code for ptrace requests PTRACE_GETEVENTMSG, PTRACE_GETSIGINFO and PTRACE_SETSIGINFO. - Make non-smp kernel compile. - Regenerate default configuration. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1917, 2004-08-07 14:54:50-07:00, wli@holomorphy.com [PATCH] sparc32: gcc-3.3 macro parenthesization fix for memcpy.S From: Art Haas The 1.3->1.4 changes to the arch/sparc/lib/copy_user.S file added parenthesis to a number of macros within that file. The BK changlog associated with this change indicate the change was to make the file work with gcc-3.3. When looking at the changes made, I see that similar macros exist in memcpy.S as well, so would a patch adding parens to that file be worthwhile? Also, just what was the problem with gcc-3.3 that was resolved by adding the parenthesis? Macro mis-expansion I'm guessing. Signed-off-by: Art Haas Signed-off-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1916, 2004-08-07 14:54:39-07:00, wli@holomorphy.com [PATCH] sparc32: make CONFIG_SMP depend on CONFIG_BROKEN SMP support is in need of a great deal of work to port it from 2.2 and 2.4. Add a dependency on BROKEN in the Kconfig to warn the unwary. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1915, 2004-08-07 14:54:27-07:00, wli@holomorphy.com [PATCH] sparc32: sun4 does not support SMP The sun4 port does not support SMP. Disable it via Kconfig. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1914, 2004-08-07 14:54:16-07:00, wli@holomorphy.com [PATCH] sparc32: remove unused variable in dvma.c This variable is unused and causes noisy compiles. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1913, 2004-08-07 14:54:05-07:00, wli@holomorphy.com [PATCH] sparc32: define cache_decay_ticks cache_decay_ticks needs to be defined in order for the kernel to link. This placeholder is inaccurate, however, other, more grave SMP issues need to be addressed first. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1912, 2004-08-07 14:53:53-07:00, wli@holomorphy.com [PATCH] sparc32: remove references to start_secondary() Remove leftover references to now-unused start_secondary() Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1911, 2004-08-07 14:53:42-07:00, wli@holomorphy.com [PATCH] sparc32: reinstate smp_reschedule_irq() smp_reschedule_irq() mysteriously vanished sometime after 2.4. This patch reinstates it so that the kernel will link properly and so cpus will set TIF_NEED_RESCHED when it's asked of them. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1910, 2004-08-07 14:53:33-07:00, wli@holomorphy.com [PATCH] sparc32: smp_processor_id() BITFIXUP fixes The SMP initialization functions try to do btfixups on the wrong symbols for smp_processor_id(), which is now implemented in terms of current_thread_info()->cpu. hard_smp_processor_id() etc. are now in use where smp_processor_id() was once used. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1909, 2004-08-07 14:53:21-07:00, wli@holomorphy.com [PATCH] sparc32: sun4d cpu_present_map is a cpumask_t cpu_present_map is a cpumask_t. Sweep arch/sparc/kernel/sun4d_smp.c so that it is treated as such. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1908, 2004-08-07 14:53:10-07:00, wli@holomorphy.com [PATCH] sparc32: sparc32 init_idle() An analysis of the code determined that AP initialization called init_idle() no less than three times, 2 out of the three with incorrect numbers of arguments. This patch removes the superfluous calls. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1907, 2004-08-07 14:52:59-07:00, wli@holomorphy.com [PATCH] sparc32: turbosparc flush warnings FLUSH_BEGIN() is a nop at the moment, so the mm variable for its argument trips a warning. Pass vma->vm_mm directly instead. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1906, 2004-08-07 14:52:47-07:00, akpm@osdl.org [PATCH] jbd: journal_head unmapping race fix Fix a race identified by Chris Mason journal_unmap_buffer -> __dispose_buffers has the j_list_lock and the jbd_lock_bh_state held. journal_get_write_access calls journal_put_journal_head, which takes jbd_lock_bh_journal_head(bh) and doesn't seem to have any other locks held. Since journal_unmap_buffers trusts the buffer_jbd bit to see if we need to call __dispose_buffer, and nobody seems to test buffer_jbd after taking jbd_lock_bh_journal_head. The kernel dereferences a null jh pointer in __journal_remove_journal_head. The patch fixes this by using journal_grab_journal_head() in journal_unmap_buffer(). It ensures that we either grab and pin the journal_head if the bh has one, or we bale out if the bh doesn't have a journal_head. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1905, 2004-08-07 14:52:36-07:00, paulus@samba.org [PATCH] Restore PPP filtering Karsten Keil's patch entitled "[ISDN]: Fix kernel PPP/IPPP active/passiv filter code" that went in back in April was an attempt to solve a real problem - namely that the libpcap maintainers have removed useful functionality that pppd was using - but his fix broke existing pppd binaries and IMO didn't end up actually solving the problem. This patch reverts the change to ppp_generic.c so that existing pppd binaries work again. I am going to have to work out a proper fix, which may involve further changes to ppp_generic.c, but I will make sure existing pppd binaries still work. Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1904, 2004-08-07 14:52:25-07:00, sam@ravnborg.org [PATCH] kbuild: Remove LANG preset in top-level Makefile In the top-level Makefile a number of locale related environment variables were preset to give a small speed up when building the kernel. Unfortunately this had the bad sideeffect that the variable CFLAGS_vmlinux.lds.o lost the exported vaule in some setups (obviously not mine). This smells like a make issue - but the best solution is simply to drop presetting the locale related variables. Signed-off-by: Sam Ravnborg Signed-off-by: Linus Torvalds ChangeSet@1.1903, 2004-08-07 12:12:52-07:00, torvalds@ppc970.osdl.org Add infrastructure for the VFS layer to mark files seekable. We use a FMODE_LSEEK flag to match the existing read/write bits. This allows us to check for seekability on a VFS level for lseek/pread/pwrite, and cleans things up. Update some sites that used the numeric constants to use the symbolic values instead. ChangeSet@1.1899, 2004-08-06 15:21:39-07:00, davem@nuts.davemloft.net [NET]: Move sndmsg_page destruction back into TCP for now. Signed-off-by: David S. Miller ChangeSet@1.1884.5.3, 2004-08-06 15:13:07-07:00, trini@kernel.crashing.org [PATCH] ppc32: Fix building of certain CPU types The following corrects how we pass CPU flags to gas. Previous, AFLAGS was incorrectly assumed to be pased directly to $(AS), which is not the case. Concept ack'd by Sam Ravnborg. Signed-off-by: Tom Rini Signed-off-by: Linus Torvalds ChangeSet@1.1884.5.2, 2004-08-06 15:12:56-07:00, paulus@samba.org [PATCH] Remove ppc32 proc_rtas.c This patch removes proc_rtas.c and error_log.[ch] from arch/ppc/platforms. It turns out that the code in error_log.[ch] is completely unused, and the code in proc_rtas.c is buggy, almost impossible to understand, and rarely used. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds ChangeSet@1.1884.1.21, 2004-08-06 22:10:36+01:00, rmk@flint.arm.linux.org.uk [ARM] Remove unnecessary CONFIG_CPU_32 preprocessor conditional. We're only 32-bit ARMs, so testing this symbol in 32-bit only code is unnecessary. ChangeSet@1.1884.1.20, 2004-08-06 17:55:39+01:00, rmk@flint.arm.linux.org.uk [FB] replace schedule_timeout() with msleep() Patch from: Nishanth Aravamudan Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time. Signed-off-by: Nishanth Aravamudan Signed-off-by: Russell King ChangeSet@1.1884.5.1, 2004-08-06 09:46:07-07:00, jmorris@redhat.com [PATCH] Re-implemented i586 asm AES This code is a rework of the original Gladman AES code, and does not include any supposed BSD licensed work by Jari Ruusu. Linus converted the Intel asm to Gas format, and made some minor alterations. Fruhwirth's glue module has also been retained, although I rebased the table generation and key scheduling back to Gladman's code. I've tested this code with some standard FIPS test vectors, and large FTP transfers over IPSec (both locally and over the wire to a system running the generic AES implementation). Signed-off-by: James Morris Signed-off-by: Linus Torvalds ChangeSet@1.1884.4.1, 2004-08-06 17:38:15+01:00, rmk@flint.arm.linux.org.uk [SERIAL] replace schedule_timeout() with msleep() Patch from: Nishanth Aravamudan Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time. Signed-off-by: Nishanth Aravamudan Signed-off-by: Russell King ChangeSet@1.1884.1.19, 2004-08-06 15:08:24+01:00, ben-linux@org.rmk.(none) [ARM PATCH] 1990/1: S3C2410 - fix mis-spelled time initialisation calls Patch from Ben Dooks Fixed mis-spelled time initialisation calls and a bad prototype in the time header Fixes for patch 1962/1 ChangeSet@1.1884.1.18, 2004-08-06 14:33:46+01:00, ben-linux@org.rmk.(none) [ARM PATCH] 1989/1: S3C2410 - rename owner of VR1000 board and update help Patch from Ben Dooks Rename to Thorcom, and added extra lines to help ChangeSet@1.1884.1.17, 2004-08-06 14:28:22+01:00, ben-linux@org.rmk.(none) [ARM PATCH] 1988/1: S3C2410 - defconfig update to include all boards Patch from Ben Dooks Updated default configuration file to include all the boards possible with this architecture ChangeSet@1.1884.1.16, 2004-08-06 14:20:34+01:00, kevin@org.rmk.(none) [ARM PATCH] 1986/1: bootpImage/ARM: add ability to run from non-zero address Patch from Kevin Hilman The following patch allows the bootpImage to be loaded and executed from a non-zero address. On OMAP platforms for example, the physical address for SDRAM is 0x10000000 and not zero. ChangeSet@1.1884.1.15, 2004-08-05 23:11:00-07:00, torvalds@ppc970.osdl.org Make the new simple_read_from_buffer() take a const src buffer without complaints. ChangeSet@1.1884.1.14, 2004-08-05 22:36:28-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] Fix ppc htab seq_file conversion *grrrrrrrr* Wrong diff sent. Sorry - normally the tree I'm working in is cp -rl'ed from the -current, but right now it's a big mess. This is the incremental fix. ChangeSet@1.1884.1.13, 2004-08-05 21:13:56-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] ppc: seq_file conversion for ppc_htab This converts the 32-bit ppc htab code to use the seq_file interfaces. Less code means fewer bugs.. ChangeSet@1.1884.1.12, 2004-08-05 20:37:01-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] ppc64: Fix rtas file mess This does the seq_file conversion + annotation + cleanup + race fixes for arch/ppc64/kernel/rtas-proc.c. How the fuck did that file manage to get anywhere near the tree, anyway? Take a look at guy's "implementation" of sprintf(buf, "%04d", num), for example: /* construct the sensor number like 0003 */ /* fill with zeros */ n = sprintf(tmp, "%d", s.token); len = strlen(tmp); while (strlen(tmp) < 4) n += sprintf (tmp+n, "0"); /* invert the string */ while (tmp[i]) { if (i And it's full of that level of lusing ;-/ ChangeSet@1.1884.1.11, 2004-08-05 20:30:40-07:00, torvalds@ppc970.osdl.org Fix shrink_dcache_anon() LRU list accesses. It would potentially remove dentries from the LRU list without re-initializing the d_lru fields, causing later accesses to that dentry to do bad things to the LRU list. ChangeSet@1.1884.1.10, 2004-08-05 18:18:41-07:00, trini@kernel.crashing.org [PATCH] ppc32: Fix 'mktree' on 64bit hosts The following patch changes some 'unsigned long's into 'uint32_t's in mktree (a program that runs on the host to frob the kernel image for some firmwares). Without it, the program is not correct when run on/compiled on a 64bit host. Signed-off-by: Dan Zink Signed-off-by: Tom Rini Signed-off-by: Linus Torvalds ChangeSet@1.1884.1.9, 2004-08-05 17:56:22-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] imm.c oops fix Fix bug #3125: This should fix the problem; however, we will need to repeat that for all PIO SCSI drivers (another immediate victim is ppa.c). We should start looking for sane solution; I _really_ don't like the kludge with using ->slave_alloc() for fixups after scsi_alloc_queue(). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1884.2.6, 2004-08-05 17:43:51-07:00, roland@redhat.com [PATCH] fix /proc printing of TASK_DEAD state I just stumbled across this patch that's been sitting in my tree for ages. I thought I'd sent this in before. It's a trivial fix for the printing of task state in /proc and sysrq dumps and such, so that TASK_DEAD shows up correctly. This state is pretty much only ever there to be seen when there are exit/reaping bugs, but it's not like that hasn't come up. Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds ChangeSet@1.1884.2.4, 2004-08-05 17:39:48-07:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] simple_read_buffer() helper function A number of drivers or special virtual devices really just want their "read()" function to populate user space from some internal buffer. This adds such a helper function - "simple_read_from_buffer()" - and converts several ->read() instances to use it. Signed-off-by: Linus Torvalds ChangeSet@1.1884.3.7, 2004-08-05 21:48:18+01:00, jelenz@edu.rmk.(none) [ARM PATCH] 1974/1: add INITTIME macro to collie machine structure Patch from John Lenz Add INITTIME macro to collie machine structure. ChangeSet@1.1884.3.6, 2004-08-05 21:43:43+01:00, ben-linux@org.rmk.(none) [ARM PATCH] 1972/1: IPAQ H1940 - fix serial clock base Patch from Ben Dooks Fixed clock base for the H1940 thanks to Gerald Schneider for fixing this. ChangeSet@1.1884.3.5, 2004-08-05 21:39:15+01:00, ben-linux@org.rmk.(none) [ARM PATCH] 1971/1: BAST - default configuraiton update Patch from Ben Dooks Patch for default configuration ChangeSet@1.1884.3.4, 2004-08-05 21:33:54+01:00, ben-linux@org.rmk.(none) [ARM PATCH] 1968/1: S3C2410 - GPIO updates and access functions Patch from Ben Dooks Added more definitions for GPIO registers New functions for modifying pin configuration and bit-status (see include/asm-arm/arch-s3c2410/hardware.h) ChangeSet@1.1884.3.3, 2004-08-05 21:28:33+01:00, ben-linux@org.rmk.(none) [ARM PATCH] 1966/1: S3C2410 - Fix for serial driver compile error Patch from Ben Dooks Remove compile error with gcc-3.4 and empty part of case statememnt ChangeSet@1.1884.3.2, 2004-08-05 21:03:23+01:00, catalin.marinas@com.rmk.(none) [ARM PATCH] 1965/1: gas only generates the c and f field bits for the "msr [cs]psr, rN" instruction Patch from Catalin Marinas Gas translates the "msr [cs]psr, rN" instruction to "msr [cs]psr_cf, rN". This may cause problems on the ARMv6 architecture where the A and E bits can leak into the SVC mode from the USR mode via the exception handlers. The reverse can happen when returning to user mode. The patch adds _cxsf to all the msr instruction without the field specifier. ChangeSet@1.1884.3.1, 2004-08-05 20:51:47+01:00, catalin.marinas@com.rmk.(none) [ARM PATCH] 1964/1: Wrong cache block operations checking Patch from Catalin Marinas The "err" is rotated in the blockops_check() function and all the error bits are cleared, the subsequent conditions being always true. ChangeSet@1.1884.2.3, 2004-08-05 12:13:29-07:00, axboe@suse.de [PATCH] multipath readahead fix For requests marked read-ahead, it can legitimately fail without it being a path problem. So don't fail a path just because this happens (can be the atomic request allocation going nuts, for instance), or all paths will quickly go away. Cc: Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1884.2.2, 2004-08-05 12:05:56-07:00, heiko.carstens@de.ibm.com [PATCH] md multipathing fixes I tried to get multipathing failover running and failed. It seems to be that there are two bugs in multipath.c : - If a path/request fails mp_bh->path doesn't get updated to the new path. Thus multipath_end_request will access a NULL pointer if a redirected request returns. - After fixing this I experienced several other errors. First of all in bio->bi_flags the BIO_UPTODATE flag is not set when redirecting a request. Causing the md driver to think that every redirected request failed when it returns. Since that alone didn't fix the problems, I simply copied the master_bio again and it looks like everything seems to work. Cc: Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1884.2.1, 2004-08-05 12:05:44-07:00, jmorris@redhat.com [PATCH] Drop asm i586 AES code. This patch reverts the i586 AES module. A new one should be ready soon. Signed-off-by: James Morris Signed-off-by: Linus Torvalds ChangeSet@1.1884.1.6, 2004-08-05 08:53:26-04:00, dwmw2@shinybook.infradead.org Merge shinybook.infradead.org:/home/dwmw2/bk/linus-2.5 into shinybook.infradead.org:/home/dwmw2/bk/mtd-2.6 ChangeSet@1.1898, 2004-08-04 16:18:09-07:00, davem@nuts.davemloft.net Cset exclude: davem@nuts.davemloft.net|ChangeSet|20040804202342|60209 ChangeSet@1.1897, 2004-08-04 13:58:33-07:00, davem@nuts.davemloft.net [PKT_SCHED]: Move sch_atm over to qdisc_priv(). Signed-off-by: David S. Miller ChangeSet@1.1896, 2004-08-04 13:40:06-07:00, shemminger@osdl.org [PKT_SCHED]: Cache align qdisc data. This patch has qdisc code use the same interface as the netdevice code to cache align the object private data. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1895, 2004-08-04 13:31:56-07:00, kaber@trash.net [PKT_SCHED]: Fix q_idx calculation in tc_dump_qdisc. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1894, 2004-08-04 13:30:46-07:00, kaber@trash.net [PKT_SCHED]: Use double-linked list for dev->qdisc_list Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1893, 2004-08-04 13:23:42-07:00, davem@nuts.davemloft.net [IPV4/6]: NULL out sk_sndmsg_{page,off} in flush_pending_frames not append_data. Signed-off-by: David S. Miller ChangeSet@1.1830.2.10, 2004-08-04 19:54:18+00:00, jbarnes@sgi.com generic_defconfig update. I just ran 'make oldconfig' against the existing one and turned on a few new options (some of which Altix needs). Signed-off-by: Jesse Barnes Signed-off-by: Tony Luck ChangeSet@1.1830.2.9, 2004-08-04 18:26:09+00:00, [alex.williamson@hp.com Using CONFIG_IA64_HP_ZX1 on an sx1000 system setup w/ multiple NUMA nodes (configured for cell local memory) currently crashes because MAX_NUMNODES defaults to 1. The patch below sets up things to make this work. Signed-off-by: Alex Williamson Signed-off-by: Tony Luck ChangeSet@1.1830.2.8, 2004-08-04 18:10:14+00:00, tony.luck@intel.com Provide comand line keyword "nomca" to turn off mca processing in kernel. Initial patch by Jesse Barnes, fixed by Ken Chen, rescued from obscurity by Sourav Sen. Signed-off-by: Tony Luck ChangeSet@1.1830.2.7, 2004-08-04 17:55:40+00:00, seto.hidetoshi@jp.fujitsu.com Set up CMC/CPE polling *before* enabling CMCI/CPEI interrupts to avoid situation where a flood of errors prevents boot. Signed-off-by: Hidetoshi Seto Signed-off-by: Tony Luck ChangeSet@1.1892, 2004-08-04 09:47:01-07:00, shemminger@osdl.org [BRIDGE]: rmmod device while bridge is down fails The changes to bridge notifier to handle link state changes introduced a bug. The case of device unregistering while bridge is down was no longer being handled. Add comment so maintainer doesn't forget. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1891, 2004-08-04 09:35:27-07:00, kaber@trash.net [PKT_SCHED]: Remove useless noop_qdisc assignments in destroy functions Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1890, 2004-08-04 09:33:23-07:00, kaber@trash.net [PKT_SCHED]: remove unneccessary checks for qdisc->dev Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1889, 2004-08-04 09:24:45-07:00, kaber@trash.net [PKT_SCHED]: Refcount qdisc->dev for __qdisc_destroy rcu-callback Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1888, 2004-08-04 09:23:36-07:00, kaber@trash.net [PKT_SCHED]: Fix locking in __qdisc_destroy rcu-callback Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1830.2.6, 2004-08-03 23:46:56+00:00, jbarnes@sgi.com sgi_io_init.c: Mark per_hub_init as __init and remove an unnecessary extern declaration of it in sgi_io_init.c. This has the effect of killing a warning in the compile of that file. Signed-off-by: Jesse Barnes Signed-off-by: Tony Luck ChangeSet@1.1830.2.5, 2004-08-03 23:27:28+00:00, bjorn.helgaas@hp.com sba_iommu.c: REO/Grande defect AR2305 can cause TLB fetch timeouts if entries are purged while in use. Round up IOVA allocations to power-of-two boundaries to prevent this. This is originally due to Alex Williamson. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck ChangeSet@1.1830.2.4, 2004-08-03 23:21:13+00:00, bjorn.helgaas@hp.com cyclone.h, cyclone.c, acpi.c, Kconfig: Make cyclone_setup() take no args, rather than an ignored "char *" and return void. Fix typos and whitespace. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck ChangeSet@1.1830.2.3, 2004-08-03 23:09:49+00:00, bjorn.helgaas@hp.com machvec.h: irq.c: Fix IRQ type in platform irq_to_vector functions. Should be "unsigned int", but some places were "u8". Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck ChangeSet@1.1886, 2004-08-03 14:13:23-07:00, shemminger@osdl.org [PKT_SCHED]: netem limit not returned correctly Minor leftover from earlier code. Netem scheduler is not reporting correct limit (ie for 'tc qdisc ls') because it is returning devices limit not it's own. Should apply to 2.4 as well (with fuzz) Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.1884.1.5, 2004-08-03 14:11:41-07:00, torvalds@ppc970.osdl.org Linux 2.6.8-rc3 TAG: v2.6.8-rc3