commit 49c13b51a15f1ba9f6d47e26e4a3886c4f3931e2 Merge: 492559a... cec9ad2... Author: Linus Torvalds Date: Tue Jul 17 11:50:26 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (80 commits) KVM: Use CPU_DYING for disabling virtualization KVM: Tune hotplug/suspend IPIs KVM: Keep track of which cpus have virtualization enabled SMP: Allow smp_call_function_single() to current cpu i386: Allow smp_call_function_single() to current cpu x86_64: Allow smp_call_function_single() to current cpu HOTPLUG: Adapt thermal throttle to CPU_DYING HOTPLUG: Adapt cpuset hotplug callback to CPU_DYING HOTPLUG: Add CPU_DYING notifier KVM: Clean up #includes KVM: Remove kvmfs in favor of the anonymous inodes source KVM: SVM: Reliably detect if SVM was disabled by BIOS KVM: VMX: Remove unnecessary code in vmx_tlb_flush() KVM: MMU: Fix Wrong tlb flush order KVM: VMX: Reinitialize the real-mode tss when entering real mode KVM: Avoid useless memory write when possible KVM: Fix x86 emulator writeback KVM: Add support for in-kernel pio handlers KVM: VMX: Fix interrupt checking on lightweight exit KVM: Adds support for in-kernel mmio handlers ... commit 492559af235eb56884d62553f191c0b5c4def990 Merge: d367675... 4f8de27... Author: Linus Torvalds Date: Tue Jul 17 11:31:57 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Clean away some code inside some non-existent CONFIG ifdefs [IA64] ar.itc access must really be after xtime_lock.sequence has been read [IA64] correctly count CPU objects in the ia64/sn hwperf interface [IA64] arbitary speed tty ioctl support [IA64] use machvec=dig on hpzx1 platforms commit d3676756968eef4a31da11be5addc4eec1b6db2c Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 atl1: missing include Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 27d41718157626e4509026c7dac247a659c0e71f Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 mark a bunch of ISA|EISA|PCI drivers as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 547c178b7237f586cbaac0246a112c502de32d64 Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 missing exports of csum_... Signed-off-by: Al Viro Acked-by: David S. Miller Acked-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 6d0fd9c9832005b754d7cd04bc8c0ce7ea035366 Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 um_kmalloc() remnants Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 7155c9f576fc8cff12448110b5d104096ba58aee Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 sparc32 has working dma-mapping only with CONFIG_PCI Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit d37c6e1b67e8d7f3c5fceba491dcb09a15cb7772 Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 saner typechecking in generic unaligned.h Verify that types would match for assignment (under sizeof, so we are safe from side effects or any code actually getting generated), then explicitly cast everywhere to the fixed-sized types. Kills a bunch of bogus warnings about constants being truncated (gcc, sparse), finds a pile of endianness problems hidden by old noise (sparse). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cc040a8a0e8ba95fbb0ae1edcb9ec83623b422e3 Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 alpha __init fixes __init and __initdata stuff used from __devinit one Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5072d5d58ef67bd7131d0be208ad1b6cd0631648 Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 alpha termios.h hadn't been updated ... fortunately, termios and ktermios there are identical, so no run-time breakage happened. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0ab7a252a52943786d6d12ad8032266841d68b8e Author: Al Viro Date: Tue Jul 17 08:49:35 2007 +0100 no USB on M32R Won't build due to lack of dma-mapping. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4ad1366376bfef32ec0ffa12d1faa483d6f330bd Author: NeilBrown Date: Tue Jul 17 04:06:13 2007 -0700 md: change bitmap_unplug and others to void functions bitmap_unplug only ever returns 0, so it may as well be void. Two callers try to print a message if it returns non-zero, but that message is already printed by bitmap_file_kick. write_page returns an error which is not consistently checked. It always causes BITMAP_WRITE_ERROR to be set on an error, and that can more conveniently be checked. When the return of write_page is checked, an error causes bitmap_file_kick to be called - so move that call into write_page - and protect against recursive calls into bitmap_file_kick. bitmap_update_sb returns an error that is never checked. So make these 'void' and be consistent about checking the bit. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0d76d70bc77b9b11256a3a23e98e80878be1578 Author: NeilBrown Date: Tue Jul 17 04:06:12 2007 -0700 md: check that internal bitmap does not overlap other data We current completely trust user-space to set up metadata describing an consistant array. In particlar, that the metadata, data, and bitmap do not overlap. But userspace can be buggy, and it is better to report an error than corrupt data. So put in some appropriate checks. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 713f6ab18b0e7d39f14401362bfe8015b1aedde1 Author: NeilBrown Date: Tue Jul 17 04:06:12 2007 -0700 md: improve the is_mddev_idle test fix Don't use 'unsigned' variable to track sync vs non-sync IO, as the only thing we want to do with them is a signed comparison, and fix up the comment which had become quite wrong. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df968c4e8d809deb2602fb0e8db758f26a4006b9 Author: NeilBrown Date: Tue Jul 17 04:06:11 2007 -0700 md: improve message about invalid superblock during autodetect People try to use raid auto-detect with version-1 superblocks (which is not supported) and get confused when they are told they have an invalid superblock. So be more explicit, and say it it is not a valid v0.90 superblock. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afd44034acdb54972923bb327bc9f984663ee78b Author: Jan Engelhardt Date: Tue Jul 17 04:06:11 2007 -0700 Use menuconfig objects II - MD Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c4a59fed41bdd4c30ce0999a87f30a812f29ee2 Author: Tony Lindgren Date: Tue Jul 17 04:06:09 2007 -0700 OMAP: add TI TWL92330/Menelaus Power Management chip driver Add Texas Instruments TWL92330/Menelaus Power Management chip driver. This includes voltage regulators, Dual slot memory card tranceivers and real-time clock(RTC). The support for RTC is integrated with this driver only; it is not separate module. Passes 'rtctest' on OMAP H4 EVM, other than lack of "periodic" (1/N second) IRQs. System wakeup alarms (from suspend-to-RAM) work too. The battery keeps the RTC active over power off, so once you set clock (rdate/ntpdate/etc, then "hwclock -w") then RTC_HCTOSYS at boot time will behave as expected. Cc: "Jean Delvare" Cc: "Tony Lindgren" Cc: "David Brownell" Signed-off-by: Trilok Soni Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 969529021a5c3df74ea8f10d329b2427e559a90f Author: Vovan888@gmail Date: Tue Jul 17 04:06:09 2007 -0700 OMAP: LCD panel support for the Siemens SX1 mobile phone - Add support for LCD panel on Siemens sx1 mobile phone. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 107cc64b7f3956e53e040307e5021abad6d4202a Author: Dirk Behme Date: Tue Jul 17 04:06:07 2007 -0700 OMAP: LCD panel support for the TI OMAP OSK board - Adds TFT LCD panel support for TI OMAP OSK board. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a6d6ab141b59de87b4637e7d75d1e9d5e55e0d4 Author: Imre Deak Date: Tue Jul 17 04:06:07 2007 -0700 OMAP: LCD panel support for the TI OMAP1510 Innovator board - Add TFT LCD panel spport for TI OMAP1510 Innovator EVM. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d64ca86e4b693feda63d4732e3a58dbc653c1970 Author: Imre Deak Date: Tue Jul 17 04:06:06 2007 -0700 OMAP: LCD panel support for the TI OMAP1610 Innovator board - Add TFT LCD panel spport for TI OMAP1610 Innovator EVM. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 769bde5f6b37a94d0bf96953075ebcfa12246334 Author: Marek Vasut Date: Tue Jul 17 04:06:06 2007 -0700 OMAP: LCD panel support for the Palm Zire71 - Adds support for TFT LCD panel on Palm Zire71 Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dba8e7b2d3628dc5d886321e5ac85e20a80352d8 Author: Marek Vasut Date: Tue Jul 17 04:06:05 2007 -0700 OMAP: LCD panel support for Palm Tungsten|T - Add TFT LCD panel support for Palm Tungsten|T Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9828a8897258088bfada93a6ec82803e98231159 Author: Romain Goyet Date: Tue Jul 17 04:06:04 2007 -0700 OMAP: LCD panel support for the Palm Tungsten E - Adds TFT LCD panel support for Palm Tungsten E. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65316c91eff2c9b8dd8e16cc83fb84f49a64813b Author: Imre Deak Date: Tue Jul 17 04:06:04 2007 -0700 OMAP: LCD panel support for the TI OMAP H3 board - Adds support for TFT LCD panel on TI OMAP H3 EVM board. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e493435bff76ee2a37fb474e289ad85052d677fa Author: Imre Deak Date: Tue Jul 17 04:06:03 2007 -0700 OMAP: LCD panel support for the TI OMAP H4 board - Adds support for TFT LCD panel on TI OMAP H4 EVM board. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d381b894d24d7642aec85df1cf281400ac87a18 Author: Imre Deak Date: Tue Jul 17 04:06:01 2007 -0700 OMAP: add external Epson Blizzard LCD controller support - Adds Epson Blizzard lcd controller driver; used in Nokia Internet Tablet products. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aae76ef13e348cebac225407ea2c452f8d0ff862 Author: Imre Deak Date: Sat May 26 19:19:19 2007 +0530 OMAP: add external Epson HWA742 LCD controller support - Adds Epson HWA742 lcd controller driver; used in Nokia Internet Tablet products. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5c125a0fc44e513c3d51d179cb8a9ccaf589b7b Author: Imre Deak Date: Tue Jul 17 04:05:59 2007 -0700 OMAP: add TI OMAP2 external LCD controller support - RFBI - Adds support for Texas Instruments OMAP2 processors boards connected with external LCD controller through "Remote framebuffer Interface" Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6b4573c563966f3b22aa07d2c7b554a551eb0dc Author: Imre Deak Date: Tue Jul 17 04:05:58 2007 -0700 OMAP: add TI OMAP1 external LCD controller support - SoSSI - Adds support for Texas Instruments OMAP1 processors boards connected with external LCD controller through "Special OptimiSed Screen Interface" Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a055fc222c239eedd7d27684e70e812550c83f0 Author: Imre Deak Date: Tue Jul 17 04:05:57 2007 -0700 OMAP: add TI OMAP2 internal display controller support. - Adds Texas Instruments OMAP2 processor series (OMAP2420/2430) internal display controller interface support. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 569755c706f0f94409edd2ae60b9878cb420844f Author: Imre Deak Date: Tue Jul 17 04:05:56 2007 -0700 OMAP: add TI OMAP1 internal LCD controller - Add Texas Instruments OMAP1 processor series (OMAP1510/1610/1710..) internal LCD controller interface. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe0e3a9df6372d357d3fdc4b6265a5417f1e84e8 Author: Imre Deak Date: Tue Jul 17 04:05:55 2007 -0700 OMAP: add TI OMAP1610 accelerator entry. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b08cf2b64f5a60594b07795b2ad518c6d044566 Author: Imre Deak Date: Tue Jul 17 04:05:54 2007 -0700 OMAP: add TI OMAP framebuffer driver - Add Texas Instruments OMAP framebuffer driver. This driver is being used for various OMAP1/2 series based boards and products e.g Nokia N800 Internet Tablet, H4, H3, Siemens SX1 etc. - LCD panel registration and controller code is separated in different file and interfaces. Signed-off-by: Trilok Soni Cc: Tony Lindgren Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57a3db98ac88854e20780e2337471323ba63bde2 Author: Adrian Bunk Date: Tue Jul 17 04:05:53 2007 -0700 drivers/video/macmodes.c:mac_find_mode() mustn't be __devinit If it's EXPORT_SYMBOL'ed it can't be __devinit. Reported by Mikael Pettersson. Signed-off-by: Adrian Bunk Cc: "Antonino A. Daplas" Cc: Michal Piotrowski Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bce9451310eb66fbbd77bf22e8160079700691f8 Author: Geert Uytterhoeven Date: Tue Jul 17 04:05:52 2007 -0700 Cell: Draw SPE helper penguin logos Let spu_management_ops.enumerate_spus() return the number of found SPEs and use that information to draw some little helper penguin logos. Signed-off-by: Geert Uytterhoeven Signed-off-by: Geoff Levand Acked-by: Arnd Bergmann Acked-By: James Simmons Cc: "Antonino A. Daplas" Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cca9a6cc580b504a2575d505ab072ebf0872e016 Author: Geert Uytterhoeven Date: Tue Jul 17 04:05:51 2007 -0700 fbdev: SPE helper penguin logo Add the SPE helper penguin logo Signed-off-by: Geert Uytterhoeven Signed-off-by: Geoff Levand Cc: Arnd Bergmann Acked-By: James Simmons Cc: "Antonino A. Daplas" Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9900abfb5e8192f0eafcd9b9dd5d54011e46c76c Author: Geert Uytterhoeven Date: Tue Jul 17 04:05:50 2007 -0700 fbdev: Add fb_append_extra_logo() Add fb_append_extra_logo(), to append extra lines of logos below the standard Linux logo. Signed-off-by: Geert Uytterhoeven Signed-off-by: Geoff Levand Acked-By: James Simmons Cc: "Antonino A. Daplas" Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90da63e54604fd515c17014a0a7f332a018a0a11 Author: Geert Uytterhoeven Date: Tue Jul 17 04:05:50 2007 -0700 fbdev: extract fb_show_logo_line() The Cell Broadband Engine contains a 64-bit PowerPC core with 2 hardware threads (called PPEs) and 8 Synergistic Processing Engines (called SPEs). When booting Linux, 2 penguins logos are shown on the graphical console by the standard frame buffer console logo code. To emphasize the existence of the SPEs (which can be used under Linux), we added a second row of (smaller) helper penguin logos, one for each SPE. A sample screenshot can be found at http://www.kernel.org/pub/linux/kernel/people/geoff/cell/debian-penguin-shot.png (or on the ps3linux T-shirts we wore at OLS :-) This patch: Extract the code to draw one line of logos into fb_show_logo_line() Signed-off-by: Geert Uytterhoeven Signed-off-by: Geoff Levand Acked-By: James Simmons Cc: "Antonino A. Daplas" Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6e8f00fcd56b426371334d722d1f3fb251b7290 Author: izumi Date: Tue Jul 17 04:05:49 2007 -0700 Fix the graphic corruption issue on IA64 machines VGA console driver can misunderstand the current mode(Text/Graphic) under "disable console blanking" setting. When "disable console blank" is set (blankinterval=0), "do_unblank_screen()" function returns without changing "blank_state", and when "blank_state" is "blank_off", "do_blank_screen() function returns without invoking sw->con_blank() function. That's why VGA console driver can misunderstand the current mode. Signed-off-by: Nobuhiro Tachino Signed-off-by: Taku Izumi Cc: "Antonino A. Daplas" Cc: "Luck, Tony" Acked-by: Pete Zaitcev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a3f28817e2a3f0be67ec8afa0cfd779adb5d41d Author: Paul Mundt Date: Tue Jul 17 04:05:48 2007 -0700 fb: epson1355fb: kill off dead sh support The SH board that was the only user for this code was removed entirely from the kernel quite some time ago, so there's no reason to leave the stubs in place. Additionally this driver was completely broken anyways, so there's not really a lot of point in fixing it up either. I can't imagine that this driver gets any testing on ARM either, given that FB_BLANK_UNBLANKING doesn't exist, and kills the build regardless of which platform is compiling. This fixes that, too. It wouldn't be a lot of work to finish the platform device conversion and go with a generic 8-bit read/write_reg and kill off the architecture dependence completely, should someone have any use for this driver. Signed-off-by: Paul Mundt Acked-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84650346b20c8f8af35e3773506102ff1680e887 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:47 2007 -0700 matroxfb: color setting fixes fix Remove more code that writes to cmap[16]. Signed-off-by: Antonino Daplas Acked-by: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3552f09a6ce0e42ccb67bf13ee9e4c31b080d6a3 Author: Adrian Bunk Date: Tue Jul 17 04:05:47 2007 -0700 vt8623fb.c: make code static This patch makes needlessly global code static. Signed-off-by: Adrian Bunk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b309c050cd8a705229085bff790ad532b3cdf819 Author: Adrian Bunk Date: Tue Jul 17 04:05:46 2007 -0700 pm3fb: possible cleanups - remove the empty pm3fb_setup() and corresponding code - pm3fb_init() can become static [adaplas] - retain call to fb_get_options() for global options Signed-off-by: Adrian Bunk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a58d67ce7d648f3a2512d6d044b5eab0c6f71253 Author: Krzysztof Helt Date: Tue Jul 17 04:05:46 2007 -0700 pm3fb: fillrect acceleration This is a port of accelerated fillrect function from the 2.4 kernel driver. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08a498de79727d63a011f2583e9aba4d3083c3a0 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:45 2007 -0700 matroxfb: color setting fixes - the pseudo_palette is only 16 elements long. - do not write to the pseudo_palette if regno (array index) is more than 15 - remove code that writes to the 17th entry of the pseudo_palette Signed-off-by: Antonino Daplas Acked-by: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 000d5335c6e7f5dbcd849b62b4be7ae005aa6974 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:44 2007 -0700 sisfb: fix pseudo_palette array size and overrun - the pseudo_palette is only 16 elements long. - do not write to the pseudo_palette if regno (array index) is more than 15. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c312f97df65bf38a8e7f664b76154639f593775d Author: Antonino A. Daplas Date: Tue Jul 17 04:05:44 2007 -0700 intelfb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 372166af0bd226322debf420a417524634a56abf Author: Antonino A. Daplas Date: Tue Jul 17 04:05:43 2007 -0700 i810fb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0e3ad444885b87d318f1b086284bed52e41cc4b Author: Antonino A. Daplas Date: Tue Jul 17 04:05:43 2007 -0700 radeonfb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59731f8acf7a83c0a195bef18325dddc5073ee7b Author: Antonino A. Daplas Date: Tue Jul 17 04:05:42 2007 -0700 atyfb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ce0e9a9213bfa2f77363d3eef4d15808473cbe5 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:42 2007 -0700 tx3912fb: fix improper assignment of info->pseudo_palette There is no variable pseudo_palette. Instead, there is u32 cfb8[16]. Use this for info->pseudo_palette. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 973d9ab231a6b9feb1ff5b9a072f11756eca96cc Author: Antonino A. Daplas Date: Tue Jul 17 04:05:41 2007 -0700 tridentfb: fix pseudo_palette array overrun in setcolreg The pseudo_palette has only 16 elements. Do not write if regno (the array index) is more than 15. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb3daa83c2f63743fb7597f620beac75e1ba5633 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:41 2007 -0700 tgafb: actually allocate memory for the pseudo_palette No memory allocation was done for the pseudo_palette. Allocate one for it. Signed-off-by: Antonino Daplas Acked-by: "Maciej W. Rozycki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9965f5b137f11a7dce01b2c32874a4875f024306 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:40 2007 -0700 sgivwfb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce303c076baad1b7d8d41d1b98c373843eb820cc Author: Antonino A. Daplas Date: Tue Jul 17 04:05:40 2007 -0700 q40fb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a66ad56eb2c9644717da4d7f05f971d6786145e3 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:39 2007 -0700 pvr2fb: fix pseudo_palette array overrun and typecast - the pseudo_palette has only 16 elements. Do not write if regno (the array index) is more than 15. - if using generic drawing libraries, the typecast of pseudo_palette is always u32 * Signed-off-by: Antonino Daplas Acked-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02c2c209c26ca452b2e688cdb0cb6bb4bc7cdf7f Author: Antonino A. Daplas Date: Tue Jul 17 04:05:38 2007 -0700 platinumfb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d01184c8db7f1aa9b10597b9f8071ecc5d7e12f8 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:38 2007 -0700 offb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Acked-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24fc72239ab5a2d26ebdd4f6950539e6120d1a54 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:37 2007 -0700 macfb: fix pseudo_palette size and overrun - the pseudo_palette is only 16 elements long. - do not write to the pseudo_palette if regno (array index) is more than 15. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9058be43cf9f32b6c636aa6954b4f1a6b22098f6 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:37 2007 -0700 gbefb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c771eba1fe7168d6f2cbc52efa55b3838bd05b05 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:36 2007 -0700 fm2fb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Acked-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a1b92793a0824d31f165fe3a97634dbb9a3ae18 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:36 2007 -0700 epson1355fb: color setting fixes - the pseudo_palette is only 16 elements long - allocate the pseudo_palette as part of epson1355_par Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7592181005261c3d90398375ab6922f56cdd2bad Author: Antonino A. Daplas Date: Tue Jul 17 04:05:35 2007 -0700 cyblafb: fix pseudo_palette array overrun in setcolreg The pseudo_palette has only 16 elements. Do not write if regno (the array index) is more than 15. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11494543a5775b4764d0172084092715a533a8ce Author: Antonino A. Daplas Date: Tue Jul 17 04:05:35 2007 -0700 controlfb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a17759c98c814520da653133ccfbb8d2c50cd6c Author: Antonino A. Daplas Date: Tue Jul 17 04:05:34 2007 -0700 68328fb: the pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7269dd2b97b9aedb64e15fdec5575345d091925 Author: Jesse Barnes Date: Tue Jul 17 04:05:34 2007 -0700 vt: add comment for unbind_con_driver() - add comment for unbind_con_driver(). - bind_con_driver() is made private again Signed-off-by: Jesse Barnes Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfafca8067c6defbaeb28cb898b7b3f8abdfe20d Author: Jesse Barnes Date: Tue Jul 17 04:05:33 2007 -0700 fbdev: fbcon: console unregistration from unregister_framebuffer This allows for proper console unregistration via the VT layer, and updates the FB layer to use it. This makes debugging new console drivers much easier, since you can properly clean them up before unloading. [adaplas] unregister_framebuffer() is typically called as part of the driver's module_exit(). Doing so otherwise will freeze the machine as the VT layer is holding reference counts on fbcon, and fbcon on the driver. With this change, it allows unregister_framebuffer() to be called safely anywhere as needed. Additions from the original: If multiple drivers are used by fbcon, and if one of them unregisters, a driver will take over the consoles vacated by the outgoing one (via set_con2fb_map). Once only the outgoing driver remains, then fbcon will unbind from the VT layer (if CONFIG_HW_CONSOLE_UNBINDING is set to y). It is important that these drivers implement fb_open() and fb_release() just to ensure that no other process is using the driver. Likewise, these drivers _must_ check the return value of unregister_framebuffer(). [akpm@linux-foundation.org: make fbcon_unbind() stub inline] Signed-off-by: Jesse Barnes Signed-off-by: Antonino Daplas Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afd1db1632c3f8f95cbc2786bfa122cead79db58 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:32 2007 -0700 fbcon: Revise primary device selection Use set_con2fb_map() to select the primary display driver instead of using unbind_con_driver() and bind_con_driver(). Using the former is much simpler and safer than the current one. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1baa4ffa677bf6986c460fcfd4cdaf8bfe66f0e Author: Antonino A. Daplas Date: Tue Jul 17 04:05:32 2007 -0700 fbcon: set_con2fb_map fixes set_con2fb_map() has regressed for some time. Using fbcon=map:01, for example, works only if there is only 1 working framebuffer. Trying to do a set_con2fb_map() on a non-allocated vc will freeze the system. - ensure that succeeding drivers after the first gets mapped to the console - remove fbcon_preset_display() and modify fbcon_set_display() to include the former's functionality - ensure that binding and unbinding succeeds if multiple drivers are mapped to the console Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f7bb99fc9eb7a3d3840dc0a507049b7be1daba8 Author: Krzysztof Helt Date: Tue Jul 17 04:05:31 2007 -0700 pm2fb: white spaces clean up This patch removes trailing spaces and tabs and spaces before tabs. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac1ae162c9c400d63e62d9f2878be968b10ceaab Author: Antonino A. Daplas Date: Tue Jul 17 04:05:30 2007 -0700 nvidiafb: Add proper support for Geforce 7600 chipset Add proper support for the Geforce 7600 (device id 0x039x). This also sync's nvidiafb with the latest Xorg nv driver. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5f2f4d1a6d7efde39cfb5e1d034981c69f2214c Author: Stephan Wolf Date: Tue Jul 17 04:05:29 2007 -0700 radeonfb: Add support for Radeon Xpress 200M (RS485) Add PCI ids for the Radeon Xpress 200M (RS485). Signed-off-by: Antonino Daplas Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 623e71b035cb5271028500720b3622ba76db42bb Author: Antonino A. Daplas Date: Tue Jul 17 04:05:28 2007 -0700 fbcon: allow fbcon to use the primary display driver Allow fbcon to select the primary display adapter using the fb_is_primary_device() arch-specific helper. If a a primary adapter is detected, fbcon will unbind the old adapter from the VT layer, then rebind using the new adapter. This requires that bind_/unbind_con_driver() be made public. Because this feature may produce unexpected behavior (from the user's POV), this must be explicitly enabled in Kconfig. [akpm@linux-foundation.org: export unbind_con_driver] Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 317b3c2167f5326a7de30a1abe50c9897da7a0e3 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:28 2007 -0700 fbdev: detect primary display device Add function helper, fb_is_primary_device(). Given struct fb_info, it will return a nonzero value if the device is the primary display. Currently, only the i386 is supported where the function checks for the IORESOURCE_ROM_SHADOW flag. Signed-off-by: Antonino Daplas Cc: David Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10eb2659cc6059d0c4de2e2c66d1534091519f56 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:27 2007 -0700 fbdev: move arch-specific bits to their respective subdirectories Move arch-specific bits of fb_mmap() to their respective subdirectories [bob.picco@hp.com: efi_range_is_wc is referenced but not declared] [bunk@stusta.de: fix include/asm-m68k/fb.h] Signed-off-by: Antonino Daplas Acked-by: David S. Miller Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c6c1ce079082ddde9ba5636c352c235cd395aa1 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:26 2007 -0700 fbcon: use struct device instead of struct class_device Port fbcon.c to use struct device from using struct class_device Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acba9cd01974353294ecd0c750581a6707d1ebe1 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:26 2007 -0700 fbcon: cursor blink control Add sysfs attribute to enable or disable cursor blinking. This will also disable cursor blinking if the VT layer's softcursor is active. These changes are required to enable some machines to enter low-power states properly. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01b15bd4bfae794246c047b961a282e19014e240 Author: Antonino A. Daplas Date: Tue Jul 17 04:05:25 2007 -0700 nvidiafb: adjust flags to take advantage of new scroll method The SCROLL_MOVE method has been optimized such that it is significantly faster than SCROLL_REDRAW. Adjust flags to indicate that blitting is preferred over rendering. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bad07ff74c32829defce8c83d7ff6ea69c329441 Author: Krzysztof Helt Date: Tue Jul 17 04:05:25 2007 -0700 fbcon: smart blitter usage for scrolling This patch replaces the current SCROLL_MOVE method with smarter method using the same logic as the SCROLL_REDRAW method. This brings these two methods much closer in performance and benefits all framebuffers which uses the SCROLL_MOVE method. [adaplas] - remove unnecessary char attribute checking - whitespace cleanups and 80-column line fixes Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d2b56c69c400dfc1a878966efa2b4a4a797a855 Author: Alan Cox Date: Tue Jul 17 04:05:24 2007 -0700 stallion: remove unneeded lock_kernel Signed-off-by: Alan Cox Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b306122df9f9dbec7751133073b4d19b9197d22e Author: Ingo Korb Date: Tue Jul 17 04:05:23 2007 -0700 Char: istallion, init+locking fixes Move brdp->iosize assignment in stli_initecp up a few lines to stop the driver from requesting an I/O region of length 0. Remove spin_lock_irqsave/spin_unlock_irqrestore from __stli_sendcmd as all users of that function take the lock already. Signed-off-by: Ingo Korb Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 186797ce330867b4c3609e503d2fee2fc6940954 Author: Jiri Slaby Date: Tue Jul 17 04:05:22 2007 -0700 Char: stallion, remove user class report request stallion, remove user class report request Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b3929a2dae865de7b59f5d802f3a15ca70726ce Author: Jiri Slaby Date: Tue Jul 17 04:05:22 2007 -0700 Char: Kconfig, mxser_new: remove experimental comment Kconfig, mxser_new: remove experimental comment Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f11541b505464ec5105302910453ac4ad065fc6 Author: Jiri Slaby Date: Tue Jul 17 04:05:21 2007 -0700 Char: vt, use ARRAY_SIZE vt, use ARRAY_SIZE Signed-off-by: Jiri Slaby Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1152934c6339453f8bc365f449071d03796d411 Author: Jiri Slaby Date: Tue Jul 17 04:05:21 2007 -0700 Char: vt, use kzalloc vt, use kzalloc Signed-off-by: Jiri Slaby Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4ebd9277705904aea25937c9a2d347c88c063c8 Author: Jiri Slaby Date: Tue Jul 17 04:05:20 2007 -0700 Char: riscom8, eliminate busy loop riscom8, eliminate busy loop Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e98cee717fb8e9f4ff15a70e357927c5f3c7793 Author: Jiri Slaby Date: Tue Jul 17 04:05:19 2007 -0700 Char: specialix, remove busy waiting use msleep instead, because not in atomic Cc: Roger Wolff Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24c032f1dd393c995545ecefa8c1585ae9ef6b37 Author: Jiri Slaby Date: Tue Jul 17 04:05:19 2007 -0700 Char: moxa, eliminate busy waiting blah, moxa delays 250+ ms in busy waiting, use msleep instead. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4969b3a43dd9e234b363f7bf52d0f6c4b6139eea Author: Jiri Slaby Date: Tue Jul 17 04:05:18 2007 -0700 Char: isicom, proper variables types irq is int, base is unsigned long Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e327325f4219e30476c775dbcd8651cd71b5416a Author: Jiri Slaby Date: Tue Jul 17 04:05:18 2007 -0700 Char: isicom, del_timer at exit Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b21f9dddd0817b761f1407f1950bee4f257411a Author: Jiri Slaby Date: Tue Jul 17 04:05:17 2007 -0700 Char: isicom, cleanup locking Don't spin processor when not needed (use sleep instead of delay). Don't release the lock when needed in next iteration -- this actually fixes a bug -- missing braces Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4923b4f13156455a9e84f0b918866aef300cc57 Author: Jiri Slaby Date: Tue Jul 17 04:05:17 2007 -0700 Char: cyclades, fix sparse warning cyclades, fix sparse warning Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 054f5b0aaa58dfc841635e52b6c1cc2b14ec37fc Author: Jiri Slaby Date: Tue Jul 17 04:05:16 2007 -0700 Char: cyclades, add firmware loading cyclades, add firmware loading Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf3a386c083c0cc4eb9f01a8818b9499ae56e73f Author: Adrian Bunk Date: Tue Jul 17 04:05:16 2007 -0700 remove options depending on OSS_OBSOLETE This patch contains the scheduled removal of options depending on OSS_OBSOLETE. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e32725c6ae8fa5345d9d095742e175ff4badd3b Author: Muli Ben-Yehuda Date: Tue Jul 17 04:05:15 2007 -0700 OSS trident: replace deprecated pci_find_device with pci_get_device Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b20b9b4e985fcc48b4eea401cb289a856422c93 Author: Muli Ben-Yehuda Date: Tue Jul 17 04:05:15 2007 -0700 OSS trident: fix locking around write_voice_regs trident_write_voice_regs() was getting called with the card spinlock held in only some cases. Fix it. Explanation: we allocate a new virtual channel in open, and then we frob some hardware registers (in write_voice_regs) for that channel. But the hardware registers are shared with other channels, which may be trying to frob the some registers (albeit for another channel) via ioctl(SNDCTL_DSP_SPEED). Fixed bugzilla.kernel.org bug #8172 (http://bugme.osdl.org/show_bug.cgi?id=8172) Signed-off-by: Muli Ben-Yehuda Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8f75b9183d613d3c29ea451a1cfb793daad5034 Author: Muli Ben-Yehuda Date: Tue Jul 17 04:05:13 2007 -0700 OSS trident: massive whitespace removal Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5b9068c1ef2ea760beb4962cf611b45bd303fb6 Author: David Brownell Date: Tue Jul 17 04:05:12 2007 -0700 csb337 supports "new style" rtc-ds1307 Update csb337 board specific init to support "new style" rtc-ds1307 code. Signed-off-by: David Brownell Cc: Andrew Victor Cc: Bill Gatliff Cc: Alessandro Zummo Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c065f35c17929067a367139d14e26897d60c7f6d Author: David Brownell Date: Tue Jul 17 04:05:10 2007 -0700 rtc-ds1307 becomes new-style i2c driver Convert the rtc-ds1307 driver into a "new style" driver. Also improve probe() checks: be more correct about switching out of AM/PM mode, and issue a (debug) diagnostic when failing due to bogus register values. Signed-off-by: David Brownell Cc: Andrew Victor Cc: Bill Gatliff Cc: Alessandro Zummo Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be5f59f4b67fbd4de26802a291bbcc2c623302b7 Author: Rodolfo Giometti Date: Tue Jul 17 04:05:06 2007 -0700 rtc-ds1307: oscillator restart for ds13{37,38,39,40} When we find a ds1337 or ds1339 with the oscillator powered off, turn it on. If the oscillator fault flag was set, clear it and warn that the clock needs to be set. David Brownell: Bugfixes; provide corresponding update for ds1338, and the core of the fix for ds1340. Use a common warning message ("SET TIME!") whenever the clock needs to be set after oscillator fault (or oscillator enable, if fault is not a separate status). Signed-off-by: Rodolfo Giometti Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 537739dee52cb9bb4f9ba080a59795d5c4c306ba Author: Thomas Bogendoerfer Date: Tue Jul 17 04:05:06 2007 -0700 RTC driver for DS1216 chips RTC driver for Dallas/Maxim DS126 chips used in SNI RM200/RM400 [akpm@linux-foundation.org: cleanups] Signed-off-by: Thomas Bogendoerfer Acked-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e774c7caf84455d5e7d492d123bad6f417818b5 Author: Mark Zhan Date: Tue Jul 17 04:05:05 2007 -0700 rtc: add support for the ST M48T59 RTC [akpm@linux-foundation.org: x86_64 build fix] [akpm@linux-foundation.org: The acpi guys changed the bin_attribute code] Signed-off-by: Mark Zhan Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 617780d290bd6eb2b260928c6acff5b7c6084154 Author: Atsushi Nemoto Date: Tue Jul 17 04:05:04 2007 -0700 rtc: watchdog support for rtc-m41t80 driver Add a watchdog driver interface to rtc-m41t80 driver. This is derived from works by Alexander Bigga Signed-off-by: Atsushi Nemoto Signed-off-by: Alexander Bigga Cc: David Brownell Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit caaff562e0ba44a7991ee8322fa4a6891d939757 Author: Atsushi Nemoto Date: Tue Jul 17 04:05:02 2007 -0700 rtc: add rtc-m41t80 driver This is a new-style i2c driver for ST M41T80 series RTC chip, derived from works by Alexander Bigga who wrote the original rtc-m41txx.c based on drivers/i2c/chips/m41t00.c driver. This driver supports M41T8[0-4] and M41ST8[457]. The old m41t00 driver supports M41T00, M41T81 and M41T85(M41ST85). While the M41T00 chip is now supported by rtc-ds1307 driver, this driver does not include support for the chip. [akpm@linux-foundation.org: remove bogus `static'] Signed-off-by: Atsushi Nemoto Signed-off-by: Alexander Bigga Acked-by: Mark A. Greer Cc: David Brownell Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5663c14b4f3e22aece38970f9765ceb090efbb8c Author: David Brownell Date: Tue Jul 17 04:05:02 2007 -0700 RTC Kconfig tweax Minor fix to the Kconfig for RTCs: don't display section headers for I2C or SPI unless they're configured. And depend on SPI_MASTER; having slave support wouldn't help. Signed-off-by: David Brownell Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c4e139ee9d5169ba75a1b918949d95323bc17ea Author: Alessandro Zummo Date: Tue Jul 17 04:05:01 2007 -0700 RTC_CLASS is no longer considered EXPERIMENTAL RTC class is mature enough. Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa04e78b2d44cb923177d7e6988ac32639beb2d0 Author: Hans-Christian Egtvedt Date: Tue Jul 17 04:05:00 2007 -0700 Driver for the Atmel on-chip RTC on AT32AP700x devices Tested on the AT32AP7000/ATSTK1000. Driver does only suport time, wake up and a very simple alarm, because of hardware limitations. Hardware documentation can be found in the AT32AP7000 data sheet, which can be downloaded from http://www.atmel.com/dyn/products/datasheets.asp?family_id=682 From: David Brownell - Strike some alarm setup code that's no longer needed. (This patch seems to have gotten lost somewhere...) - Make the driver name (and its module alias) match what the platform setup code uses, so the driver can bind and hotplug. [akpm@linux-foundation.org: fix several checkpatch.pl warnings] Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Haavard Skinnemoen Cc: Alessandro Zummo Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac495bf8971f2dc9d401d892849977e86633ced6 Author: Hans-Christian Egtvedt Date: Tue Jul 17 04:05:00 2007 -0700 rtc-dev: return -ENOTTY in ioctl if irq_set_freq is not implemented by driver Signed-off-by: Hans-Christian Egtvedt Cc: Haavard Skinnemoen Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a39a49c746adc08488b1403b5aeca1dbd4ce0e2 Author: Hans-Christian Egtvedt Date: Tue Jul 17 04:04:59 2007 -0700 rtc: make example code jump to done instead of return when ioctl not supported Signed-off-by: Hans-Christian Egtvedt Cc: Haavard Skinnemoen Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c00593f6f816e5cfa6d193a2561ca77541f71424 Author: Martin Michlmayr Date: Tue Jul 17 04:04:57 2007 -0700 Thecus N2100: register rtc-rs5c372 i2c device Use the new i2c framework to load rtc-rs5c372 for the Thecus N2100. Signed-off-by: Martin Michlmayr Tested-by: Voipio Riku Cc: Russell King Cc: Lennert Buytenhek Cc: Jean Delvare Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d815461c7a73903d0a926b3cace6f69e144c54a3 Author: David Brownell Date: Tue Jul 17 04:04:55 2007 -0700 rtc-rs5c372 becomes a new-style i2c driver Convert rtc-rs5c372 to be a "new style" I2C driver, and update the Kconfig text to be more complete.. Verified on an OMAP H4 development platform, along with a board init patch to declare its rv5c387a device. Only one defconfig -- powerpc/linkstation -- uses this driver; but several other platforms use it, just without defconfig support. Such platforms need to be converted so (a) their I2C adapter driver supports new-style drivers, and (b) board init code declares this I2C device. Signed-off-by: David Brownell Cc: Voipio Riku Acked-by: Guennadi Liakhovetski Cc: Martin Michlmayr Cc: Jean Delvare Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 045e0e85f2f6ee6621d8f7bab3059e9c74076738 Author: David Brownell Date: Tue Jul 17 04:04:55 2007 -0700 rtc-ds1307 cleanups This updates the rtc-ds1307 driver so that converting it to a "new style" driver (driver model, not legacy i2c model) will involve fewer changes. - Use pointer to i2c_client almost everywhere, so that it's easy to let the i2c core create that object; - Avoid using i2c_client.adapter, since that field is redundant and thus may go away (same object as i2c_client.dev.parent). - Extend type enum to include various RTCs this is expected to work with, and include register support for them. It also cleans up the support for multiple chip types, and fixes a glitch that could appear with an un-initialized RTC. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d91192e667ae34733b9daf6dd5f1d4496d2f441 Author: Josef 'Jeff' Sipek Date: Tue Jul 17 04:04:54 2007 -0700 eCryptfs: Move ecryptfs docs into Documentation/filesystems/ Signed-off-by: Josef 'Jeff' Sipek Acked-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c381bfcf0cd100a37cd969fa0d3aa758e13b5bcc Author: Mika Kukkonen Date: Tue Jul 17 04:04:53 2007 -0700 Couple fixes to fs/ecryptfs/inode.c Following was uncovered by compiling the kernel with '-W' flag: CC [M] fs/ecryptfs/inode.o fs/ecryptfs/inode.c: In function ‘ecryptfs_lookup’: fs/ecryptfs/inode.c:304: warning: comparison of unsigned expression < 0 is always false fs/ecryptfs/inode.c: In function ‘ecryptfs_symlink’: fs/ecryptfs/inode.c:486: warning: comparison of unsigned expression < 0 is always false Function ecryptfs_encode_filename() can return -ENOMEM, so change the variables to plain int, as in the first case the only real use actually expects int, and in latter case there is no use beoynd the error check. Signed-off-by: Mika Kukkonen Cc: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1269bc69b6649282091bb7007372acf4ab8357fd Author: J. Bruce Fields Date: Tue Jul 17 04:04:52 2007 -0700 knfsd: nfsd: enforce per-flavor id squashing Allow root squashing to vary per-pseudoflavor, so that you can (for example) allow root access only when sufficiently strong security is in use. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9091224f3cff4721f295df29e8a99705a63bc4c7 Author: J. Bruce Fields Date: Tue Jul 17 04:04:52 2007 -0700 knfsd: nfsd: allow auth_sys nlm on rpcsec_gss exports Our clients (like other clients, as far as I know) use only auth_sys for nlm, even when using rpcsec_gss for the main nfs operations. Administrators that want to deny non-kerberos-authenticated locking requests will need to turn off NFS protocol versions less than 4.... Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4796f45740bc6f2e3e6cc14e7ed481b38bd0bd39 Author: J. Bruce Fields Date: Tue Jul 17 04:04:51 2007 -0700 knfsd: nfsd4: secinfo handling without secinfo= option We could return some sort of error in the case where someone asks for secinfo on an export without the secinfo= option set--that'd be no worse than what we've been doing. But it's not really correct. So, hack up an approximate secinfo response in that case--it may not be complete, but it'll tell the client at least one acceptable security flavor. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcb488a3b7ac3987e21148f44f641c9b2e734232 Author: Andy Adamson Date: Tue Jul 17 04:04:51 2007 -0700 knfsd: nfsd4: implement secinfo Implement the secinfo operation. (Thanks to Usha Ketineni wrote an earlier version of this support.) Cc: Usha Ketineni Signed-off-by: Andy Adamson Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae4c40b1d81f5299c04330306736b2f0f0539f4b Author: Usha Ketineni Date: Tue Jul 17 04:04:50 2007 -0700 knfsd: rpc: add gss krb5 and spkm3 oid values Adds oid values to the gss_api mechanism structures. On the NFSV4 server side, these are required as part of the security triple (oid,qop,service) information being sent in the response of the SECINFO operation. Signed-off-by: Usha Ketineni Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91fe39d35ebd6adaece4e090f6b1a3e4b6a59c97 Author: J. Bruce Fields Date: Tue Jul 17 04:04:49 2007 -0700 knfsd: nfsd: display export secinfo information Add secinfo information to the display in proc/net/sunrpc/nfsd.export/content. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac34cdb03dfdb8cdc824f41f577434c5c2521155 Author: J. Bruce Fields Date: Tue Jul 17 04:04:49 2007 -0700 knfsd: nfsd: factor out code from show_expflags Factor out some code to be shared by secinfo display code. Remove some unnecessary conditional printing of commas where we know the condition is true. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ec757df9743025f14190d6034d8bd2bf37c2dd1 Author: J. Bruce Fields Date: Tue Jul 17 04:04:48 2007 -0700 knfsd: nfsd4: make readonly access depend on pseudoflavor Allow readonly access to vary depending on the pseudoflavor, using the flag passed with each pseudoflavor in the export downcall. The rest of the flags are ignored for now, though some day we might also allow id squashing to vary based on the flavor. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32c1eb0cd7ee00b5eb7b6f7059c635fbc1052966 Author: Andy Adamson Date: Tue Jul 17 04:04:48 2007 -0700 knfsd: nfsd4: return nfserr_wrongsec Make the first actual use of the secinfo information by using it to return nfserr_wrongsec when an export is found that doesn't allow the flavor used on this request. Signed-off-by: J. Bruce Fields Signed-off-by: Andy Adamson Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c0a654dceaa4342270306de77eadb0173dfb58a Author: J. Bruce Fields Date: Tue Jul 17 04:04:47 2007 -0700 knfsd: nfsd: factor nfsd_lookup into 2 pieces Factor nfsd_lookup into nfsd_lookup_dentry, which finds the right dentry and export, and a second part which composes the filehandle (and which will later check the security flavor on the new export). No change in behavior. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ea2209f073dc7049bd285b4f5dbc0aa273f9746 Author: J. Bruce Fields Date: Tue Jul 17 04:04:46 2007 -0700 knfsd: nfsd: use ip-address-based domain in secinfo case With this patch, we fall back on using the gss/pseudoflavor only if we fail to find a matching auth_unix export that has a secinfo list. As long as sec= options aren't used, there's still no change in behavior here (except possibly for some additional auth_unix cache lookups, whose results will be ignored). The sec= option, however, is not actually enforced yet; later patches will add the necessary checks. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ab4d8b1215d61736e2a9a26bea7cc2e6b029e3d Author: J. Bruce Fields Date: Tue Jul 17 04:04:46 2007 -0700 knfsd: nfsd: set rq_client to ip-address-determined-domain We want it to be possible for users to restrict exports both by IP address and by pseudoflavor. The pseudoflavor information has previously been passed using special auth_domains stored in the rq_client field. After the preceding patch that stored the pseudoflavor in rq_pflavor, that's now superfluous; so now we use rq_client for the ip information, as auth_null and auth_unix do. However, we keep around the special auth_domain in the rq_gssclient field for backwards compatibility purposes, so we can still do upcalls using the old "gss/pseudoflavor" auth_domain if upcalls using the unix domain to give us an appropriate export. This allows us to continue supporting old mountd. In fact, for this first patch, we always use the "gss/pseudoflavor" auth_domain (and only it) if it is available; thus rq_client is ignored in the auth_gss case, and this patch on its own makes no change in behavior; that will be left to later patches. Note on idmap: I'm almost tempted to just replace the auth_domain in the idmap upcall by a dummy value--no version of idmapd has ever used it, and it's unlikely anyone really wants to perform idmapping differently depending on the where the client is (they may want to perform *credential* mapping differently, but that's a different matter--the idmapper just handles id's used in getattr and setattr). But I'm updating the idmapd code anyway, just out of general backwards-compatibility paranoia. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0989a7889695831e49e2c53c1884f52645516a90 Author: J. Bruce Fields Date: Tue Jul 17 04:04:44 2007 -0700 knfsd: nfsd: provide export lookup wrappers which take a svc_rqst Split the callers of exp_get_by_name(), exp_find(), and exp_parent() into those that are processing requests and those that are doing other stuff (like looking up filehandles for mountd). No change in behavior, just a (fairly pointless, on its own) cleanup. (Note this has the effect of making nfsd_cross_mnt() pass rqstp->rq_client instead of exp->ex_client into exp_find_by_name(). However, the two should have the same value at this point.) Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87548c37c8bdbf98aea002c9c04e4dc8aa27fe1b Author: J. Bruce Fields Date: Tue Jul 17 04:04:44 2007 -0700 knfsd: nfsd: remove superfluous assignment from nfsd_lookup The "err" variable will only be used in the final return, which always happens after either the preceding err = fh_compose(...); or after the following err = nfserrno(host_err); So the earlier assignment to err is ignored. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df547efb03e3e8f9ea726e1d07fbbd6fd0706cd7 Author: J. Bruce Fields Date: Tue Jul 17 04:04:43 2007 -0700 knfsd: nfsd4: simplify exp_pseudoroot arguments We're passing three arguments to exp_pseudoroot, two of which are just fields of the svc_rqst. Soon we'll want to pass in a third field as well. So let's just give up and pass in the whole struct svc_rqst. Also sneak in some minor style cleanups while we're at it. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e677bfe4d451f8271986a229270c6eecd1f62b3f Author: Andy Adamson Date: Tue Jul 17 04:04:42 2007 -0700 knfsd: nfsd4: parse secinfo information in exports downcall We add a list of pseudoflavors to each export downcall, which will be used both as a list of security flavors allowed on that export, and (in the order given) as the list of pseudoflavors to return on secinfo calls. This patch parses the new downcall information and adds it to the export structure, but doesn't use it for anything yet. Signed-off-by: J. Bruce Fields Signed-off-by: Andy Adamson Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4170583f655dca5da32bd14173d6a93805fc48b Author: Andy Adamson Date: Tue Jul 17 04:04:42 2007 -0700 knfsd: nfsd4: store pseudoflavor in request Add a new field to the svc_rqst structure to record the pseudoflavor that the request was made with. For now we record the pseudoflavor but don't use it for anything. Signed-off-by: Andy Adamson Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42ed95c4e7415714aaab604ae7b1602b87b27b73 Author: J. Bruce Fields Date: Tue Jul 17 04:04:41 2007 -0700 knfsd: nfsd4: build rpcsec_gss whenever nfsd4 is built Select rpcsec_gss support whenever asked for NFSv4 support. The rfc actually requires gss, and gss is also the main reason to migrate to v4. We already do this on the client side. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d3bb25209c1f9a27ea9535c7fd2f6729a5e7db1 Author: J. Bruce Fields Date: Tue Jul 17 04:04:40 2007 -0700 knfsd: nfsd: make all exp_finding functions return -errno's on err Currently exp_find(), exp_get_by_name(), and friends, return an export on success, and on failure return: errors -EAGAIN (drop this request pending an upcall) or -ETIMEDOUT (an upcall has timed out), or return NULL, which can mean either that there was a memory allocation failure, or that an export was not found, or that a passed-in export lacks an auth_domain. Many callers seem to assume that NULL means that an export was not found, which may lead to bugs in the case of a memory allocation failure. Modify these functions to distinguish between the two NULL cases by returning either -ENOENT or -ENOMEM. They now never return NULL. We get to simplify some code in the process. We return -ENOENT in the case of a missing auth_domain. This case should probably be removed (or converted to a bug) after confirming that it can never happen. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47f9940c55c0bdc65188749cae4e841601f513bb Author: Meelap Shah Date: Tue Jul 17 04:04:40 2007 -0700 knfsd: nfsd4: don't delegate files that have had conflicts One more incremental delegation policy improvement: don't give out a delegation on a file if conflicting access has previously required that a delegation be revoked on that file. (In practice we'll forget about the conflict when the struct nfs4_file is removed on close, so this is of limited use for now, though it should at least solve a temporary problem with self-conflicts on write opens from the same client.) Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2f1a551dea8b37c2e0cb886885c250fb703e9d8 Author: Meelap Shah Date: Tue Jul 17 04:04:39 2007 -0700 knfsd: nfsd4: vary maximum delegation limit based on RAM size Our original NFSv4 delegation policy was to give out a read delegation on any open when it was possible to. Since the lifetime of a delegation isn't limited to that of an open, a client may quite reasonably hang on to a delegation as long as it has the inode cached. This becomes an obvious problem the first time a client's inode cache approaches the size of the server's total memory. Our first quick solution was to add a hard-coded limit. This patch makes a mild incremental improvement by varying that limit according to the server's total memory size, allowing at most 4 delegations per megabyte of RAM. My quick back-of-the-envelope calculation finds that in the worst case (where every delegation is for a different inode), a delegation could take about 1.5K, which would make the worst case usage about 6% of memory. The new limit works out to be about the same as the old on a 1-gig server. [akpm@linux-foundation.org: Don't needlessly bloat vmlinux] [akpm@linux-foundation.org: Make it right for highmem machines] Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e5140279f31e47d58ed6036ee61ba7a65710e63 Author: J. Bruce Fields Date: Tue Jul 17 04:04:38 2007 -0700 knfsd: nfsd: remove unused header interface.h It looks like Al Viro gutted this header file five years ago and it hasn't been touched since. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b2ca38ad6c44ed0442092a829e6e954bf3580af Author: J. Bruce Fields Date: Tue Jul 17 04:04:37 2007 -0700 knfsd: nfsd4: fix handling of acl errrors nfs4_acl_nfsv4_to_posix() returns an error and returns any posix acls calculated in two caller-provided pointers. It was setting these pointers to -errno in some error cases, resulting in nfsd4_set_nfs4_acl() calling posix_acl_release() with a -errno as an argument. Fix both the caller and the callee, by modifying nfsd4_set_nfs4_acl() to stop relying on the passed-in-pointers being left as NULL in the error case, and by modifying nfs4_acl_nfsv4_to_posix() to stop returning garbage in those pointers. Thanks to Alex Soule for reporting the bug. Signed-off-by: "J. Bruce Fields" Cc: Alexander Soule Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ac68d17996eb421dde51452b89d5545ba07c6fe Author: Benny Halevy Date: Tue Jul 17 04:04:37 2007 -0700 knfsd: nfsd4: fix enc_stateid_sz for nfsd callbacks enc_stateid_sz should be given in u32 words units, not bytes, so we were overestimating the buffer space needed here. Signed-off-by: Benny Halevy Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7fede4b27bfc6c987d6da8e40384b1b098830bb Author: J. Bruce Fields Date: Tue Jul 17 04:04:36 2007 -0700 knfsd: nfsd4: silence a compiler warning in ACL code Silence a compiler warning in the ACL code, and add a comment making clear the initialization serves no other purpose. Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33a1060ae7dc671a0208b341bd454009625bb5a6 Author: J. Bruce Fields Date: Tue Jul 17 04:04:35 2007 -0700 knfsd: nfsd4: fix NFSv4 filehandle size units confusion NFS4_FHSIZE is measured in bytes, not 4-byte words, so much more space than necessary is being allocated for struct nfs4_cb_recall. I should have wondered why this structure was so much larger than it needed to be! Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a8db97e7756119689c93c431e8b8324080f5625 Author: Marc Eshel Date: Tue Jul 17 04:04:35 2007 -0700 knfsd: lockd: nfsd4: use same grace period for lockd and nfsd4 Both lockd and (in the nfsv4 case) nfsd enforce a "grace period" after reboot, during which clients may reclaim locks from the previous server instance, but may not acquire new locks. Currently the lockd and nfsd enforce grace periods of different lengths. This may cause problems when we reboot a server with both v2/v3 and v4 clients. For example, if the lockd grace period is shorter (as is likely the case), then a v3 client might acquire a new lock that conflicts with a lock already held (but not yet reclaimed) by a v4 client. This patch calculates a lease time that lockd and nfsd can both use. Signed-off-by: Marc Eshel Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12127498c8f5e479df15ee374a0932f5659df49e Author: Andrew Morton Date: Tue Jul 17 04:04:34 2007 -0700 nfsd warning fix gcc-4.3: fs/nfsd/nfsctl.c: In function 'write_getfs': fs/nfsd/nfsctl.c:248: warning: cast from pointer to integer of different size Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 019ab801cf32381b90cbe0144cc5695aed0e408c Author: Christoph Hellwig Date: Tue Jul 17 04:04:33 2007 -0700 knfsd: exportfs: split out reconnecting a dentry from find_exported_dentry There's a clear subfunctionality of reconnecting a given dentry to the main dentry tree in find_exported_dentry, that can be called both for the dentry we're looking for or it's parent directory. This patch splits the subfunctionality out into a separate helper to make the code more readable and document it's intent. As a nice side-optimization we can avoid getting a superfluous dentry reference count in the case we need to reconnect a directory on it's own. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd90b50906db2c03e236e046f2fc7f7290efe4b4 Author: Christoph Hellwig Date: Tue Jul 17 04:04:32 2007 -0700 knfsd: exportfs: add find_disconnected_root helper Break the loop that finds the root of a disconnected subtree into a helper of its own to make reading easier and document the intent. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb66a1989c8abc3015aa334f617658b277e5fe98 Author: Christoph Hellwig Date: Tue Jul 17 04:04:32 2007 -0700 knfsd: exportfs: move acceptable check into find_acceptable_alias All callers of find_acceptable_alias check if the current dentry is acceptable before looking for other acceptable aliases using find_acceptable_alias. Move the check into find_acceptable_alias to make the code a little more dense and add a comment to find_acceptable_alias that documents its intent. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7dd618a5901ce0b44ef518208b35f728775db74 Author: Christoph Hellwig Date: Tue Jul 17 04:04:31 2007 -0700 knfsd: exportfs: untangle ISDIR logic in find_exported_dentry Rework some logic in find_exported_dentry so that we only have a single S_ISDIR check and logic that makes clear to the reader what we're really doing here. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10f11c341da8c0ec6b8b024e892108a6537ba8c4 Author: Christoph Hellwig Date: Tue Jul 17 04:04:31 2007 -0700 knfsd: exportfs: remove CALL macro Currently exportfs uses a way to call methods very differently from the rest of the kernel. This patch changes it to the standard conventions for method calls. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d37065cd6d6bbe98fd4be14d6c9e64c0bfa124c5 Author: Christoph Hellwig Date: Tue Jul 17 04:04:30 2007 -0700 knfsd: exportfs: add procedural interface for NFSD Currently NFSD calls directly into filesystems through the export_operations structure. I plan to change this interface in various ways in later patches, and want to avoid the export of the default operations to NFSD, so this patch adds two simple exportfs_encode_fh/exportfs_decode_fh helpers for NFSD to call instead of poking into exportfs guts. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ca29607331fe37980dc3b488793ef8b1409b722 Author: Christoph Hellwig Date: Tue Jul 17 04:04:29 2007 -0700 knfsd: exportfs: remove iget abuse When the exportfs interface was added the expectation was that filesystems provide an operation to convert from a file handle to an inode/dentry, but it kept a backwards compat option that still calls into iget. Calling into iget from non-filesystem code is very bad, because it gives too little information to filesystem, and simply crashes if the filesystem doesn't implement the ->read_inode routine. Fortunately there are only two filesystems left using this fallback: efs and jfs. This patch moves a copy of export_iget to each of those to implement the get_dentry method. While this is a temporary increase of lines of code in the kernel it allows for a much cleaner interface and important code restructuring in later patches. [akpm@linux-foundation.org: add jfs_get_inode_flags() declaration] Signed-off-by: Dave Kleikamp Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a569425512253992cc64ebf8b6d00a62f986db3e Author: Christoph Hellwig Date: Tue Jul 17 04:04:28 2007 -0700 knfsd: exportfs: add exportfs.h header currently the export_operation structure and helpers related to it are in fs.h. fs.h is already far too large and there are very few places needing the export bits, so split them off into a separate header. [akpm@linux-foundation.org: fix cifs build] Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Cc: Steven French Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6dd4ac3b30b81b5bd0d628af1c89b7da689a38ea Author: Vasily Averin Date: Tue Jul 17 04:04:27 2007 -0700 i2o debug output cleanup Fix output of i2o debug messages, extra KERN_ are removed. Signed-off-by: Vasily Averin Acked-by: Alan Cox Cc: Markus Lidel Acked-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44aaa9384faf68717cf3828dce6f8171a0a5d7bf Author: Vasily Averin Date: Tue Jul 17 04:04:27 2007 -0700 i2o proc reading oops Fix oops on reading from some i2o proc files (i2o_seq_show_driver_store() and other) because their handlers uses "exec" field in struct i2o_controller Signed-off-by: Vasily Averin Acked-by: Alan Cox Cc: Markus Lidel Acked-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d0fd333a1c2659fb0495894090d1146b239fd9a Author: Vasily Averin Date: Tue Jul 17 04:04:26 2007 -0700 i2o message leak in i2o_msg_post_wait_mem() We need to free i2o msg in case of error. Signed-off-by: Vasily Averin Acked-by: Alan Cox Cc: Markus Lidel Acked-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 010904cbed3db3464213fbc602802cc6f53e56e1 Author: Vasily Averin Date: Tue Jul 17 04:04:25 2007 -0700 wrong memory access in i2o_block_device_lock() This patch fixes access to memory that has not been allocated: i2o_msg_get_wait() can returns errors different from I2O_QUEUE_EMPTY. But the result is checked only against this code. If it is not I2O_QUEUE_EMPTY then we dereference the error code as the pointer later. Signed-off-by: Vasily Averin Acked-by: Alan Cox Cc: Markus Lidel Acked-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1725d71d992f5947bdd5b4f9a30fe8a05571fe66 Author: Vasily Averin Date: Tue Jul 17 04:04:24 2007 -0700 i2o_cfg_passthru cleanup This patch fixes a number of issues in i2o_cfg_passthru{,32}: - i2o_msg_get_wait() return vaile is not checked; - i2o_message memory leaks on error paths; - infinite loop to sg_list_cleanup in passthru32 It's important issue because of i2o_cfg_passthru is used by raidutils for monitorig controllers state, and in case of memory shortage it leads to the node crash or disk IO stall. [akpm@linux-foundation.org: fix null-ptr deref] Signed-off-by: Vasily Averin Acked-by: Alan Cox Cc: Markus Lidel Acked-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2bf68a3699601bd3e53b4efce7f2d780e243aa35 Author: Armin Schindler Date: Tue Jul 17 04:04:23 2007 -0700 i4l: leak in eicon/idifunc.c coverity spotted a possible leak in the idifunc.c file (bug id #1252), in um_new_card(), if the diva_user_mode_idi_create_adapter() fails, we dont free the memory allocated for card Signed-off-by: Eric Sesterhenn Acked-by: Armin Schindler Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e6c20a93b700ba884a6bced498b2691e2dd821b Author: Andrew Morton Date: Tue Jul 17 04:04:22 2007 -0700 isdn/capi warning fixes drivers/isdn/capi/capi.c: In function 'handle_minor_send': drivers/isdn/capi/capi.c:552: warning: cast from pointer to integer of different size Of course, the code here might actually be buggy, in which case this patch should not be applied? Answer: No this field is ignored inside linux kernel.Yes this is ugly, but it's the CAPI spec for all OS. CAPI DATA_B3 Request/Indication CAPI Message has a mandatory field which represent the 32 bit buffer address of the payload data. In linux the payload data do not use a sperate buffer, data follows directely after the CAPI Message in the same skb and we use this assumption inside the drivers, so we can ignore this field. Inside the linux CAPI implemetation we never use this field, so it could also have no value, but since random data in a message is bad as well (e.g. displayed in CAPI traces) we set is to the most adequate value. Outside the kernel the capi20 library sets the correct addresses (there is an optional second field for 64 bit adresses for 64 bit systems, we do not use here). Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8cd2aba2d3fc065069a0c305ddca1d9397ed9092 Author: Jan Engelhardt Date: Tue Jul 17 04:04:21 2007 -0700 Use menuconfig objects: ISDN: CONFIG_CAPI_EICON Transform Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f28df7e4aef3a14bf87a561dbd43935ba6ae59b2 Author: Jan Engelhardt Date: Tue Jul 17 04:04:21 2007 -0700 Use menuconfig objects: ISDN: CONFIG_CAPI_AVM Transform Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df19434cc268e207d1beb4dc7be3420888faef09 Author: Jan Engelhardt Date: Tue Jul 17 04:04:20 2007 -0700 Use menuconfig objects: ISDN: CONFIG_ISDN_CAPI Transform "depends on" into a simpler if-endif block style dependency. Signed-off-by: Jan Engelhardt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf4d5f1d50e44d36d459344da3c8f226b3933aeb Author: Jan Engelhardt Date: Tue Jul 17 04:04:19 2007 -0700 Use menuconfig objects: ISDN: CONFIG_ISDN Transform Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c713f57ed5eb2e073de9d60ee1da25939966647e Author: Karsten Keil Date: Tue Jul 17 04:04:18 2007 -0700 sane irq initialization in sedlbauer hisax The interrupts schould be disabled until the driver is ready and the IRQ function was registered. Thanks to Bastian Friedrich and Thomas Voegtle for spotting this. Signed-off-by: Karsten Keil Signed-off-by: Bastian Friedrich Signed-off-by: Thomas Voegtle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b7c30292af56e64feaecdbe97da57918927b730 Author: Pavel Emelianov Date: Tue Jul 17 04:04:18 2007 -0700 Make ISDN CAPI use seq_list_xxx helpers The similar code exists here and is called capi_driver_get_idx(). Use generic helpers now and remember to convert list_head to struct capi_driver in .show callback. Signed-off-by: Pavel Emelianov Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6acee02712d0592dcd6120bc54d77c47cd2f6059 Author: David Woodhouse Date: Tue Jul 17 04:04:17 2007 -0700 Mismatching declarations of revision strings in HiSax The {l1,l2,l3,lli,tei}_revision strings in the HiSax driver are 'const', but have a mismatching declaration as 'extern char *' in config.c. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67837f232d6d55be99d6e0dec4ea9bb8112840cd Author: Matthias Kaehlcke Date: Tue Jul 17 04:04:16 2007 -0700 Use mutex instead of semaphore in CAPI 2.0 driver The CAPI 2.0 driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 940408289842677cfe9e053a6c423bf3fb922560 Author: Matthias Kaehlcke Date: Tue Jul 17 04:04:16 2007 -0700 use mutex instead of semaphore in SPI core/init code The SPI core/init code uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2cac67dd36626128e06e79fc7ca95d544dcdc67 Author: Atsushi Nemoto Date: Tue Jul 17 04:04:15 2007 -0700 spi_txx9 controller driver This is a driver for SPI controller built into TXx9 MIPS SoCs. This driver is derived from arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c. Signed-off-by: Atsushi Nemoto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccdc7bf925731ef37f0af95262d675b74544932f Author: Samuel Ortiz Date: Tue Jul 17 04:04:13 2007 -0700 SPI: omap2_mcspi driver Add OMAP24XX McSPI (Multichannel SPI) controller driver. This driver is tested very well under OMAP GIT tree with N800 - Nokia Internet Tablet, and some other OMAP2 boards. Recent updates included bugfixes, cleanups, speedups, and better conformance to the current SPI programming interface. This doesn't yet understand the third controller instance on the OMAP 2430. [david-b@pacbell.net: more minor cleanups to the omap2_mcspi driver] Signed-off-by: Juha Yrjölä Signed-off-by: Trilok Soni Signed-off-by: David Brownell Cc: Tony Lindgren Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f29ba280ecb46331c1f6842b094808af01131422 Author: Joakim Tjernlund Date: Tue Jul 17 04:04:12 2007 -0700 spi_mpc83xx.c: support QE enabled 83xx CPU's like mpc832x Quicc Engine enabled mpc83xx CPU's has a somewhat different HW interface to the SPI controller. This patch adds a qe_mode knob that sees to that needed adaptions are performed. Signed-off-by: Joakim Tjernlund Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae918c02d365c884bccb193960db41364868bb7b Author: Andrei Konovalov Date: Tue Jul 17 04:04:11 2007 -0700 SPI master driver for Xilinx virtex Simple SPI master driver for Xilinx SPI controller. No support for multiple masters. Not using level 1 drivers from EDK. [akpm@linux-foundation.org: uninlining] Signed-off-by: Yuri Frolov Signed-off-by: Andrei Konovalov Cc: Kumar Gala Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 447aef1a19135a69bfd725c33f7e753740cb8447 Author: Ben Dooks Date: Tue Jul 17 04:04:10 2007 -0700 SPI: tle620x power switch driver Add support for the Infineon TLE62x0 series of low-side driver chips, such as the TLE6220 or TLE6230. These can be viewed as output GPIOs specialized for power switching applications. The driver provides a userspace interface to those GPIOs, and to the switch status they provide. Signed-off-by: Ben Dooks Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da0abc275f029e0f52c5165de524bcf64e717703 Author: David Brownell Date: Tue Jul 17 04:04:09 2007 -0700 S3c24xx SPI controllers both select 'bitbang' Tweak Kconfig for the S3C24XX SPI controller drivers. Both use the bitbang framework; only one previously said that. Plus in this case "select" is the right way to manage that dependency, since folk will not know up front to enable bitbang in order to even see those S3C drivers in order to enable them. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit defbd3b4bbd9d85a68529f829f4ee39899c318dc Author: David Brownell Date: Tue Jul 17 04:04:08 2007 -0700 atmel_spi: don't always deselect chip between messages Update chipselect handling for atmel_spi: * Teach it how to leave chipselect active between messages; this helps various drivers work better. * Cope with at91rm0200 errata: nCS0 can't be managed with GPIOs. The MR.PCS value is now updated whenever a chipselect changes. (This requires SPI pinmux init for that controller to change, and also testing on rm9200; doesn't break at91sam9 or avr32.) * Fix minor glitches: spi_setup() must leave chipselects inactive, as must removal of the spi_device. Also tweak diagnostic messaging to be a bit more useful. Signed-off-by: David Brownell Acked-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8da0859a246838c81fe57d952b91d419e9c44179 Author: David Brownell Date: Tue Jul 17 04:04:07 2007 -0700 atmel_spi: minor updates Minor updates to atmel_spi: - DMA: * Comments to explain the DMA policies * Report any mapping errors from spi_transfer() * Remove extra loop for DMA mapping - Diagnostics: report minimum clock rate, if we need to reject a spi_setup() request because that rate is too low. Signed-off-by: David Brownell Acked-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 698ca47e8dba93f4b001b06b4c7037b09ac6eb09 Author: Clifford Wolf Date: Tue Jul 17 04:04:06 2007 -0700 spi_mpc83xx.c underclocking hotfix The MPC83xx SPI controller clock divider can divide the system clock by not more then 1024. The spi_mpc83xx driver does not check this and silently writes garbage to the SPI controller registers when asked to run at lower frequencies. I've tried to run the SPI on a 266MHz MPC8349E with 100kHz for debugging a bus problem and suddenly was confronted with a 2nd problem to debug.. ;-) The patch adds an additional check which avoids writing garbage to the SPI controller registers and warn the user about it. This might help others to avoid simmilar problems. Cc: Kumar Gala Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78961a5740374a8143f8fe120300f2ed160dd276 Author: Kaiwan N Billimoria Date: Tue Jul 17 04:04:05 2007 -0700 spi_lm70llp parport adapter driver This adds a driver for the LM70-LLP parport adapter, which is an eval board for the LM70 temperature sensor. For those without that board, it may be a simpler example of a parport-to-SPI adapter then spi_butterfly. Signed-off-by: Kaiwan N Billimoria Doc, coding style, and interface updates; build fixes. Minor rename. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4917d927809918f0070bd1077b41e3daf78643b2 Author: David Brownell Date: Tue Jul 17 04:04:04 2007 -0700 spidev compiler warning gone Get rid of annoying GCC warning on 32-bit platforms. drivers/spi/spidev.c: In function 'spidev_message': drivers/spi/spidev.c:184: warning: cast to pointer from integer of different size drivers/spi/spidev.c:216: warning: cast to pointer from integer of different size The trick is to add an extra cast using "ptrdiff_t" to convert the u64 to the correct size integer, and only then casting it into a "void *" pointer. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad241528c4919505afccb022acbab3eeb0db4d80 Author: Jan Nikitenko Date: Tue Jul 17 04:04:03 2007 -0700 CRC7 support Add CRC7 routines, used for example in MMC over SPI communication. Kerneldoc updates [akpm@linux-foundation.org: fix funny mix of const and non-const] Signed-off-by: Jan Nikitenko Signed-off-by: David Brownell Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c06e677aed0c86480b01faa894967daa8aa3568a Author: David Brownell Date: Tue Jul 17 04:04:03 2007 -0700 SPI: add 3wire mode flag Add a new spi->mode bit: SPI_3WIRE, for chips where the SI and SO signals are shared (and which are thus only half duplex). Update the LM70 driver to require support for that hardware mode from the controller. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dccd573bb02aa011a4a7146c02c409ac0bd722a0 Author: David Brownell Date: Tue Jul 17 04:04:02 2007 -0700 SPI controller drivers: check for unsupported modes Minor SPI controller driver updates: make the setup() methods reject spi->mode bits they don't support, by masking aginst the inverse of bits they *do* support. This insures against misbehavior later when new mode bits get added. Most controllers can't support SPI_LSB_FIRST; more handle SPI_CS_HIGH. Support for all four SPI clock/transfer modes is routine. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff294cba8a62fa8334b88692da6d48683900f015 Author: Dmitry Torokhov Date: Tue Jul 17 04:04:01 2007 -0700 IBMASM: must depend on CONFIG_INPUT IBMASM: must depend on CONFIG_INPUT The driver registers couple of input devices and therefore must depend on CONFIG_INPUT. Signed-off-by: Dmitry Torokhov Cc: Vernon Mauery Cc: Max Asbock Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8945495697d9f461d4c923e0ed26c0e309b0dffc Author: Dmitry Torokhov Date: Tue Jul 17 04:04:01 2007 -0700 IBMASM: miscellaneous fixes IBMASM: miscellaneous fixes Fix some minor issues, such as: - properly set up ID of keyboard device (was mixed up with mouse) - constify translation tables - change some variables to #defines - set up input device's parent to form proper sysfs hierarchy - minor formatting changes Signed-off-by: Dmitry Torokhov Cc: Vernon Mauery Cc: Max Asbock Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da6b9c92d12ee6594170d839e2e78043bd2af286 Author: Dmitry Torokhov Date: Tue Jul 17 04:04:00 2007 -0700 IBMASM: dont use extern in function declarations IBMASM: don't use extern in function declarations We normally don't use extern in function declarations located in header files. Signed-off-by: Dmitry Torokhov Cc: Vernon Mauery Cc: Max Asbock Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3110dc7a8660ea1617afac2a55e3d18ae6ce141b Author: Dmitry Torokhov Date: Tue Jul 17 04:03:58 2007 -0700 IBMASM: whitespace cleanup IBMASM: whitespace cleanup Signed-off-by: Dmitry Torokhov Cc: Vernon Mauery Cc: Max Asbock Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 567f3e422a9a155d7c7643148efb5bf959065d34 Author: Andrew Morton Date: Tue Jul 17 04:03:58 2007 -0700 x86_64: speedup touch_nmi_watchdog Avoid dirtying remote cpu's memory if it already has the correct value. Cc: Andi Kleen Cc: Konrad Rzeszutek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2890255b0ade497893d1e5e99f519b5c1d50f7d Author: Andrew Morton Date: Tue Jul 17 04:03:57 2007 -0700 i386: speedup touch_nmi_watchdog Avoid dirtying remote cpu's memory if it already has the correct value. Cc: Andi Kleen Cc: Konrad Rzeszutek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c978b935e81da9434342f0bc8263c6cfe1214ce Author: Konrad Rzeszutek Date: Tue Jul 17 04:03:56 2007 -0700 Inhibit NMI watchdog when Alt-SysRq-T operation is underway On large memory configuration with not so fast CPUs the NMI watchdog is triggered when memory addresses are being gathered and printed. The code paths for Alt-SysRq-t are sprinkled with touch_nmi_watchdog in various places but not in this routine (or in the loop that utilizes this function). The patch has been tested for regression on large CPU+memory configuration (128 logical CPUs + 224 GB) and 1,2,4,16-CPU sockets with various memory sizes (1,2,4,6,20). Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a41de48b81e61fbe260ae5031ebcb6f935f35fb Author: Alexey Dobriyan Date: Tue Jul 17 04:03:56 2007 -0700 Fix sparse false positives re BUG_ON(ptr) sparse now warns if one compares pointers with integers. However, there are false positives, like: fs/filesystems.c:72:2: warning: Using plain integer as NULL pointer Every time BUG_ON(ptr) is used, ptr is checked against integer zero. Avoid that and save ~70 false positives from allyesconfig run. mentioned by Al. Signed-off-by: Alexey Dobriyan Acked-by: Al Viro Acked-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13c22168b7276dffe49dc66675d5a78f6d288e0d Author: Oleg Nesterov Date: Tue Jul 17 04:03:55 2007 -0700 destroy_workqueue() can livelock Pointed out by Michal Schmidt . The bug was introduced in 2.6.22 by me. cleanup_workqueue_thread() does flush_cpu_workqueue(cwq) in a loop until ->worklist becomes empty. This is live-lockable, a re-niced caller can get CPU after wake_up() and insert a new barrier before the lower-priority cwq->thread has a chance to clear ->current_work. Change cleanup_workqueue_thread() to do flush_cpu_workqueue(cwq) only once. We can rely on the fact that run_workqueue() won't return until it flushes all works. So it is safe to call kthread_stop() after that, the "should stop" request won't be noticed until run_workqueue() returns. Signed-off-by: Oleg Nesterov Cc: Michal Schmidt Cc: Srivatsa Vaddagiri Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87a7defb0d4255d5aea2c5067813b26836127983 Author: Ananth N Mavinakayanahalli Date: Tue Jul 17 04:03:54 2007 -0700 Kprobes on select architectures no longer EXPERIMENTAL Based on usage and testing over the past couple of years, kprobes on i386, ia64, powerpc and x86_64 is no longer EXPERIMENTAL. This is a follow-up to Robert P.J. Day's patch making "Instrumentation support" non-EXPERIMENTAL: http://marc.info/?l=linux-kernel&m=118396955423812&w=2 Arch maintainers for sparc64, avr32 and s390 need to take a similar call. Signed-off-by: Ananth N Mavinakayanahalli Cc: Andi Kleen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b78cc9ac8602baafebb75a09025ffb17d1aebc2 Author: Jan Engelhardt Date: Tue Jul 17 04:03:53 2007 -0700 make timespec_equal() take const arguments Make arguments of timespec_equal() const struct timespec. Signed-off-by: Jan Engelhardt Cc: Thomas Gleixner Cc: john stultz Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9281acea6a3687ff0f262e0be31eac34895b95d7 Author: Tejun Heo Date: Tue Jul 17 04:03:51 2007 -0700 kallsyms: make KSYM_NAME_LEN include space for trailing '\0' KSYM_NAME_LEN is peculiar in that it does not include the space for the trailing '\0', forcing all users to use KSYM_NAME_LEN + 1 when allocating buffer. This is nonsense and error-prone. Moreover, when the caller forgets that it's very likely to subtly bite back by corrupting the stack because the last position of the buffer is always cleared to zero. This patch increments KSYM_NAME_LEN by one and updates code accordingly. * off-by-one bug in asm-powerpc/kprobes.h::kprobe_lookup_name() macro is fixed. * Where MODULE_NAME_LEN and KSYM_NAME_LEN were used together, MODULE_NAME_LEN was treated as if it didn't include space for the trailing '\0'. Fix it. Signed-off-by: Tejun Heo Acked-by: Paulo Marques Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b45d52797432bd6b5d9786dbda940eb8d0b9ed06 Author: Maciej W. Rozycki Date: Tue Jul 17 04:03:50 2007 -0700 sb1250-duart.c: SB1250 DUART serial support This is a driver for the SB1250 DUART, a dual serial port implementation included in the Broadcom family of SOCs descending from the SiByte SB1250 MIPS64 chip multiprocessor. It is a new implementation replacing the old-fashioned driver currently present in the linux-mips.org tree. It supports all the usual features one would expect from a(n asynchronous) serial driver, including modem line control (as far as hardware supports it -- there is edge detection logic missing from the DCD and RI lines and the driver does not implement polling of these lines at the moment), the serial console, BREAK transmission and reception, including the magic SysRq. The receive FIFO threshold is not maintained though. The driver was tested with a SWARM board which uses a BCM1250 SOC (which is dual MIPS64 CMP) and has both ports of the single DUART implemented wired externally. Both were tested. Testing included using the ports as terminal lines at 1200bps (which is the ports minimum), 115200bps and a couple of random speeds inbetween. The modem lines were verified to operate correctly. No testing was performed with a use as a network interface, like with SLIP or PPP. Signed-off-by: Maciej W. Rozycki Acked-b