commit 577c9c456f0e1371cbade38eaf91ae8e8a308555 Author: Linus Torvalds Date: Tue Apr 7 14:25:01 2009 -0700 Linux 2.6.30-rc1 commit 1551260d1f0fb1d23f264582092b862fce5e2dbd Merge: c93f216 5e34437 Author: Linus Torvalds Date: Tue Apr 7 14:11:07 2009 -0700 Merge branch 'core/softlockup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core/softlockup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softlockup: make DETECT_HUNG_TASK default depend on DETECT_SOFTLOCKUP softlockup: move 'one' to the softlockup section in sysctl.c softlockup: ensure the task has been switched out once softlockup: remove timestamp checking from hung_task softlockup: convert read_lock in hung_task to rcu_read_lock softlockup: check all tasks in hung_task softlockup: remove unused definition for spawn_softlockup_task softlockup: fix potential race in hung_task when resetting timeout softlockup: fix to allow compiling with !DETECT_HUNG_TASK softlockup: decouple hung tasks check from softlockup detection commit c93f216b5b985a12a18323e5ca2eb01db3d2f000 Merge: c61b79b ab3c9c6 Author: Linus Torvalds Date: Tue Apr 7 14:10:10 2009 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y branch tracer: Fix for enabling branch profiling makes sparse unusable ftrace: Correct a text align for event format output Update /debug/tracing/README tracing/ftrace: alloc the started cpumask for the trace file tracing, x86: remove duplicated #include ftrace: Add check of sched_stopped for probe_sched_wakeup function-graph: add proper initialization for init task tracing/ftrace: fix missing include string.h tracing: fix incorrect return type of ns2usecs() tracing: remove CALLER_ADDR2 from wakeup tracer blktrace: fix pdu_len when tracing packet command requests blktrace: small cleanup in blk_msg_write() blktrace: NUL-terminate user space messages tracing: move scripts/trace/power.pl to scripts/tracing/power.pl commit c61b79b6ef266890954213a701d8f6021d8c1289 Merge: 2b2ec75 9efe21c Author: Linus Torvalds Date: Tue Apr 7 14:07:52 2009 -0700 Merge branch 'irq/threaded' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq/threaded' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: fix devres.o build for GENERIC_HARDIRQS=n genirq: provide old request_irq() for CONFIG_GENERIC_HARDIRQ=n genirq: threaded irq handlers review fixups genirq: add support for threaded interrupts to devres genirq: add threaded interrupt handler support commit 2b2ec7554cf7ec5e4412f89a5af6abe8ce950700 Author: Trond Myklebust Date: Tue Apr 7 14:02:53 2009 -0700 NFS: Fix the return value in nfs_page_mkwrite() Commit c2ec175c39f62949438354f603f4aa170846aabb ("mm: page_mkwrite change prototype to match fault") exposed a bug in the NFS implementation of page_mkwrite. We should be returning 0 on success... Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 Merge: 6a5d263 7280036 Author: Linus Torvalds Date: Tue Apr 7 11:24:19 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: pci_slot: grab refcount on slot's bus PCI Hotplug: acpiphp: grab refcount on p2p subordinate bus PCI: allow PCI core hotplug to remove PCI root bus PCI: Fix oops in pci_vpd_truncate PCI: don't corrupt enable_cnt when doing manual resource alignment PCI: annotate pci_rescan_bus as __ref, not __devinit PCI-IOV: fix missing kernel-doc PCI: Setup disabled bridges even if buses are added PCI: SR-IOV quirk for Intel 82576 NIC commit 6a5d263866d699ebf6843105497afc86ee53de5b Merge: aeeae86 ffcd7dc Author: Linus Torvalds Date: Tue Apr 7 11:06:41 2009 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: loop: mutex already unlocked in loop_clr_fd() cfq-iosched: don't let idling interfere with plugging block: remove unused REQ_UNPLUG cfq-iosched: kill two unused cfqq flags cfq-iosched: change dispatch logic to deal with single requests at the time mflash: initial support cciss: change to discover first memory BAR cciss: kernel scan thread for MSA2012 cciss: fix residual count for block pc requests block: fix inconsistency in I/O stat accounting code block: elevator quiescing helpers commit aeeae86859f4319de0a4946b44771d9926eeed54 Author: Linus Torvalds Date: Tue Apr 7 07:59:41 2009 -0700 Fix build errors due to CONFIG_BRANCH_TRACER=y The code that enables branch tracing for all (non-constant) branches plays games with the preprocessor and #define's the C 'if ()' construct to do tracing. That's all fine, but it fails for some unusual but valid C code that is sometimes used in macros, notably by the intel-iommu code: if (i=drhd->iommu, drhd->ignored) .. because now the preprocessor complains about multiple arguments to the 'if' macro. So make the macro expansion of this particularly horrid trick use varargs, and handle the case of comma-expressions in if-statements. Use another macro to do it cleanly in just one place. This replaces a patch by David (and acked by Steven) that did this all inside that one already-too-horrid macro. Tested-by: Ingo Molnar Cc: David Woodhouse Cc: Steven Rostedt Signed-off-by: Linus Torvalds commit 985c0cd3f75b5a546ceab002e36b4263f2f7d2c3 Merge: 81d91ac d6648da Author: Linus Torvalds Date: Tue Apr 7 08:54:43 2009 -0700 Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 * 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6: ASoC: TWL4030: Compillation error fix commit 81d91acf8c093565f65383ae0349b9255fbb2d0d Merge: 132ea5e 0dd7b0c Author: Linus Torvalds Date: Tue Apr 7 08:53:38 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (36 commits) ALSA: hda - Add VREF powerdown sequence for another board ALSA: oss - volume control for CSWITCH and CROUTE ALSA: hda - add missing comma in ad1884_slave_vols sound: usb-audio: allow period sizes less than 1 ms sound: usb-audio: save data packet interval in audioformat structure sound: usb-audio: remove check_hw_params_convention() sound: usb-audio: show sample format width in proc file ASoC: fsl_dma: Pass the proper device for dma mapping routines ASoC: Fix null dereference in ak4535_remove() ALSA: hda - enable SPDIF output for Intel DX58SO board ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4 ALSA: snd-atmel-abdac: replace bus_id with dev_name() ALSA: snd-atmel-ac97c: replace bus_id with dev_name() ALSA: snd-atmel-ac97c: cleanup registers when removing driver ALSA: snd-atmel-ac97c: do a proper reset of the external codec ALSA: snd-atmel-ac97c: enable interrupts to catch events for error reporting ALSA: snd-atmel-ac97c: set correct size for buffer hardware parameter ALSA: snd-atmel-ac97c: do not overwrite OCA and ICA when assigning channels ALSA: snd-atmel-ac97c: remove dead break statements after return in switch case ALSA: snd-atmel-ac97c: cleanup register definitions ... commit 132ea5e9aa9ce13f62ba45db8e43ec887d1106e9 Merge: 0e26da0 cae5a29 Author: Linus Torvalds Date: Tue Apr 7 08:53:02 2009 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: sata_mv: shorten register names sata_mv: workaround errata SATA#13 sata_mv: cosmetic renames sata_mv: workaround errata SATA#26 sata_mv: workaround errata PCI#7 sata_mv: replace 0x1f with ATA_PIO4 (v2) sata_mv: fix irq mask races sata_mv: revert SoC irq breakage libata: ahci enclosure management bios workaround ata: Add TRIM infrastructure ata_piix: VGN-BX297XP wants the controller power up on suspend libata: Remove some redundant casts from pata_octeon_cf.c pata_artop: typo commit 0e26da0f2200a2fb51844aaa43e365ea9dd5a93d Merge: 10a0d91 65de394 Author: Linus Torvalds Date: Tue Apr 7 08:45:12 2009 -0700 Merge branch 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux * 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux: i2c: imx: Make disable_delay a per-device variable i2c: xtensa s6000 i2c driver powerpc/85xx: i2c-mpc: use new I2C bindings for the Socates board i2c: i2c-mpc: make I2C bus speed configurable i2c: i2c-mpc: use dev based printout function i2c: i2c-mpc: various coding style fixes i2c: imx: Add missing request_mem_region in probe() i2c: i2c-s3c2410: Initialise Samsung I2C controller early i2c-s3c2410: Simplify bus frequency calculation i2c-s3c2410: sda_delay should be in ns, not clock ticks i2c: iMX/MXC support commit 10a0d912898ac2fe49094acf2c1339d0fb4c2bc6 Merge: 51dcdfe 2c03d07 Author: Linus Torvalds Date: Tue Apr 7 08:44:43 2009 -0700 Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: Add Asus ATK0110 support hwmon: (lm95241) Convert to new-style i2c driver commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 Author: Alan Cox Date: Tue Apr 7 15:30:57 2009 +0100 parport: Use the PCI IRQ if offered PCI parallel port devices can IRQ share so we should stop them hogging the line and making a mess on modern PC systems. We know the sharing side works as the PCMCIA driver has shared the parallel port IRQ for some time. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8e7d91c97570ba1a16c0b4f984c04f04f039a231 Author: Breno Leitao Date: Tue Apr 7 16:53:48 2009 +0100 tty: jsm cleanups Here are some cleanups, mainly removing unused variables and silly declarations. Signed-off-by: Breno Leitao Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 78d67b4046c243bea3ddc3c4ffd6f3764ce11929 Author: Mike Frysinger Date: Tue Apr 7 16:53:11 2009 +0100 Adjust path to gpio headers Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 51a2301e719e42b370bbb258c7ef6a7e7590b390 Author: Mike Frysinger Date: Tue Apr 7 16:52:49 2009 +0100 KGDB_SERIAL_CONSOLE check for module Depend on KGDB_SERIAL_CONSOLE being set to N rather than !Y, since it can be built as a module. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 718f041835f383780fd45b8424fffa586be6e1f7 Author: Mike Frysinger Date: Tue Apr 7 16:52:39 2009 +0100 Change KCONFIG name Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d307d36adeaa70074773b3e5eab8d7e1beb008a4 Author: Sonic Zhang Date: Tue Apr 7 16:52:26 2009 +0100 tty: Blackin CTS/RTS Both software emulated and hardware based CTS and RTS are enabled in serial driver. The CTS RTS PIN connection on BF548 UART port is defined as a modem device not as a host device. In order to test it under Linux, please nake a cross UART cable to exchange CTS and RTS signal. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 6f95570e407d03c5140a220e054f9b18abdc7041 Author: Sonic Zhang Date: Tue Apr 7 16:51:15 2009 +0100 Change hardware flow control from poll to interrupt driven Only the CTS bit is affected. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 1dcb884ca8048efb4ce2999d367c26369ab2227c Author: Christian Pellegrin Date: Tue Apr 7 16:48:51 2009 +0100 Add support for the MAX3100 SPI UART. (akpm: queued pending confirmation of the new major number) [randy.dunlap@oracle.com: select SERIAL_CORE] Signed-off-by: Christian Pellegrin Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 05b363020decda179b51350bb9199a0c2ce3ef42 Author: Alan Cox Date: Tue Apr 7 16:48:35 2009 +0100 lanana: assign a device name and numbering for MAX3100 This is a low density serial port so needs a real major/minor Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0c212603981abb9bb8fe4ed1eec521dc18be02b9 Author: Alan Cox Date: Tue Apr 7 16:48:27 2009 +0100 serqt: initial clean up pass for tty side Avoid using port->tty where possible (makes refcount fixing easier later). Remove unused code (the ioctl path is not used if the device has mget/mset functions) Remove various un-needed typecasts and long names so it could read it to do the changes. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 6fd1af4cf98936f4034caf8f132c7826a6ffd0fa Author: Claudio Scordino Date: Tue Apr 7 16:48:19 2009 +0100 tty: Use the generic RS485 ioctl on CRIS Use the new general RS485 Linux data structure (introduced by Alan with commit number c26c56c0f40e200e61d1390629c806f6adaffbcc) in the Cris architecture too (currently, Cris still uses the old private data structure instead of the new one). Signed-off-by: Claudio Scordino Tested-by: Hinko Kocevar Tested-by: Janez Cufer Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f786ddd285b4100909a013041d3eee1be9fac4db Author: Adrian Bunk Date: Tue Apr 7 16:48:07 2009 +0100 tty: Correct inline types for tty_driver_kref_get() tty_driver_kref_get() should be static inline and not extern inline (the latter even changed it's semantics in gcc >= 4.3). Signed-off-by: Adrian Bunk Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 7bfac9ecf0585962fe13584f5cf526d8c8e76f17 Author: Miklos Szeredi Date: Mon Apr 6 17:41:00 2009 +0200 splice: fix deadlock in splicing to file There's a possible deadlock in generic_file_splice_write(), splice_from_pipe() and ocfs2_file_splice_write(): - task A calls generic_file_splice_write() - this calls inode_double_lock(), which locks i_mutex on both pipe->inode and target inode - ordering depends on inode pointers, can happen that pipe->inode is locked first - __splice_from_pipe() needs more data, calls pipe_wait() - this releases lock on pipe->inode, goes to interruptible sleep - task B calls generic_file_splice_write(), similarly to the first - this locks pipe->inode, then tries to lock inode, but that is already held by task A - task A is interrupted, it tries to lock pipe->inode, but fails, as it is already held by task B - ABBA deadlock Fix this by explicitly ordering locks: the outer lock must be on target inode and the inner lock (which is later unlocked and relocked) must be on pipe->inode. This is OK, pipe inodes and target inodes form two nonoverlapping sets, generic_file_splice_write() and friends are not called with a target which is a pipe. Signed-off-by: Miklos Szeredi Acked-by: Mark Fasheh Acked-by: Jens Axboe Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 612392307cb09e49051225092cbbd7049bd8db93 Author: Ryusuke Konishi Date: Mon Apr 6 19:02:00 2009 -0700 nilfs2: support nanosecond timestamp After a review of user's feedback for finding out other compatibility issues, I found nilfs improperly initializes timestamps in inode; CURRENT_TIME was used there instead of CURRENT_TIME_SEC even though nilfs didn't have nanosecond timestamps on disk. A few users gave us the report that the tar program sometimes failed to expand symbolic links on nilfs, and it turned out to be the cause. Instead of applying the above displacement, I've decided to support nanosecond timestamps on this occation. Fortunetaly, a needless 64-bit field was in the nilfs_inode struct, and I found it's available for this purpose without impact for the users. So, this will do the enhancement and resolve the tar problem. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e339ad31f59925b48a92ee3947692fdf9758b8c7 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:59 2009 -0700 nilfs2: introduce secondary super block The former versions didn't have extra super blocks. This improves the weak point by introducing another super block at unused region in tail of the partition. This doesn't break disk format compatibility; older versions just ingore the secondary super block, and new versions just recover it if it doesn't exist. The partition created by an old mkfs may not have unused region, but in that case, the secondary super block will not be added. This doesn't make more redundant copies of the super block; it is a future work. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cece552074c591970353ad48308d65f110aeaf28 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:58 2009 -0700 nilfs2: simplify handling of active state of segments will reduce some lines of segment constructor. Previously, the state was complexly controlled through a list of segments in order to keep consistency in meta data of usage state of segments. Instead, this presents ``calculated'' active flags to userland cleaner program and stop maintaining its real flag on disk. Only by this fake flag, the cleaner cannot exactly know if each segment is reclaimable or not. However, the recent extension of nilfs_sustat ioctl struct (nilfs2-extend-nilfs_sustat-ioctl-struct.patch) can prevent the cleaner from reclaiming in-use segment wrongly. So, now I can apply this for simplification. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c96fa464a567a2a8796009af0e79bc68af73f485 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:57 2009 -0700 nilfs2: mark minor flag for checkpoint created by internal operation Nilfs creates checkpoints even for garbage collection or metadata updates such as checkpoint mode change. So, user often sees checkpoints created only by such internal operations. This is inconvenient in some situations. For example, application that monitors checkpoints and changes them to snapshots, will fall into an infinite loop because it cannot distinguish internally created checkpoints. This patch solves this sort of problem by adding a flag to checkpoint for identification. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 458c5b0822a669d170fdb7bb16c9145f652ebe06 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:56 2009 -0700 nilfs2: clean up sketch file The sketch file is a file to mark checkpoints with user data. It was experimentally introduced in the original implementation, and now obsolete. The file was handled differently with regular files; the file size got truncated when a checkpoint was created. This stops the special treatment and will treat it as a regular file. Most users are not affected because mkfs.nilfs2 no longer makes this file. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e62687468588f47c32256e3c8c36157c40111b6e Author: Ryusuke Konishi Date: Mon Apr 6 19:01:55 2009 -0700 nilfs2: super block operations fix endian bug This adds a missing endian conversion of checksum field in the super block. This fixes compatibility issue on big endian machines which will come to surface after supporting recovery of super block. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f5abe7e7dbcd83e73212c6cb135a6106cea6a0b Author: Ryusuke Konishi Date: Mon Apr 6 19:01:55 2009 -0700 nilfs2: replace BUG_ON and BUG calls triggerable from ioctl Pekka Enberg advised me: > It would be nice if BUG(), BUG_ON(), and panic() calls would be > converted to proper error handling using WARN_ON() calls. The BUG() > call in nilfs_cpfile_delete_checkpoints(), for example, looks to be > triggerable from user-space via the ioctl() system call. This will follow the comment and keep them to a minimum. Acked-by: Pekka Enberg Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c2e52fc4fca251e68f90821c9ff5cb18be4df58 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:54 2009 -0700 nilfs2: extend nilfs_sustat ioctl struct This adds a new argument to the nilfs_sustat structure. The extended field allows to delete volatile active state of segments, which was needed to protect freshly-created segments from garbage collection but has confused code dealing with segments. This extension alleviates the mess and gives room for further simplifications. The volatile active flag is not persistent, so it's eliminable on this occasion without affecting compatibility other than the ioctl change. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a9461939a46345860622ea36ff267ee4446f00f Author: Ryusuke Konishi Date: Mon Apr 6 19:01:53 2009 -0700 nilfs2: use unlocked_ioctl Pekka Enberg suggested converting ->ioctl operations to use ->unlocked_ioctl to avoid BKL. The conversion was verified to be safe, so I will take it on this occasion. Cc: Pekka Enberg Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8082d36aed26c4fb6ed43e4008303682eabf839e Author: Ryusuke Konishi Date: Mon Apr 6 19:01:53 2009 -0700 nilfs2: remove compat ioctl code This removes compat code from the nilfs ioctls and applies the same function for both .ioctl and .compat_ioctl file operations. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc498d09be28172846cacded35ca2378222a8c7b Author: Ryusuke Konishi Date: Mon Apr 6 19:01:52 2009 -0700 nilfs2: use fixed sized types for ioctl structures Nilfs ioctl had structures not having fixed sized types such as: struct nilfs_argv { void *v_base; size_t v_nmembs; size_t v_size; int v_index; int v_flags; }; Further, some of them are wrongly aligned: e.g. struct nilfs_cpmode { __u64 cm_cno; int cm_mode; }; The size of wrongly aligned structures varies depending on architectures, and it breaks the identity of ioctl commands, which leads to arch dependent errors. Previously, these are compensated by using compat_ioctl. This fixes these problems and allows removal of compat ioctl. Since this will change sizes of those structures, binary compatibility for the past utilities will once break; new utilities have to be used instead. However, it would be helpful to avoid platform dependent problems in the long term. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1088dcf4c3a0a27fdad5214781d5084b11405238 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:51 2009 -0700 nilfs2: remove timedwait ioctl command This removes NILFS_IOCTL_TIMEDWAIT command from ioctl interface along with the related flags and wait queue. The command is terrible because it just sleeps in the ioctl. I prefer to avoid this by devising means of event polling in userland program. By reconsidering the userland GC daemon, I found this is possible without changing behaviour of the daemon and sacrificing efficiency. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76068c4ff1cc03d9d24d17fd9e6a1475bc2f6730 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:50 2009 -0700 nilfs2: fix buggy behavior seen in enumerating checkpoints This will fix the weird behavior of lscp command in listing continuously created checkpoints; the output of lscp is rewinded regularly for the recent nilfs. As a result of debugging, a defect was found in nilfs_cpfile_do_get_cpinfo() function. Though the function can be repeatedly called to enumerate checkpoints and it can skip invalid checkpoint entries, the index value was not carried between successive calls. The bug has long been present, and came to surface after applying a bugfix nilfs2-fix-problems-of-memory-allocation-in-ioctl.patch, which increased frequency of calling the function. The similar bugfix was already applied for ``snapshots'' by nilfs2-fix-gc-failure-on-volumes-keeping-numerous-snapshots.patch. This fixes the problem by making the index argument bidirectional on the function. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8acfbf0939e98cc77dab94c24899c9930ddd1e13 Author: Pekka Enberg Date: Mon Apr 6 19:01:49 2009 -0700 nilfs2: clean up indirect function calling conventions This cleans up the strange indirect function calling convention used in nilfs to follow the normal kernel coding style. Signed-off-by: Pekka Enberg Acked-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fa10d20012296300dfe645cb3e628a4e9a0d5ef Author: Ryusuke Konishi Date: Mon Apr 6 19:01:48 2009 -0700 nilfs2: fix improper return values of nilfs_get_cpinfo ioctl A few tool developers gave me requests for fixing inconvenient return value of nilfs_get_cpinfo() ioctl; if the requested mode is NILFS_SNAPSHOT and the specified start entry is not a snapshot, the ioctl unnaturally returns one as the number of acquired snapshot item. In addition, the ioctl function returns an ENOENT error for checkpoints within blocks deleted by garbage collection. These behaviors require corrections for programs which enumerate snapshots. This resolves the inconvenience by changing the return values to zero for the above cases. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b028fcfc4cd198a6aa1ffcfb872073ccc1db3459 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:47 2009 -0700 nilfs2: fix gc failure on volumes keeping numerous snapshots This resolves the following failure of nilfs2 cleaner daemon: nilfs_cleanerd[20670]: cannot clean segments: No such file or directory nilfs_cleanerd[20670]: shutdown When creating thousands of snapshots, the cleaner daemon had rarely died as above due to an error returned from the kernel code. After applying the recent patch which fixed memory allocation problems in ioctl (Message-Id: <20081215.155840.105124170.ryusuke@osrg.net>), the problem gets more frequent. It turned out to be a bug of nilfs_ioctl_wrap_copy function and one of its callback routines to read out information of snapshots; if the nilfs_ioctl_wrap_copy function divided a large read request into multiple requests, the second and later requests have failed since a restart position on snapshot meta data was not properly set forward. It's a deficiency of the callback interface that cannot pass the restart position among multiple requests. This patch fixes the issue by allowing nilfs_ioctl_wrap_copy and snapshot read functions to exchange a position argument. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85ef9cea02882baedd1e65336cf3dd292841dde3 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:46 2009 -0700 nilfs2: add maintainer Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 047180f2d7bf95ff5699ca04da639a7556e23435 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:45 2009 -0700 nilfs2: insert explanations in gcinode file The file gcinode.c gives buffer cache functions for on-disk blocks moved in garbage collection. Joern Engel has suggested inserting its explanations in the source file (Message-ID: <20080917144146.GD8750@logfs.org> and <20080917224953.GB14644@logfs.org>). This follows the comment. Cc: Joern Engel Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47420c799830d4676e544dbec56b2a7f787528f5 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:45 2009 -0700 nilfs2: avoid double error caused by nilfs_transaction_end Pekka Enberg pointed out that double error handlings found after nilfs_transaction_end() can be avoided by separating abort operation: OK, I don't understand this. The only way nilfs_transaction_end() can fail is if we have NILFS_TI_SYNC set and we fail to construct the segment. But why do we want to construct a segment if we don't commit? I guess what I'm asking is why don't we have a separate nilfs_transaction_abort() function that can't fail for the erroneous case to avoid this double error value tracking thing? This does the separation and renames nilfs_transaction_end() to nilfs_transaction_commit() for clarification. Since, some calls of these functions were used just for exclusion control against the segment constructor, they are replaced with semaphore operations. Acked-by: Pekka Enberg Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2e7d2df82cafb76f76809ddf6e2caa8afe4f75e Author: Ryusuke Konishi Date: Mon Apr 6 19:01:44 2009 -0700 nilfs2: cleanup nilfs_clear_inode This will remove the following unnecessary locks and cleanup code in nilfs_clear_inode(): - unnecessary protection using nilfs_transaction_begin() and nilfs_transaction_end(). - cleanup code of i_dirty list field which is never chained when this function is called. - spinlock used when releasing i_bh field. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3358b4aaa84fd4c1cdd64391875e92cbb8afeb29 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:43 2009 -0700 nilfs2: fix problems of memory allocation in ioctl This is another patch for fixing the following problems of a memory copy function in nilfs2 ioctl: (1) It tries to allocate 128KB size of memory even for small objects. (2) Though the function repeatedly tries large memory allocations while reducing the size, GFP_NOWAIT flag is not specified. This increases the possibility of system memory shortage. (3) During the retries of (2), verbose warnings are printed because _GFP_NOWARN flag is not used for the kmalloc calls. The first patch was still doing large allocations by kmalloc which are repeatedly tried while reducing the size. Andi Kleen told me that using copy_from_user for large memory is not good from the viewpoint of preempt latency: On Fri, 12 Dec 2008 21:24:11 +0100, Andi Kleen wrote: > > In the current interface, each data item is copied twice: one is to > > the allocated memory from user space (via copy_from_user), and another > > For such large copies it is better to use multiple smaller (e.g. 4K) > copy user, that gives better real time preempt latencies. Each cfu has a > cond_resched(), but only one, not multiple times in the inner loop. He also advised me that: On Sun, 14 Dec 2008 16:13:27 +0100, Andi Kleen wrote: > Better would be if you could go to PAGE_SIZE. order 0 allocations > are typically the fastest / least likely to stall. > > Also in this case it's a good idea to use __get_free_pages() > directly, kmalloc tends to be become less efficient at larger > sizes. For the function in question, the size of buffer memory can be reduced since the buffer is repeatedly used for a number of small objects. On the other hand, it may incur large preempt latencies for larger buffer because a copy_from_user (and a copy_to_user) was applied only once each cycle. With that, this revision uses the order 0 allocations with __get_free_pages() to fix the original problems. Cc: Andi Kleen Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c4fb877641c5c72d4a3ce8921a256bfe44055c0 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:41 2009 -0700 nilfs2: update makefile and Kconfig This adds a Makefile for the nilfs2 file system, and updates the makefile and Kconfig file in the file system directory. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7942b919f7321f95a777d396ff7894a7a83dc9b0 Author: Koji Sato Date: Mon Apr 6 19:01:41 2009 -0700 nilfs2: ioctl operations This adds userland interface implemented with ioctl. Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3d93f709e893187d301aa5458b2248db9f22bd1 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:40 2009 -0700 nilfs2: block cache for garbage collection This adds the cache of on-disk blocks to be moved in garbage collection. The disk blocks are held with dummy inodes (called gcinodes), and this file provides lookup function of the dummy inodes, and their buffer read function. Signed-off-by: Seiji Kihara Signed-off-by: Ryusuke Konishi Signed-off-by: Yoshiji Amagai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84ef1ecfdea2f9f1e740a4bee0fa9cd629bdda70 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:39 2009 -0700 nilfs2: another dat for garbage collection NILFS2 uses another DAT inode during garbage collection to ensure atomicity and consistency of the DAT in the transient state. This twin inode is called GCDAT. This adds functions to initialize the GCDAT and to switch page caches and B-tree node caches between these two inodes. Signed-off-by: Seiji Kihara Signed-off-by: Ryusuke Konishi Signed-off-by: Yoshiji Amagai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f3e1c7f23f8a6f8224fa1d275381f6d9279ad4b Author: Ryusuke Konishi Date: Mon Apr 6 19:01:38 2009 -0700 nilfs2: recovery functions This adds recovery function on mount. Usually the recovery is achieved by just finding the latest super root. When logs without checkpoints were appended for data sync operations after the latest super root, the recovery function will perform roll forwarding and reconstruct new log(s) with a super root. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f30bf3e40f80ef50c17f55271deae3abc03e793e Author: Ryusuke Konishi Date: Mon Apr 6 19:01:38 2009 -0700 nilfs2: fix missed-sync issue for do_sync_mapping_range() Chris Mason pointed out that there is a missed sync issue in nilfs_writepages(): On Wed, 17 Dec 2008 21:52:55 -0500, Chris Mason wrote: > It looks like nilfs_writepage ignores WB_SYNC_NONE, which is used by > do_sync_mapping_range(). where WB_SYNC_NONE in do_sync_mapping_range() was replaced with WB_SYNC_ALL by Nick's patch (commit: ee53a891f47444c53318b98dac947ede963db400). This fixes the problem by letting nilfs_writepages() write out the log of file data within the range if sync_mode is WB_SYNC_ALL. This involves removal of nilfs_file_aio_write() which was previously needed to ensure O_SYNC sync writes. Cc: Chris Mason Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ff05123e3bfbb1d2b68ba1d9bf1f7d1dffc1453 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:37 2009 -0700 nilfs2: segment constructor This adds the segment constructor (also called log writer). The segment constructor collects dirty buffers for every dirty inode, makes summaries of the buffers, assigns disk block addresses to the buffers, and then submits BIOs for the buffers. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64b5a32e0b3680a9655b3f2e668a646068e71d33 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:36 2009 -0700 nilfs2: segment buffer This adds the segment buffer which is used to constuct logs. [akpm@linux-foundation.org: BIO_RW_SYNC got removed] Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 783f61843e9d14724f5f79ae955a28c27e300467 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:35 2009 -0700 nilfs2: super block operations This adds super block operations for the nilfs2 file system. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a9d2191e9f43bbcd256a9a6871bd73434c83f2f Author: Ryusuke Konishi Date: Mon Apr 6 19:01:35 2009 -0700 nilfs2: operations for the_nilfs core object This adds functions on the_nilfs object, which keeps shared resources and states among a read/write mount and snapshots mounts going individually. the_nilfs is allocated per block device; it is created when user first mount a snapshot or a read/write mount on the device, then it is reused for successive mounts. It will be freed when all mount instances on the device are detached. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d25006523d0b9e49fd097b2e974e7c8c05bd7f54 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:34 2009 -0700 nilfs2: pathname operations This adds pathname operations, most of which comes from the ext2 file system. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ba466d74ed74f073257f86e61519cb8f8f46184 Author: Yoshiji Amagai Date: Mon Apr 6 19:01:34 2009 -0700 nilfs2: directory entry operations This adds directory handling functions, most of which comes from the ext2 file system. Signed-off-by: Ryusuke Konishi Signed-off-by: Yoshiji Amagai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f183ff4f05317b7929337455b233496f68217c1a Author: Ryusuke Konishi Date: Mon Apr 6 19:01:33 2009 -0700 nilfs2: file operations This adds primitives for regular file handling. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05fe58fdc10df9ebea04c0eaed57adc47af5c184 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:32 2009 -0700 nilfs2: inode operations This adds inode level operations of the nilfs2 file system. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c98cd4ecb0ae35f0368c5c2190712689c2064aa Author: Koji Sato Date: Mon Apr 6 19:01:32 2009 -0700 nilfs2: segment usage file This adds a meta data file which stores the allocation state of segments. [konishi.ryusuke@lab.ntt.co.jp: fix wrong counting of checkpoints and dirty segments] Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29619809727a4e524e26dbd7bfdc93ff7f50aa74 Author: Koji Sato Date: Mon Apr 6 19:01:31 2009 -0700 nilfs2: checkpoint file This adds a meta data file which holds checkpoint entries in its data blocks. Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43bfb45ed4feace26157778889be55e4046b7a4b Author: Ryusuke Konishi Date: Mon Apr 6 19:01:30 2009 -0700 nilfs2: inode map file This adds a meta data file which stores on-disk inodes in its data blocks. Signed-off-by: Ryusuke Konishi Signed-off-by: Yoshiji Amagai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a17564f58b11476c011d623fa1f268602a81c27c Author: Koji Sato Date: Mon Apr 6 19:01:30 2009 -0700 nilfs2: disk address translator This adds the disk address translation file (DAT) whose primary function is to convert virtual disk block numbers to actual disk block numbers. The virtual block numbers of NILFS are associated with checkpoint generation numbers, and this file also provides functions to manage the lifetime information of each virtual block number. Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5442680fd23abc01f29af585cc1a2f793bd74565 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:29 2009 -0700 nilfs2: persistent object allocator This adds common functions to allocate or deallocate entries with bitmaps on a meta data file. This feature is used by the DAT and ifile. Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Yoshiji Amagai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5eb563f5f299a2ed488d9eb52acede45ccb14c7b Author: Ryusuke Konishi Date: Mon Apr 6 19:01:28 2009 -0700 nilfs2: meta data file This adds the meta data file, which serves common buffer functions to the DAT, sufile, cpfile, ifile, and so forth. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bd49f9446130a6a3914eb07b54db489e3222b34 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:27 2009 -0700 nilfs2: buffer and page operations This adds common routines for buffer/page operations used in B-tree node caches, meta data files, or segment constructor (log writer). NILFS uses copy functions for buffers and pages due to the following reasons: 1) Relocation required for COW Since NILFS changes address of on-disk blocks, moving buffers in page cache is needed for the buffers which are not addressed by a file offset. If buffer size is smaller than page size, this involves partial copy of pages. 2) Freezing mmapped pages NILFS calculates checksums for each log to ensure its validity. If page data changes after the checksum calculation, this validity check will not work correctly. To avoid this failure for mmaped pages, NILFS freezes their data by copying. 3) Copy-on-write for DAT pages NILFS makes clones of DAT page caches in a copy-on-write manner during GC processes, and this ensures atomicity and consistency of the DAT in the transient state. In addition, NILFS uses two obsolete functions, nilfs_mark_buffer_dirty() and nilfs_clear_page_dirty() respectively. * nilfs_mark_buffer_dirty() was required to avoid NULL pointer dereference faults: Since the page cache of B-tree node pages or data page cache of pseudo inodes does not have a valid mapping->host, calling mark_buffer_dirty() for their buffers causes the fault; it calls __mark_inode_dirty(NULL) through __set_page_dirty(). * nilfs_clear_page_dirty() was needed in the two cases: 1) For B-tree node pages and data pages of the dat/gcdat, NILFS2 clears page dirty flags when it copies back pages from the cloned cache (gcdat->{i_mapping,i_btnode_cache}) to its original cache (dat->{i_mapping,i_btnode_cache}). 2) Some B-tree operations like insertion or deletion may dispose buffers in dirty state, and this needs to cancel the dirty state of their pages. clear_page_dirty_for_io() caused faults because it does not clear the dirty tag on the page cache. Signed-off-by: Seiji Kihara Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a60be987d45dd510aeb54389526f9957cfab106c Author: Ryusuke Konishi Date: Mon Apr 6 19:01:25 2009 -0700 nilfs2: B-tree node cache This adds routines for B-tree node buffers. Signed-off-by: Seiji Kihara Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36a580eb489f54d81a0534974962e732a314b999 Author: Koji Sato Date: Mon Apr 6 19:01:25 2009 -0700 nilfs2: direct block mapping This adds block mappings using direct pointers which are stored in the i_bmap array of inode. Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17c76b0104e4a6513983777e1a17e0297a12b0c4 Author: Koji Sato Date: Mon Apr 6 19:01:24 2009 -0700 nilfs2: B-tree based block mapping This adds declarations and functions of NILFS2 B-tree. Two variants are integrated in the NILFS2 B-tree. The B-tree for the most files points to the child nodes or data blocks with virtual block addresses, whereas the B-tree of the DAT uses actual block addresses. Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdb265eae08db578e7cf5739be16f389d495fc75 Author: Koji Sato Date: Mon Apr 6 19:01:23 2009 -0700 nilfs2: integrated block mapping This adds structures and operations for the block mapping (bmap for short). NILFS2 uses direct mappings for short files or B-tree based mappings for longer files. Every on-disk data block is held with inodes and managed through this block mapping. The nilfs_bmap structure and a set of functions here provide this capability to the NILFS2 inode. [penberg@cs.helsinki.fi: remove a bunch of bmap wrapper macros] [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65b4643d3babeb203fa9571d12fd5e1bf74d27b0 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:23 2009 -0700 nilfs2: add inode and other major structures This adds the following common structures of the NILFS2 file system. * nilfs_inode_info structure: gives on-memory inode. * nilfs_sb_info structure: keeps per-mount state and a special inode for the ifile. This structure is attached to the super_block structure. * the_nilfs structure: keeps shared state and locks among a read/write mount and snapshot mounts. This keeps special inodes for the sufile, cpfile, dat, and another dat inode used during GC (gcdat). This also has a hash table of dummy inodes to cache disk blocks during GC (gcinodes). * nilfs_transaction_info structure: keeps per task state while nilfs is writing logs or doing indivisible inode or namespace operations. This structure is used to identify context during log making and store nest level of the lock which ensures atomicity of file system operations. Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eed10e39b142eb4d284c8e4c751c0eaaa0bcd707 Author: Koji Sato Date: Mon Apr 6 19:01:21 2009 -0700 nilfs2: disk format and userland interface This adds a header file which specifies the on-disk format and ioctl interface of the nilfs2 file system. Signed-off-by: Koji Sato Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 962281a7ab3aeb97eed004b8f0bdb0979cf35347 Author: Ryusuke Konishi Date: Mon Apr 6 19:01:20 2009 -0700 nilfs2: add document This adds a document describing the features, mount options, userland tools, usage, disk format, and related URLs for the nilfs2 file system. Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c5510d4e84988ea95f86488d1e23244284bc1ed Author: Yang Hongyang Date: Mon Apr 6 19:01:19 2009 -0700 dma-mapping: update the old macro DMA_nBIT_MASK related documentations Update the old macro DMA_nBIT_MASK related documentations Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f4f27d42a301ed147e50c2edbcd27bb8990bc8e Author: Yang Hongyang Date: Mon Apr 6 19:01:18 2009 -0700 dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24) Replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce0b620160e6d15a7f5b4b00cd7b8bd956d427d1 Author: Yang Hongyang Date: Mon Apr 6 19:01:17 2009 -0700 dma-mapping: replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28) Replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28b767967763835d8526f6baedc25a8a86052640 Author: Yang Hongyang Date: Mon Apr 6 19:01:17 2009 -0700 dma-mapping: replace all DMA_30BIT_MASK macro with DMA_BIT_MASK(30) Replace all DMA_30BIT_MASK macro with DMA_BIT_MASK(30) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 929a22a558429bd22001d6b41cf31c233c68a5e2 Author: Yang Hongyang Date: Mon Apr 6 19:01:16 2009 -0700 dma-mapping: replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31) Replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 284901a90a9e0b812ca3f5f852cbbfb60d10249d Author: Yang Hongyang Date: Mon Apr 6 19:01:15 2009 -0700 dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6afd142fd0dfba497246d0fab236c20a7b4bf778 Author: Yang Hongyang Date: Mon Apr 6 19:01:15 2009 -0700 dma-mapping: replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39) Replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50cf156af7dc68a44409bef636585ef88ebbab34 Author: Yang Hongyang Date: Mon Apr 6 19:01:14 2009 -0700 dma-mapping: replace all DMA_40BIT_MASK macro with DMA_BIT_MASK(40) Replace all DMA_40BIT_MASK macro with DMA_BIT_MASK(40) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e911e0d9af90e4f1b4f2cf183a0993f9fed9f9c6 Author: Yang Hongyang Date: Mon Apr 6 19:01:13 2009 -0700 dma-mapping: replace all DMA_48BIT_MASK macro with DMA_BIT_MASK(48) Replace all DMA_48BIT_MASK macro with DMA_BIT_MASK(48) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01 Author: Yang Hongyang Date: Mon Apr 6 19:01:13 2009 -0700 dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64) Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a59f5d2526593c6bc1a0754c3a16ccc9ed41ce3 Author: Coly Li Date: Mon Apr 6 19:01:12 2009 -0700 fs/romfs: return f_fsid for statfs(2) Make romfs return f_fsid info for statfs(2). Signed-off-by: Coly Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdc8e5f85f9abe2e7c78dcf39d81f9a97178788b Author: Serge E. Hallyn Date: Mon Apr 6 19:01:11 2009 -0700 namespaces: mqueue namespace: adapt sysctl Largely inspired from ipc/ipc_sysctl.c. This patch isolates the mqueue sysctl stuff in its own file. [akpm@linux-foundation.org: build fix] Signed-off-by: Cedric Le Goater Signed-off-by: Nadia Derbey Signed-off-by: Serge E. Hallyn Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7eafd7c74c3f2e67c27621b987b28397110d643f Author: Serge E. Hallyn Date: Mon Apr 6 19:01:10 2009 -0700 namespaces: ipc namespaces: implement support for posix msqueues Implement multiple mounts of the mqueue file system, and link it to usage of CLONE_NEWIPC. Each ipc ns has a corresponding mqueuefs superblock. When a user does clone(CLONE_NEWIPC) or unshare(CLONE_NEWIPC), the unshare will cause an internal mount of a new mqueuefs sb linked to the new ipc ns. When a user does 'mount -t mqueue mqueue /dev/mqueue', he mounts the mqueuefs superblock. Posix message queues can be worked with both through the mq_* system calls (see mq_overview(7)), and through the VFS through the mqueue mount. Any usage of mq_open() and friends will work with the acting task's ipc namespace. Any actions through the VFS will work with the mqueuefs in which the file was created. So if a user doesn't remount mqueuefs after unshare(CLONE_NEWIPC), mq_open("/ab") will not be reflected in "ls /dev/mqueue". If task a mounts mqueue for ipc_ns:1, then clones task b with a new ipcns, ipcns:2, and then task a is the last task in ipc_ns:1 to exit, then (1) ipc_ns:1 will be freed, (2) it's superblock will live on until task b umounts the corresponding mqueuefs, and vfs actions will continue to succeed, but (3) sb->s_fs_info will be NULL for the sb corresponding to the deceased ipc_ns:1. To make this happen, we must protect the ipc reference count when a) a task exits and drops its ipcns->count, since it might be dropping it to 0 and freeing the ipcns b) a task accesses the ipcns through its mqueuefs interface, since it bumps the ipcns refcount and might race with the last task in the ipcns exiting. So the kref is changed to an atomic_t so we can use atomic_dec_and_lock(&ns->count,mq_lock), and every access to the ipcns through ns = mqueuefs_sb->s_fs_info is protected by the same lock. Signed-off-by: Cedric Le Goater Signed-off-by: Serge E. Hallyn Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 614b84cf4e4a920d2af32b8f147ea1e3b8c27ea6 Author: Serge E. Hallyn Date: Mon Apr 6 19:01:08 2009 -0700 namespaces: mqueue ns: move mqueue_mnt into struct ipc_namespace Move mqueue vfsmount plus a few tunables into the ipc_namespace struct. The CONFIG_IPC_NS boolean and the ipc_namespace struct will serve both the posix message queue namespaces and the SYSV ipc namespaces. The sysctl code will be fixed separately in patch 3. After just this patch, making a change to posix mqueue tunables always changes the values in the initial ipc namespace. Signed-off-by: Cedric Le Goater Signed-off-by: Serge E. Hallyn Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 909e6d94795654040ed416ac69858d5d2ce66dd3 Author: Serge E. Hallyn Date: Mon Apr 6 19:01:07 2009 -0700 namespaces: move proc_net_get_sb to a generic fs/super.c helper The mqueuefs filesystem will use this helper as well. Proc's main get_sb could also be made to use it, but that will require a bit more rework. Signed-off-by: Serge E. Hallyn Cc: Cedric Le Goater Cc: Alexey Dobriyan Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ce5ba3c7ef26284f60babbe4465259d1f9968f3 Author: Michal Januszewski Date: Mon Apr 6 19:01:06 2009 -0700 uvesafb: documentation update Update the uvesafb documentation to accurately reflect the default options used by the driver. Signed-off-by: Michal Januszewski Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d88ca815b5b3534ed2dae123ba0bf366861f850c Author: Guennadi Liakhovetski Date: Mon Apr 6 19:01:05 2009 -0700 fbdev: i.MX31: fix panning, error handling, clean up 1. check for errors returned from clk_get() 2. fix "Unbalanced enable for IRQ 160" 3. fix transmit descriptor handling in panning 4. clean frame buffer on blank - useful for OLED displays 5. formatting clean up Signed-off-by: Guennadi Liakhovetski Cc: Dan Williams Cc: Sascha Hauer Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 215059d2421f95c30d1fca6ff31357fcae9f67dc Author: Krzysztof Helt Date: Mon Apr 6 19:01:04 2009 -0700 tdfxfb: make use of DDC information about connected monitor Read DDC information from a connected monitor and use it to select initial mode (if the mode is not specified). Also, use the information to protect against modes outside the monitor specs. Signed-off-by: Krzysztof Helt Tested-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit feff3880d06da0cc8fc65b9e40f518fea7594674 Author: Krzysztof Helt Date: Mon Apr 6 19:01:03 2009 -0700 tdfxfb: move I2C functionality into the tdfxfb The I2C functionality provided by the i2c-voodoo3 driver is moved into the tdfxfb (frame buffer driver for Voodoo3 cards). This way there is no conflict between the i2c driver and the fb driver. The tdfxfb does not make use from the DDC functionality yet but provides all the functionality of the i2c-voodoo3 driver. Signed-off-by: Krzysztof Helt Acked-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f9b15286a8ea49e997e845d02d357ed33ebd090 Author: Masami Hiramatsu Date: Mon Apr 6 19:01:02 2009 -0700 kprobes: support kretprobe and jprobe per-probe disabling Add disable/enable_kretprobe() and disable/enable_jprobe(). Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de5bd88d5a5cce3cacea904d3503e5ebdb3852a2 Author: Masami Hiramatsu Date: Mon Apr 6 19:01:02 2009 -0700 kprobes: support per-kprobe disabling Add disable_kprobe() and enable_kprobe() to disable/enable kprobes temporarily. disable_kprobe() asynchronously disables probe handlers of specified kprobe. So, after calling it, some handlers can be called at a while. enable_kprobe() enables specified kprobe. aggr_pre_handler and aggr_post_handler check disabled probes. On the other hand aggr_break_handler and aggr_fault_handler don't check it because these handlers will be called while executing pre or post handlers and usually those help error handling. Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e579abeb58eb4b8d7321c6eb44dd9e2d0cbaebaa Author: Masami Hiramatsu Date: Mon Apr 6 19:01:01 2009 -0700 kprobes: rename kprobe_enabled to kprobes_all_disarmed Rename kprobe_enabled to kprobes_all_disarmed and invert logic due to avoiding naming confusion from per-probe disabling. Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc00e9cfe0e5c4c31057c722e49fdf2c76dd5953 Author: Masami Hiramatsu Date: Mon Apr 6 19:01:00 2009 -0700 kprobes: cleanup comment style in kprobes.h Fix comment style in kprobes.h. Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99081ab553d6a88dd6b3774af5eef94dbb8faad7 Author: Masami Hiramatsu Date: Mon Apr 6 19:00:59 2009 -0700 kprobes: move EXPORT_SYMBOL_GPL just after function definitions Clean up positions of EXPORT_SYMBOL_GPL in kernel/kprobes.c according to checkpatch.pl. Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b918e5e60d775549478e4268155142156a95aa17 Author: Masami Hiramatsu Date: Mon Apr 6 19:00:58 2009 -0700 kprobes: cleanup aggr_kprobe related code Currently, kprobes can disable all probes at once, but can't disable it individually (not unregister, just disable an kprobe, because unregistering needs to wait for scheduler synchronization). These patches introduce APIs for on-the-fly per-probe disabling and re-enabling by dis-arming/re-arming its breakpoint instruction. This patch: Change old_p to ap in add_new_kprobe() for readability, copy flags member in add_aggr_kprobe(), and simplify the code flow of register_aggr_kprobe(). Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96a6d9aa096aeb758273a8fb6388c279ecef5e7e Author: Mike Rapoport Date: Mon Apr 6 19:00:57 2009 -0700 spi_imx: set spi_master.dma_alignment = 4 Signed-off-by: Mike Rapoport Cc: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ad0ba91d47ff539fe114875bd0a319fba29c9b5 Author: Mike Rapoport Date: Mon Apr 6 19:00:57 2009 -0700 pxa2xx_spi: set spi_master.dma_alignment = 8 Signed-off-by: Mike Rapoport Cc: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd5e191e7610eb7ecb5e35b2045ceb6554bea15a Author: Mike Rapoport Date: Mon Apr 6 19:00:56 2009 -0700 SPI: add dma_alignment field to spi_master Some SPI controllers have restrictions on DMAable buffers alignemt. Currently if the buffer supplied by protocol driver is not properly aligned, the controller silently performs transfer in PIO mode. Addition of dma_alignment field to spi_master allows protocol drivers to perform proper alignment. Signed-off-by: Mike Rapoport Cc: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75c8915c0ca633f7c1839618bd5c6a5e26b24094 Author: Mike Rapoport Date: Mon Apr 6 19:00:55 2009 -0700 spi_bfin5xx: remove unused IS_DMA_ALIGNED macro Signed-off-by: Mike Rapoport Cc: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7bb3909b3293d503211d7f6af8ed62c1644b686 Author: Eric Miao Date: Mon Apr 6 19:00:54 2009 -0700 spi: pxa2xx_spi: introduce chipselect GPIO to simplify the common cases Most SPI peripherals use GPIOs as their chip selects, introduce .gpio_cs for this. Signed-off-by: Eric Miao Cc: David Brownell Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8fc657e6a114fadf78fdf8103e289a169c91c5d Author: Roel Kluin Date: Mon Apr 6 19:00:54 2009 -0700 spi: limit reaches -1, tested 0 With a postfix decrement limit will reach -1 rather than 0, so the warning will not be issued. Also, add a cpu_relax() into the busy-wait loop. Signed-off-by: Roel Kluin Cc: Mariusz Ceier Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93b61bddc13d9acf1fe341b39d826e80f3182d1e Author: Wolfgang Muees Date: Mon Apr 6 19:00:53 2009 -0700 Blackfin SPI Driver: Make mmc_spi driver work on Blackfin 1. Rewrite of the non-dma data transfer functions to use only ONE mode of TIMOD (TIMOD=0x1). With TIMOD=0, it was not possible to set the TX bit pattern. So the TDBR = 0xFFFF inside the read calls won't work. 2. Clear SPI_RDBR before reading and before duplex transfer. Otherwise the garbage data in RDBR will get read. Since mmc_spi uses a lot of duplex transfers, this is the main cause of mmc_spi failure. 3. Poll RXS for transfer completion. Polling SPIF or TXS cannot guarantee transfer completion. This may interrupt a transfer before it is finished. Also this may leave garbage data in buffer and affect next transfer. [Yi Li : add a field "u16 idle_tx_val" in "struct bfin5xx_spi_chip" to specify the value to transmit if no TX value is supplied.] Signed-off-by: Wolfgang Muees Signed-off-by: Yi Li Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42c78b2bf51bafb4cfa98dfecc28dd9b8bcd04b0 Author: Michael Hennerich Date: Mon Apr 6 19:00:51 2009 -0700 Blackfin SPI Driver: Add GPIO controlled SPI Slave Select support Add support for GPIO controlled SPI Chip Selects. To make use of this feature, set chip_select = 0 and add a proper cs_gpio to your controller_data. struct spi_board_info .chip_select = 0 struct bfin5xx_spi_chip .cs_gpio = GPIO_P### There are various SPI devices that require SPI MODE_0, and need to have the Chip Selects asserted during the entire transfer. Consider using SPI_MODE_3 (SPI_CPHA | SPI_CPOL) if your device allows it. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7d02e3c9577f070bc77354763bed7f24713dc53 Author: Mike Frysinger Date: Mon Apr 6 19:00:51 2009 -0700 Blackfin SPI Driver: fix NULL pointer crash Fix NULL pointer crash when cleaning up from invalid platform resources Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 138f97cd06deddd53ad496ac1656917a7b486d24 Author: Mike Frysinger Date: Mon Apr 6 19:00:50 2009 -0700 Blackfin SPI Driver: use bfin_spi_ prefix on all functions Do this because when things crash, we get simple names like "setup" and "start_queue" which is pretty difficult to trace back to the real thing: the spi driver Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9b2a76a4391cadb6d42da2ccf5e956c459acb72 Author: Yi Li Date: Mon Apr 6 19:00:49 2009 -0700 Blackfin SPI Driver: fix bug - correct usage of struct spi_transfer.cs_change According to comments in linux/spi/spi.h: * All SPI transfers start with the relevant chipselect active. Normally * it stays selected until after the last transfer in a message. Drivers * can affect the chipselect signal using cs_change. * * (i) If the transfer isn't the last one in the message, this flag is * used to make the chipselect briefly go inactive in the middle of the * message. Toggling chipselect in this way may be needed to terminate * a chip command, letting a single spi_message perform all of group of * chip transactions together. * * (ii) When the transfer is the last one in the message, the chip may * stay selected until the next transfer. On multi-device SPI busses * with nothing blocking messages going to other devices, this is just * a performance hint; starting a message to another device deselects * this one. But in other cases, this can be used to ensure correctness. * Some devices need protocol transactions to be built from a series of * spi_message submissions, where the content of one message is determined * by the results of previous messages and where the whole transaction * ends when the chipselect goes intactive. Signed-off-by: Yi Li Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cf3683472f043e6748c48228df6d8a35a47ecc2 Author: Yi Li Date: Mon Apr 6 19:00:44 2009 -0700 Blackfin SPI Driver: fix bug - spi controller driver does not assert/deassert CS correctly This bug can be observed when two SPI devices are sharing the spi bus: One device is set as SPI CS 7, another one is using SPI CS 4. In spi_bfin5xx.c: cs_active(), cs_deactive() are used to control SPI_FLG register. From the debug bellow: cs_active: flag: 0x7f91, chip->flag: 0x7f80, cs: 7 cs_active: flag: 0xef91, chip->flag: 0xef10, cs: 4 When device A (cs_7) activate CS 7, SPI_FLG is set as 0x7f91 (however, SPI_FLG should be set as 0x7f80, or 0x6f91 if in broadcast mode). Due to some HW bug (very possibly), if SPI_FLG is set as 0x7f91, SPISSEL7 is asserted, however SPISSEL4 will be asserted too (I can see this using the scope). This is unreasonable according to HRM. Signed-off-by: Yi Li Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a963ea83b316b0a3ebf1c7118a6c36b5cd334bb6 Author: Mike Frysinger Date: Mon Apr 6 19:00:43 2009 -0700 Blackfin SPI Driver: tweak magic spi dma sequence to get it working on BF54x Without this change, SPI DMA is not reliably under stress tests. Obiviously it's a hardware issue which is not addressed by any document. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aaaf939c573b783398b6af863576322256352f64 Author: Mike Frysinger Date: Mon Apr 6 19:00:42 2009 -0700 Blackfin SPI Driver: add timeout while waiting for SPIF in dma irq handler The "while" endless loop will cause the system hang if hardware error, so we add timeout control to make the system alive. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11d6f5995137ba4dc49e9337185ac0a8753f8f69 Author: Mike Frysinger Date: Mon Apr 6 19:00:41 2009 -0700 Blackfin SPI Driver: get dma working for SPI flashes When using a BF533-STAMP here with a W25X10 SPI flash. It works fine when enable_dma is disabled, but doesn't work at all when turning DMA on. We get just 0xff bytes back when trying to read the device. Change the code around so that it programs the SPI first and then enables DMA, it seems to work a lot better ... Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4160bde2d83d1c66e9c774c48015a13733fe9aba Author: Mike Frysinger Date: Mon Apr 6 19:00:40 2009 -0700 Blackfin SPI Driver: SPI slave select code cleanup - remove duplicated definition MAX_SPI_SSEL - remove unnecessary array size Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b31e27a6dc2c6534399c595ba78390125a56e90f Author: Mike Frysinger Date: Mon Apr 6 19:00:39 2009 -0700 Blackfin SPI Driver: use the properl BIT_CTL_xxx defines use the properl BIT_CTL_... defines rather than the internal driv er CFG_SPI_... defines Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40a2945b97b4da9120653d84f1c3a58fe58be64c Author: Mike Frysinger Date: Mon Apr 6 19:00:38 2009 -0700 Blackfin SPI Driver: do not check for SPI errors if DMA itself did not flag any We only need to check SPI error when DMA failes, cause that is the DMA IRQ handling routine. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d24bd1d0dc850e7aa68c27ec288eb699d41a5916 Author: Mike Frysinger Date: Mon Apr 6 19:00:38 2009 -0700 Blackfin SPI Driver: add a few more DMA debug messages Because of DMA hardware issue, we were trying to use software workaround. This patch add some useful debug messages to help us debugging the DMA code. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59bfcc664859029f60269ca2bf05b310d5a5760b Author: Mike Frysinger Date: Mon Apr 6 19:00:37 2009 -0700 Blackfin SPI Driver: drop bogus cast and touchup dma label Blackfin's related DMA callback API doesn't need void * cast, so drop it. And this driver is for all Blackfin processors not only for BF53x, we update the DMA request label for more meaningful information. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7aec35661733c651f616f9b3f69d758f6bfe2a7f Author: Mike Frysinger Date: Mon Apr 6 19:00:36 2009 -0700 Blackfin SPI Driver: unify duplicated code in dma read/write paths For DMA TX/RX operation in pump_transfers, DMA contriguration code in TX and RX paths are almost the same. This patch unify the duplicated DMA code to make it more readable. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04b95d2f7453d64f89ca1d8c3e70bcc7cc38320f Author: Mike Frysinger Date: Mon Apr 6 19:00:35 2009 -0700 Blackfin SPI Driver: pass DMA overflow error to the higher level If the SPI bus registers a receive overflow error, pass the result back up to the higher levels. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ace32865a3767e4e385b883868c228a2a6db225a Author: Mike Frysinger Date: Mon Apr 6 19:00:34 2009 -0700 Blackfin SPI Driver: use len_in_bytes when we care about the number of bytes transferred Use len_in_bytes when we care about the number of bytes transferred rather than the number of spi transactions. (this value will be the same for 8bit transfers, but not any other sizes) Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a42e809aa3150cf03698e10e57eb067dac6805a3 Author: Mike Frysinger Date: Mon Apr 6 19:00:33 2009 -0700 Blackfin SPI Driver: remove useless We already moved bfin_addr_dcachable() and friends into the cacheflush header where it belongs, so don't need to include here. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7513e006c64fbe2f43aef2139c8c1f2b1a9cb6b9 Author: Michael Hennerich Date: Mon Apr 6 19:00:32 2009 -0700 Blackfin SPI Driver: Fix erroneous SPI Clock divisor calculation Fix erroneous SPI Clock divisor calculation. Make sure SPI_BAUD is always >= 2. Writing a value of 0 or 1 to the SPI_BAUD register disables the serial clock. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Acked-by: David Brownell Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8cf5858c51f88208fe56b195251ab4f21265386c Author: Vitja Makarov Date: Mon Apr 6 19:00:31 2009 -0700 Blackfin SPI Driver: ensure cache coherency before doing DMA Flush or invalidate caches before doing DMA transfer, if needed. [Mike Frysinger : add comment to address the issue "Full duplex only works for non-DMA transfers".] Signed-off-by: Vitja Makarov Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bcfa9e47a7d1be6faef3be6c4b2049e585e2f38 Author: Herbert Valerio Riedel Date: Mon Apr 6 19:00:30 2009 -0700 hwmon: add support for GMT G760A fan speed PWM controller This controller can be found on the D-Link DNS-323 for instance, where it is to be configured via static i2c_board_info in the board-specific mach-orion/dns323-setup.c; this driver supports only the new-style driver model. Tested-by: Martin Michlmayr Signed-off-by: Herbert Valerio Riedel Signed-off-by: Matthew Palmer Signed-off-by: Laurie Bradshaw Signed-off-by: Martin Michlmayr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6260a4b0521a41189b2c2a8119096c1e21dbdf2c Author: KAMEZAWA Hiroyuki Date: Mon Apr 6 19:00:30 2009 -0700 /proc/pid/maps: don't show pgoff of pure ANON VMAs Recently, it's argued that what proc/pid/maps shows is ugly when a 32bit binary runs on 64bit host. /proc/pid/maps outputs vma's pgoff member but vma->pgoff is of no use information is the vma is for ANON. With this patch, /proc/pid/maps shows just 0 if no file backing store. [akpm@linux-foundation.org: coding-style fixes] [kamezawa.hiroyu@jp.fujitsu.com: coding-style fixes] Signed-off-by: KAMEZAWA Hiroyuki Cc: Mike Waychison Reported-by: Ying Han Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fafd688e4c0c34da0f3de909881117d374e4c7af Author: Peter W Morreale Date: Mon Apr 6 19:00:29 2009 -0700 mm: add /proc controls for pdflush threads Add /proc entries to give the admin the ability to control the minimum and maximum number of pdflush threads. This allows finer control of pdflush on both large and small machines. The rationale is simply one size does not fit all. Admins on large and/or small systems may want to tune the min/max pdflush thread count to best suit their needs. Right now the min/max is hardcoded to 2/8. While probably a fair estimate for smaller machines, large machines with large numbers of CPUs and large numbers of filesystems/block devices may benefit from larger numbers of threads working on different block devices. Even if the background flushing algorithm is radically changed, it is still likely that multiple threads will be involved and admins would still desire finer control on the min/max other than to have to recompile the kernel. The patch adds '/proc/sys/vm/nr_pdflush_threads_min' and '/proc/sys/vm/nr_pdflush_threads_max' with r/w permissions. The minimum value for nr_pdflush_threads_min is 1 and the maximum value is the current value of nr_pdflush_threads_max. This minimum is required since additional thread creation is performed in a pdflush thread itself. The minimum value for nr_pdflush_threads_max is the current value of nr_pdflush_threads_min and the maximum value can be 1000. Documentation/sysctl/vm.txt is also updated. [akpm@linux-foundation.org: fix comment, fix whitespace, use __read_mostly] Signed-off-by: Peter W Morreale Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a56ed663047fc9927ec8b35750d23ece54f85dc7 Author: Peter W Morreale Date: Mon Apr 6 19:00:28 2009 -0700 mm: fix pdflush thread creation upper bound Fix a race on creating pdflush threads. Without the patch, it is possible to create more than MAX_PDFLUSH_THREADS threads, and this has been observed in practice on IO loaded SMP machines. The fix involves moving the lock around to protect the check against the thread count and correctly dealing with thread creation failure. This fix also _mostly_ repairs a race condition on how quickly the threads are created. The original intent was to create a pdflush thread (up to the max allowed) every second. Without this patch is is possible to create NCPUS pdflush threads concurrently. The 'mostly' caveat is because an assumption is made that thread creation will be successful. If we fail to create the thread, the miss is not considered fatal. (we will try again in 1 second) Signed-off-by: Peter W Morreale Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9133df726fdd3df0ca9efcaaae22442198851d65 Author: Randy Dunlap Date: Mon Apr 6 19:00:26 2009 -0700 esp: fix section mismatch warning Not critical. WARNING: drivers/char/esp.o(.text+0x278): Section mismatch in reference from the function show_serial_version() to the variable .init.data:serial_version The function show_serial_version() references the variable __initdata serial_version. This is often because show_serial_version lacks a __initdata annotation or the annotation of serial_version is wrong. WARNING: drivers/char/esp.o(.text+0x27d): Section mismatch in reference from the function show_serial_version() to the variable .init.data:serial_name The function show_serial_version() references the variable __initdata serial_name. This is often because show_serial_version lacks a __initdata annotation or the annotation of serial_name is wrong. Signed-off-by: Randy Dunlap Cc: Andrew J. Robinson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab3c9c686e22ab264269337ce7b75d9760211198 Author: Linus Torvalds Date: Tue Apr 7 07:59:41 2009 -0700 branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y Fix the branch tracer barfing on comma statements within if () statements. Signed-off-by: Ingo Molnar commit d9ad8bc0ca823705413f75b50c442a88cc518b35 Author: Bart Van Assche Date: Sun Apr 5 16:20:02 2009 +0200 branch tracer: Fix for enabling branch profiling makes sparse unusable One of the changes between kernels 2.6.28 and 2.6.29 is that a branch profiler has been added for if() statements. Unfortunately this patch makes the sparse output unusable with CONFIG_TRACE_BRANCH_PROFILING=y: when branch profiling is enabled, sparse prints so much false positives that the real issues are no longer visible. This behavior can be reproduced as follows: * enable CONFIG_TRACE_BRANCH_PROFILING, e.g. by running make allyesconfig or make allmodconfig. * run make C=2 Result: a huge number of the following sparse warnings. ... include/linux/cpumask.h:547:2: warning: symbol '______r' shadows an earlier one include/linux/cpumask.h:547:2: originally declared here ... The patch below fixes this by disabling branch profiling while analyzing the kernel code with sparse. See also: * http://lkml.org/lkml/2008/11/21/18 * http://bugzilla.kernel.org/show_bug.cgi?id=12925 Signed-off-by: Bart Van Assche Cc: Andrew Morton Cc: Steven Rostedt LKML-Reference: <200904051620.02311.bart.vanassche@gmail.com> Signed-off-by: Ingo Molnar commit d407e32efe060afa2b9a797a91376ebc65b4ce11 Author: Anton Vorontsov Date: Wed Apr 1 02:23:41 2009 +0400 PCI: Fix oops in pci_vpd_truncate pci_vpd_truncate() should check for dev->vpd->attr, otherwise this might happen: sky2 driver version 1.22 Unable to handle kernel paging request for data at address 0x0000000c Faulting instruction address: 0xc01836fc Oops: Kernel access of bad area, sig: 11 [#1] [...] NIP [c01836fc] pci_vpd_truncate+0x38/0x40 LR [c029be18] sky2_probe+0x14c/0x518 Call Trace: [ef82bde0] [c029bda4] sky2_probe+0xd8/0x518 (unreliable) [ef82be20] [c018a11c] local_pci_probe+0x24/0x34 [ef82be30] [c018a14c] pci_call_probe+0x20/0x30 [ef82be50] [c018a330] __pci_device_probe+0x64/0x78 [ef82be60] [c018a44c] pci_device_probe+0x30/0x58 [ef82be80] [c01aa270] really_probe+0x78/0x1a0 [ef82bea0] [c01aa460] __driver_attach+0xa4/0xa8 [ef82bec0] [c01a96ac] bus_for_each_dev+0x60/0x9c [ef82bef0] [c01aa0b4] driver_attach+0x24/0x34 [ef82bf00] [c01a9e08] bus_add_driver+0x12c/0x1cc [ef82bf20] [c01aa87c] driver_register+0x6c/0x110 [ef82bf30] [c018a770] __pci_register_driver+0x4c/0x9c [ef82bf50] [c03782c8] sky2_init_module+0x30/0x40 [ef82bf60] [c0001dbc] do_one_initcall+0x34/0x1a0 [ef82bfd0] [c0362240] do_initcalls+0x38/0x58 This happens with CONFIG_SKY2=y, and "ip=on" kernel command line, so pci_vpd_truncate() is called before late_initcall(pci_sysfs_init), therefore ->attr isn't yet initialized. Acked-by: Stephen Hemminger Signed-off-by: Anton Vorontsov Signed-off-by: Jesse Barnes Signed-off-by: Linus Torvalds commit 548cbdc858bb81d72fbcb91a196069559b2b4684 Merge: a01da1d a0558fc Author: Linus Torvalds Date: Tue Apr 7 08:02:02 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: tomoyo: remove "undelete domain" command. commit a01da1d0f643142fa6845eb3bd14daab8ce7bea5 Merge: 44d84af 2e45e77 Author: Linus Torvalds Date: Tue Apr 7 07:42:25 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param: Revert "module: remove the SHF_ALLOC flag on the __versions section." commit 44d84afa834b799560d7dbe47250ad7557f5ca2f Merge: f8201ab 11b55da Author: Linus Torvalds Date: Tue Apr 7 07:40:55 2009 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (28 commits) powerpc: Fix oops when loading modules powerpc: Wire up preadv and pwritev powerpc/ftrace: Fix printf format warning powerpc/ftrace: Fix #if that should be #ifdef powerpc: Fix ptrace compat wrapper for FPU register access powerpc: Print information about mapping hw irqs to virtual irqs powerpc: Correct dependency of KEXEC powerpc: Disable VSX or current process in giveup_fpu/altivec powerpc/pseries: Enable relay in pseries_defconfig powerpc/pseries: Fix ibm,client-architecture comment powerpc/pseries: Scan for all events in rtasd powerpc/pseries: Add dispatch dispersion statistics powerpc: Clean up some prom printouts powerpc: Print progress of ibm,client-architecture method powerpc: Remove duplicated #include's powerpc/pmac: Fix internal modem IRQ on Wallstreet PowerBook powerpc/wdrtas: Update wdrtas_get_interval to use rtas_data_buf fsl-diu-fb: Pass the proper device for dma mapping routines powerpc/pq2fads: Update device tree for use with device-tree-aware u-boot. cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console. ... commit f8201abcb2badce7eaa6a3715f9a228cfd88a453 Author: Ingo Molnar Date: Tue Apr 7 14:16:50 2009 +0800 ramfs: fix double freeing s_fs_info on failed mount If ramfs mount fails, s_fs_info will be freed twice in ramfs_fill_super() and ramfs_kill_sb(), leading to kernel oops. Consolidate and beautify the code. Make sure s_fs_info and s_root are in known good states. Acked-by: Wu Fengguang Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 2c03d07ad54db03b813bb98c469790c07ca9f5dd Author: Luca Tettamanti Date: Tue Apr 7 15:32:59 2009 +0200 hwmon: Add Asus ATK0110 support Asus boards have an ACPI interface for interacting with the hwmon (fan, temperatures, voltages) subsystem; this driver exposes the relevant information via the standard sysfs interface. There are two different ACPI interfaces: - an old one (based on RVLT/RFAN/RTMP) - a new one (GGRP/GITM) Both may be present but there a few cases (my board, sigh) where the new interface is just an empty stub; the driver defaults to the old one when both are present. The old interface has received a considerable testing, but I'm still awaiting confirmation from my tester that the new one is working as expected (hence the debug code is still enabled). Currently all the attributes are read-only, though a (partial) control should be possible with a bit more work. Signed-off-by: Luca Tettamanti Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare commit 797eaa4b0242a41cb6bc913890b9ec22ec8788ed Author: Jean Delvare Date: Tue Apr 7 15:32:59 2009 +0200 hwmon: (lm95241) Convert to new-style i2c driver The legacy i2c binding model is going away really soon now, so convert the lm95241 driver to the new binding model or it will break. Signed-off-by: Jean Delvare Cc: Davide Rizzo commit 1bbe2a83ab68e5cf8c66c372c7cb3b51910c2cfe Author: Zhaolei Date: Fri Apr 3 18:24:46 2009 +0800 ftrace: Correct a text align for event format output If we cat debugfs/tracing/events/ftrace/bprint/format, we'll see: name: bprint ID: 6 format: field:unsigned char common_type; offset:0; size:1; field:unsigned char common_flags; offset:1; size:1; field:unsigned char common_preempt_count; offset:2; size:1; field:int common_pid; offset:4; size:4; field:int common_tgid; offset:8; size:4; field:unsigned long ip; offset:12; size:4; field:char * fmt; offset:16; size:4; field: char buf; offset:20; size:0; print fmt: "%08lx (%d) fmt:%p %s" There is an inconsistent blank before char buf. Signed-off-by: Zhao Lei LKML-Reference: <49D5E3EE.70201@cn.fujitsu.com> Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit bc2b6871c17b3aff79fb14e1a1c06c5f5a187f76 Author: Nikanth Karthikesan Date: Mon Mar 23 11:58:31 2009 +0530 Update /debug/tracing/README Some of the tracers have been renamed, which was not updated in the in-kernel run-time README file. Update it. Signed-off-by: Nikanth Karthikesan LKML-Reference: <200903231158.32151.knikanth@suse.de> Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit b0dfa978c7a1699fb3506fbfcba0b6a5c4bd17ae Author: Frederic Weisbecker Date: Wed Apr 1 22:53:08 2009 +0200 tracing/ftrace: alloc the started cpumask for the trace file Impact: fix a crash while cat trace file Currently we are using a cpumask to remind each cpu where a trace occured. It lets us notice the user that a cpu just had its first trace. But on latest -tip we have the following crash once we cat the trace file: IP: [] print_trace_fmt+0x45/0xe7 *pde = 00000000 Oops: 0000 [#1] PREEMPT SMP last sysfs file: /sys/class/net/eth0/carrier Pid: 3897, comm: cat Not tainted (2.6.29-tip-02825-g0f22972-dirty #81) EIP: 0060:[] EFLAGS: 00010297 CPU: 0 EIP is at print_trace_fmt+0x45/0xe7 EAX: 00000000 EBX: 00000000 ECX: c12d9e98 EDX: ccdb7010 ESI: d31f4000 EDI: 00322401 EBP: d31f3f10 ESP: d31f3efc DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process cat (pid: 3897, ti=d31f2000 task=d3b3cf20 task.ti=d31f2000) Stack: d31f4080 ccdb7010 d31f4000 d691fe70 ccdb7010 d31f3f24 c0270e5c d31f4000 d691fe70 d31f4000 d31f3f34 c02718e8 c12d9e98 d691fe70 d31f3f70 c02bfc33 00001000 09130000 d3b46e00 d691fe98 00000000 00000079 00000001 00000000 Call Trace: [] ? print_trace_line+0x170/0x17c [] ? s_show+0xa7/0xbd [] ? seq_read+0x24a/0x327 [] ? seq_read+0x0/0x327 [] ? vfs_read+0x86/0xe1 [] ? sys_read+0x40/0x65 [] ? sysenter_do_call+0x12/0x3c Code: 00 00 00 89 45 ec f7 c7 00 20 00 00 89 55 f0 74 4e f6 86 98 10 00 00 02 74 45 8b 86 8c 10 00 00 8b 9e a8 10 00 00 e8 52 f3 ff ff <0f> a3 03 19 c0 85 c0 75 2b 8b 86 8c 10 00 00 8b 9e a8 10 00 00 EIP: [] print_trace_fmt+0x45/0xe7 SS:ESP 0068:d31f3efc CR2: 0000000000000000 ---[ end trace aa9cf38e5ebed9dd ]--- This is because we alloc the iter->started cpumask on tracing_pipe_open but not on tracing_open. It hadn't been noticed until now because we need to have ring buffer overruns to activate the starting of cpu buffer detection. Also, we need a check to not print the messagge for the first trace on the file. Signed-off-by: Frederic Weisbecker LKML-Reference: <1238619188-6109-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 5ab8026a3016fbed5c73aa070d9f6989cf791099 Author: Huang Weiyi Date: Tue Mar 31 20:41:31 2009 +0800 tracing, x86: remove duplicated #include Remove duplicated #include in arch/x86/kernel/ftrace.c. Signed-off-by: Huang Weiyi LKML-Reference: <1238503291-2532-1-git-send-email-weiyi.huang@gmail.com> Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 8bcae09b93e7f96f700b6bb372c2b3f2b36636dc Author: Zhaolei Date: Tue Mar 31 15:24:51 2009 +0800 ftrace: Add check of sched_stopped for probe_sched_wakeup The wakeup tracing in sched_switch does not stop when a user disables tracing. This is because the probe_sched_wakeup() is missing the check to prevent the wakeup from being traced. Signed-off-by: Zhao Lei LKML-Reference: <49D1C543.3010307@cn.fujitsu.com> Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 5ac9f62267dc92c7735c642a5942d9e6c1190308 Author: Steven Rostedt Date: Wed Mar 25 20:55:00 2009 -0400 function-graph: add proper initialization for init task Impact: fix to crash going to kexec The init task did not properly initialize the function graph pointers. Altough these pointers are NULL, they can not be assumed to be NULL for the init task, and must still be properly initialize. This usually is not an issue since a problem only arises when a task exits, and the init tasks do not usually exit. But when doing tests with kexec, the init tasks do exit, and the bug appears. This patch properly initializes the init tasks function graph data structures. Reported-and-Tested-by: Yinghai Lu LKML-Reference: Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 5f0c6c03c5fee91c02c696bc9bf4c0d41392abe7 Author: Frederic Weisbecker Date: Fri Mar 27 14:22:10 2009 +0100 tracing/ftrace: fix missing include string.h Building a kernel with tracing can raise the following warning on tip/master: kernel/trace/trace.c:1249: error: implicit declaration of function 'vbin_printf' We are missing an include to string.h Reported-by: Ingo Molnar Signed-off-by: Frederic Weisbecker LKML-Reference: <1238160130-7437-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit cf8e3474654f20433aab9aa35826d43b5f245008 Author: Lai Jiangshan Date: Mon Mar 30 13:48:00 2009 +0800 tracing: fix incorrect return type of ns2usecs() Impact: fix time output bug in 32bits system ns2usecs() returns 'long', it's incorrect. (In i386) ... -0 [000] 521.442100: _spin_lock <-tick_do_update_jiffies64 -0 [000] 521.442101: do_timer <-tick_do_update_jiffies64 -0 [000] 521.442102: update_wall_time <-do_timer -0 [000] 521.442102: update_xtime_cache <-update_wall_time .... (It always print the time less than 2200 seconds besides ...) Because 'long' is 32bits in i386. ( (1<<31) useconds is about 2200 seconds) ... -0 [001] 4154502640.134759: rcu_bh_qsctr_inc <-__do_softirq -0 [001] 4154502640.134760: _local_bh_enable <-__do_softirq -0 [001] 4154502640.134761: idle_cpu <-irq_exit ... (very large value) Because 'long' is a signed type and it is 32bits in i386. Changes in v2: return 'unsigned long long' instead of 'cycle_t' Signed-off-by: Lai Jiangshan LKML-Reference: <49D05D10.4030009@cn.fujitsu.com> Reported-by: Li Zefan Acked-by: Frederic Weisbecker Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 301fd748e2c81e78e74edbc694a64caa7b95dda2 Author: Steven Rostedt Date: Fri Apr 3 11:12:23 2009 -0400 tracing: remove CALLER_ADDR2 from wakeup tracer Maneesh Soni was getting a crash when running the wakeup tracer. We debugged it down to the recording of the function with the CALLER_ADDR2 macro. This is used to get the location of the caller to schedule. But the problem comes when schedule is called by assmebly. In the case that Maneesh had, retint_careful would call schedule. But retint_careful does not set up a proper frame pointer. CALLER_ADDR2 is defined as __builtin_return_address(2). This produces the following assembly in the wakeup tracer code. mov 0x0(%rbp),%rcx <--- get the frame pointer of the caller mov %r14d,%r8d mov 0xf2de8e(%rip),%rdi mov 0x8(%rcx),%rsi <-- this is __builtin_return_address(1) mov 0x28(%rdi,%rax,8),%rbx mov (%rcx),%rax <-- get the frame pointer of the caller's caller mov %r12,%rcx mov 0x8(%rax),%rdx <-- this is __builtin_return_address(2) At the reading of 0x8(%rax) Maneesh's machine would take a fault. The reason is that retint_careful did not set up the return address and the content of %rax here was zero. To verify this, I sent Maneesh a patch to create a frame pointer in retint_careful. He ran the test again but this time he would take the same type of fault from sysret_careful. The retint_careful was no longer an issue, but there are other callers that still have issues. Instead of adding frame pointers for all callers to schedule (in possibly all archs), it is much safer to simply not use CALLER_ADDR2. This loses out on knowing what called schedule, but the function tracer will help there if needed. Reported-by: Maneesh Soni Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit ffcd7dca3ab78f9f425971756e5e90024157f6be Author: Alexander Beregalov Date: Tue Apr 7 13:48:21 2009 +0200 loop: mutex already unlocked in loop_clr_fd() mount/1865 is trying to release lock (&lo->lo_ctl_mutex) at: but there are no more locks to release! mutex is already unlocked in loop_clr_fd(), we should not try to unlock it in lo_release() again. Signed-off-by: Alexander Beregalov Signed-off-by: Jens Axboe commit a053958f073740219df1da596b42bfefdab634c4 Merge: 4fafd5b e2494e1 Author: Ingo Molnar Date: Tue Apr 7 13:40:49 2009 +0200 Merge branch 'tracing/blktrace-fixes' into tracing/urgent Merge reason: this used to be a tracing/blktrace-v2 devel topic still cooking during the merge window - has propagated to fixes Signed-off-by: Ingo Molnar commit d6648da122870ff42bc720da25483bdb8bc868f8 Author: Peter Ujfalusi Date: Tue Apr 7 09:14:00 2009 +0300 ASoC: TWL4030: Compillation error fix Fix for compillation error introduced by the constrain patch. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit b029195dda0129b427c6e579a3bb3ae752da3a93 Author: Jens Axboe Date: Tue Apr 7 11:38:31 2009 +0200 cfq-iosched: don't let idling interfere with plugging When CFQ is waiting for a new request from a process, currently it'll immediately restart queuing when it sees such a request. This doesn't work very well with streamed IO, since we then end up splitting IO that would otherwise have been merged nicely. For a simple dd test, this causes 10x as many requests to be issued as we should have. Normally this goes unnoticed due to the low overhead of requests at the device side, but some hardware is very sensitive to request sizes and there it can cause big slow downs. Signed-off-by: Jens Axboe commit 65de394df21f8ccc61525f77b0e4ee6940a0932e Author: Wolfram Sang Date: Mon Apr 6 16:27:45 2009 +0200 i2c: imx: Make disable_delay a per-device variable 'disable_delay' was static which is wrong as it is calculated using the per-device bus speed. This patch turns 'disable_delay' into a per-device variable. Reported-by: Sascha Hauer Signed-off-by: Wolfram Sang Acked-by: Guennadi Liakhovetski Acked-by: Darius Augulis Signed-off-by: Ben Dooks commit b486ddbc0fb8127ccf2c820cfbf0b98e6f8a4e97 Author: Oskar Schirmer Date: Thu Apr 2 13:19:07 2009 +0200 i2c: xtensa s6000 i2c driver Support for the s6000 on-chip i2c controller. Signed-off-by: Oskar Schirmer Signed-off-by: Daniel Glöckner Signed-off-by: Ben Dooks commit c724d67dfff3bd547d2768b450af8d3b9f83bb27 Author: Wolfgang Grandegger Date: Tue Apr 7 10:20:57 2009 +0200 powerpc/85xx: i2c-mpc: use new I2C bindings for the Socates board Preserve I2C clock settings for the Socrates MPC8544 board. Signed-off-by: Wolfgang Grandegger Signed-off-by: Ben Dooks commit f2bd5efe723814916ece92ccfa0bffb085c94b94 Author: Wolfgang Grandegger Date: Tue Apr 7 10:20:55 2009 +0200 i2c: i2c-mpc: make I2C bus speed configurable This patch makes the I2C bus speed configurable by using the I2C node property "clock-frequency". If the property is not defined, the old fixed clock settings will be used for backward comptibility. The generic I2C clock properties, especially the CPU-specific source clock pre-scaler are defined via the OF match table: static const struct of_device_id mpc_i2c_of_match[] = { ... {.compatible = "fsl,mpc8543-i2c", .data = &(struct fsl_i2c_match_data) { .setclock = mpc_i2c_setclock_8xxx, .prescaler = 2, }, }, The "data" field defines the relevant I2C setclock function and the relevant pre-scaler for the I2C source clock frequency. It uses arch-specific tables and functions to determine resonable Freqency Divider Register (fdr) values for MPC83xx, MPC85xx, MPC86xx, MPC5200 and MPC5200B. The i2c->flags field and the corresponding FSL_I2C_DEV_* definitions have been removed as they are obsolete. Signed-off-by: Wolfgang Grandegger Signed-off-by: Ben Dooks commit 54377cd059061637b627e236a459c58e274f35c6 Author: Wolfgang Grandegger Date: Tue Apr 7 10:20:54 2009 +0200 i2c: i2c-mpc: use dev based printout function This patch used the dev_dbg, dev_err, etc. functions for debug and error output instead of printk and pr_debug. Signed-off-by: Wolfgang Grandegger Signed-off-by: Ben Dooks commit 8101a30095e4fbbe1ffc1dc8f8e6928b9e1ea1de Author: Wolfgang Grandegger Date: Tue Apr 7 10:20:53 2009 +0200 i2c: i2c-mpc: various coding style fixes Fix errors reported by checkpatch (indention, long lines, trailing white space, etc.). Signed-off-by: Wolfgang Grandegger Signed-off-by: Ben Dooks commit 309c18d2cd7fbef9a30634c031ddfa4fecd22848 Author: Darius Augulis Date: Tue Mar 31 14:52:54 2009 +0300 i2c: imx: Add missing request_mem_region in probe() Signed-off-by: Darius Augulis [ben-linux@fluff.org: fix minor patch fault in remove] Signed-off-by: Ben Dooks commit 18dc83a6ea483941fb34293c6805a85bbcf0f718 Author: Mark Brown Date: Thu Feb 26 16:29:22 2009 +0000 i2c: i2c-s3c2410: Initialise Samsung I2C controller early This is required in order to ensure that core system devices such as voltage regulators attached via I2C are avaiable early in boot. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit c564e6ae6c5aa6e3995ff87ed4a32b4788ad5109 Author: Daniel Silverstone Date: Fri Mar 13 13:53:46 2009 +0000 i2c-s3c2410: Simplify bus frequency calculation The platform data for the i2c-s3c2410 driver used to allow a min, max and desired frequency for the I2C bus. This patch reduces it to simply a desired frequency ceiling and corrects all the uses of the platform data appropriately. This means, for example, that on a system with a 66MHz fclk, a request for 100KHz will achieve 65KHz which is safe and acceptable, rather than 378KHz which it would have achieved without this change. Signed-off-by: Simtec Linux Team Signed-off-by: Daniel Silverstone [ben-linux@fluff.org: tidy subject and description] Signed-off-by: Ben Dooks commit a192f7153bb33151f83440cd9c0442233a064bf1 Author: Ben Dooks Date: Fri Mar 27 10:52:13 2009 +0000 i2c-s3c2410: sda_delay should be in ns, not clock ticks The sda_delay field should be specified in ns, not in clock ticks as when using cpufreq we could be changing the bus rate. Signed-off-by: Ben Dooks commit aa11e38ce6fe8846fec046a95cecd5d4690c48cd Author: Darius Augulis Date: Fri Jan 30 10:32:28 2009 +0200 i2c: iMX/MXC support Implementation of I2C Adapter/Algorithm Driver for I2C Bus integrated in Freescale's i.MX/MXC processors. Signed-off-by: Darius Augulis Tested-by: Sascha Hauer Reviewed-by: Wolfram Sang Signed-off-by: Ben Dooks commit 5e34437840d33554f69380584311743b39e8fbeb Merge: 77d0563 d508afb Author: Ingo Molnar Date: Tue Apr 7 11:15:40 2009 +0200 Merge branch 'linus' into core/softlockup Conflicts: kernel/sysctl.c commit 2e45e77787c9d0720b046eb69856edf43b17e33e Author: Rusty Russell Date: Tue Apr 7 17:12:43 2009 +0930 Revert "module: remove the SHF_ALLOC flag on the __versions section." This reverts commit 9cb610d8e35fe3ec95a2fe2030b02f85aeea83c1. This was an impressively stupid patch. Firstly, we reset the SHF_ALLOC flag lower down in the same function, so the patch was useless. Even better, find_sec() ignores sections with SHF_ALLOC not set, so it breaks CONFIG_MODVERSIONS=y with CONFIG_MODULE_FORCE_LOAD=n, which refuses to load the module since it can't find the __versions section. Signed-off-by: Rusty Russell commit 2385327725419a76cfbca7258abd95908b8ba9eb Author: Jens Axboe Date: Tue Apr 7 08:59:11 2009 +0200 block: remove unused REQ_UNPLUG The request inherits the unplug flag from the bio, but it isn't actually used. The bio flag stops at __make_request(), which tells it to unplug after submission. Passing it on to the request doesn't make any sense. Signed-off-by: Jens Axboe commit 75e50984f062de2abc4bd84c642923e2c48ce2ae Author: Jens Axboe Date: Tue Apr 7 08:56:14 2009 +0200 cfq-iosched: kill two unused cfqq flags We only manipulate the must_dispatch and queue_new flags, they are not tested anymore. So get rid of them. Signed-off-by: Jens Axboe commit 77d05632baee21b1cef8730d7c06aa69601e4dca Author: Ingo Molnar Date: Tue Apr 7 08:55:36 2009 +0200 softlockup: make DETECT_HUNG_TASK default depend on DETECT_SOFTLOCKUP Don't offer a default-y option when the user has turned off CONFIG_DETECT_SOFTLOCKUP already. Do offer it as 'y' only if DETECT_SOFTLOCKUP is on already. This makes it match previous behavior - where the hung-task check was embedded i CONFIG_DETECT_SOFTLOCKUP code. Cc: Linus Torvalds Signed-off-by: Ingo Molnar commit 2f5cb7381b737e24c8046fd4aeab571fb71315f5 Author: Jens Axboe Date: Tue Apr 7 08:51:19 2009 +0200 cfq-iosched: change dispatch logic to deal with single requests at the time The IO scheduler core calls into the IO scheduler dispatch_request hook to move requests from the IO scheduler and into the driver dispatch list. It only does so when the dispatch list is empty. CFQ moves several requests to the dispatch list, which can cause higher latencies if we suddenly have to switch to some important sync IO. Change the logic to move one request at the time instead. This should almost be functionally equivalent to what we did before, except that we now honor 'quantum' as the maximum queue depth at the device side from any single cfqq. If there's just a single active cfqq, we allow up to 4 times the normal quantum. Signed-off-by: Jens Axboe commit 3fbed4c61abd8458896e38633d10110cb5a589d4 Author: unsik Kim Date: Thu Apr 2 12:50:58 2009 -0700 mflash: initial support This driver supports mflash IO mode for linux. Mflash is embedded flash drive and mainly targeted mobile and consumer electronic devices. Internally, mflash has nand flash and other hardware logics and supports 2 different operation (ATA, IO) modes. ATA mode doesn't need any new driver and currently works well under standard IDE subsystem. Actually it's one chip SSD. IO mode is ATA-like custom mode for the host that doesn't have IDE interface. Followings are brief descriptions about IO mode. A. IO mode based on ATA protocol and uses some custom command. (read confirm, write confirm) B. IO mode uses SRAM bus interface. C. IO mode supports 4kB boot area, so host can boot from mflash. This driver is quitely similar to a standard ATA driver, but because of following reasons it is currently seperated with ATA layer. 1. ATA layer deals standard ATA protocol. ATA layer have many low- level device specific interface, but data transfer keeps ATA rule. But, mflash IO mode doesn't. 2. Even though currently not used in mflash driver code, mflash has some custom command and modes. (nand fusing, firmware patch, etc) If this feature supported in linux kernel, ATA layer more altered. 3. Currently PATA platform device driver doesn't support interrupt. (I'm not sure) But, mflash uses interrupt (polling mode is just for debug). 4. mflash is somewhat under-develop product. Even though some company already using mflash their own product, I think more time is needed for standardization of custom command and mode. That time (maybe October) I will talk to with ATA people. If they accept integration, I will integrate. Signed-off-by: unsik Kim Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit e143858104e318263689c551543dfc3f186cea12 Author: Mike Miller Date: Thu Apr 2 12:50:56 2009 -0700 cciss: change to discover first memory BAR Add a method for discovering the first memory BAR. All Smart Array controllers to date have always had the the memory BAR as the first BAR. A new controller to be released later this year breaks that model. Signed-off-by: Mike Miller Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit 0a9279cc7cbe726e995c44a1acae81d446775816 Author: Mike Miller Date: Thu Apr 2 12:50:55 2009 -0700 cciss: kernel scan thread for MSA2012 The MSA2012 cannot inform the driver of configuration changes since all management is out of band. This is a departure from any storage we have supported in the past. We need some way to detect changes on the topology so we implement this kernel thread. In some instances there's nothing we can do from the driver (like LUN failure) so just print out a message. In the case where logical volumes are added or deleted we call rebuild_lun_table to refresh the driver's view of the world. Signed-off-by: Mike Miller Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit ac44e5b2ed62bf4acf9df84575d3f18c7a6fdf22 Author: Jens Axboe Date: Fri Mar 27 10:43:52 2009 +0100 cciss: fix residual count for block pc requests We must complete the full request, so store the request count and then set the ->data_len to the residual count from the hardware. Signed-off-by: Jens Axboe commit 26308eab69aa193f7b3fb50764a64ae14544a39b Author: Jerome Marchand Date: Fri Mar 27 10:31:51 2009 +0100 block: fix inconsistency in I/O stat accounting code This forces in_flight to be zero when turning off or on the I/O stat accounting and stops updating I/O stats in attempt_merge() when accounting is turned off. Signed-off-by: Jerome Marchand Signed-off-by: Jens Axboe commit 6c7e8cee6a9128eeb7f83c3ad1cb243f77f5cb16 Author: Jens Axboe Date: Fri Mar 27 10:30:47 2009 +0100 block: elevator quiescing helpers Simple helper functions to quiesce the request queue. These are currently only used for switching IO schedulers on-the-fly, but we can use them to properly switch IO accounting on and off as well. Signed-off-by: Jerome Marchand Signed-off-by: Jens Axboe commit a0558fc3491c0494feb8472cf6c0119e43fd9484 Author: Tetsuo Handa Date: Mon Apr 6 20:49:14 2009 +0900 tomoyo: remove "undelete domain" command. Since TOMOYO's policy management tools does not use the "undelete domain" command, we decided to remove that command. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit 11b55da700eb77905f1c2dde3a0cbeedc665a753 Author: Paul Mackerras Date: Mon Apr 6 17:21:10 2009 +0000 powerpc: Fix oops when loading modules This fixes a problem reported by Sean MacLennan where loading any module would cause an oops. We weren't marking the pages containing the module text as having hardware execute permission, due to a bug introduced in commit 8d1cf34e ("powerpc/mm: Tweak PTE bit combination definitions"), hence trying to execute the module text caused an exception on processors that support hardware execute permission. This adds _PAGE_HWEXEC to the definitions of PAGE_KERNEL_X and PAGE_KERNEL_ROX to fix this problem. Reported-by: Sean MacLennan Signed-off-by: Paul Mackerras commit 1a917bb549deb0b6bcb0321db22e9c27525a1e3d Author: Stephen Rothwell Date: Mon Apr 6 17:19:50 2009 +0000 powerpc: Wire up preadv and pwritev [paulus@samba.org: changed to use syscall numbers 320 and 321 since perf_counters is currently using 319.] Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 7ddb7ad11f862f46d6d55d629a6fb45a5f4cb030 Author: Michael Ellerman Date: Mon Apr 6 04:40:46 2009 +0000 powerpc/ftrace: Fix printf format warning 'tramp' is an unsigned long, so print it with %lx. Fixes the following build warning: arch/powerpc/kernel/ftrace.c:291: error: format ‘%x’ expects type ‘unsigned int’, but argument 2 has type ‘long unsigned int’ Signed-off-by: Michael Ellerman Acked-by: Steven Rostedt Signed-off-by: Paul Mackerras commit f4952f6cbeb025bc90906b740dc495f4817266d6 Author: Michael Ellerman Date: Mon Apr 6 04:40:45 2009 +0000 powerpc/ftrace: Fix #if that should be #ifdef Commit bb7253403f7a4670a128e4c080fd8ea1bd4d5029 ("powerpc64, ftrace: save toc only on modules for function graph"), added an #if CONFIG_PPC64. This changes it to #ifdef. Fixes the following warning on 32-bit builds: arch/powerpc/kernel/ftrace.c:562:5: error: "CONFIG_PPC64" is not defined Signed-off-by: Michael Ellerman Acked-by: Steven Rostedt Signed-off-by: Paul Mackerras commit bc826666e4252f78d2b144af3b7d699ff5efce0a Author: Michael Neuling Date: Sun Apr 5 20:59:39 2009 +0000 powerpc: Fix ptrace compat wrapper for FPU register access The ptrace compat wrapper mishandles access to the fpu registers. The PTRACE_PEEKUSR and PTRACE_POKEUSR requests miscalculate the index into the fpr array due to the broken FPINDEX macro. The PPC_PTRACE_PEEKUSR_3264 request needs to use the same formula that the native ptrace interface uses when operating on the register number (as opposed to the 4-byte offset). The PPC_PTRACE_POKEUSR_3264 request didn't take TS_FPRWIDTH into account. Signed-off-by: Andreas Schwab Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit c7d07fdd5af084bbd0a7921f9b07037b9bc8829d Author: Michael Ellerman Date: Sun Apr 5 16:05:02 2009 +0000 powerpc: Print information about mapping hw irqs to virtual irqs The irq remapping layer seems to cause some confusion when people see a different irq number in /proc/interrupts vs the one they request in their driver or DTS. So have the irq remapping layer print out a message when we map an irq. The message is only printed the first time the irq is mapped, and it's KERN_DEBUG so most people won't see it. Signed-off-by: Michael Ellerman Acked-by: Grant Likely Acked-by: Wolfram Sang Signed-off-by: Paul Mackerras commit cb93d568e1ed2596e27f35b39241fe83955d9b26 Author: Geert Uytterhoeven Date: Thu Apr 2 06:25:41 2009 +0000 powerpc: Correct dependency of KEXEC commit 28794d34ecb6815a3fa0a4256027c9b081a17c5f ("powerpc/kconfig: Kill PPC_MULTIPLATFORM") broke KEXEC, by making it dependent on BOOK3S, while it should be PPC_BOOK3S. Signed-off-by: Geert Uytterhoeven Signed-off-by: Paul Mackerras commit 7e875e9dc8af70d126fa632446e967327ac3fdda Author: Michael Neuling Date: Wed Apr 1 18:02:42 2009 +0000 powerpc: Disable VSX or current process in giveup_fpu/altivec When we call giveup_fpu, we need to need to turn off VSX for the current process. If we don't, on return to userspace it may execute a VSX instruction before the next FP instruction, and not have its register state refreshed correctly from the thread_struct. Ditto for altivec. This caused a bug where an unaligned lfs or stfs results in fix_alignment calling giveup_fpu so it can use the FPRs (in order to do a single <-> double conversion), and then returning to userspace with FP off but VSX on. Then if a VSX instruction is executed, before another FP instruction, it will proceed without another exception and hence have the incorrect register state for VSX registers 0-31. lfs unaligned <- alignment exception turns FP off but leaves VSX on VSX instruction <- no exception since VSX on, hence we get the wrong VSX register values for VSX registers 0-31, which overlap the FPRs. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 4c6cf42843e924fd2f71439d87e85b739b2aa973 Author: Anton Blanchard Date: Tue Mar 31 20:14:25 2009 +0000 powerpc/pseries: Enable relay in pseries_defconfig Enable relay in pseries config, ppc64_defconfig had it enabled but pseries did not. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 856cc2f0bea673b5fcd1500533ee8ffd6c0749bd Author: Anton Blanchard Date: Tue Mar 31 20:14:01 2009 +0000 powerpc/pseries: Fix ibm,client-architecture comment We specify a 64MB RMO, but the comment says 128MB. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 4a9f9506e7cbee58d2b86329e68e4d37761bb608 Author: Anton Blanchard Date: Tue Mar 31 20:13:27 2009 +0000 powerpc/pseries: Scan for all events in rtasd Instead of checking for known events, pass in all 1s so we handle future event types. We were currently missing the IO event type. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 0559f0a7611bdd336b7297dce179f793b565f148 Author: Anton Blanchard Date: Tue Mar 31 20:12:44 2009 +0000 powerpc/pseries: Add dispatch dispersion statistics PHYP tells us how often a shared processor dispatch changed physical cpus. This can highlight performance problems caused by the hypervisor. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 1f8737aab39e15684bf6b6b53586b7c89a269f79 Author: Anton Blanchard Date: Tue Mar 31 20:06:15 2009 +0000 powerpc: Clean up some prom printouts Make all messages consistent, some have spaces before the "...", some do not. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 4da727ae2aa62f134c79d38c41d15f50d912745f Author: Anton Blanchard Date: Tue Mar 31 20:06:14 2009 +0000 powerpc: Print progress of ibm,client-architecture method The ibm,client-architecture method will often cause a reconfiguration reboot. When this happens the last thing we see is: Hypertas detected, assuming LPAR ! Which doesn't explain what just happened. Wrap the ibm,client-architecture so it's clear what is going on: Calling ibm,client-architecture... done In order to maintain the law of conservation of screen real estate, downgrade two other messages to debug. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 85701e6ac1b75d983610c24cfdaafdaaf56cfbb2 Author: Huang Weiyi Date: Tue Mar 31 02:41:18 2009 +0000 powerpc: Remove duplicated #include's Remove duplicated #include's in - arch/powerpc/include/asm/ps3fb.h - arch/powerpc/kernel/setup-common.c Signed-off-by: Huang Weiyi Signed-off-by: Paul Mackerras commit f08b7e9f551fa74219bf32df483fb95c58aad94b Author: Benjamin Herrenschmidt Date: Mon Mar 30 17:34:04 2009 +0000 powerpc/pmac: Fix internal modem IRQ on Wallstreet PowerBook The (relatively) new pmac_zilog driver doesn't use the pre-munged IRQ numbers from the macio_dev unlike other macio things, it directly maps it off the OF device-tree. It does that because it can be initialized much earlier than the registration of the macio devices, in order to get a serial console early. Unfortunately, that means that it "misses" some fixups done by the macio layer to work around missing interrupt descriptions in the device-tree of the Wallstreet machines. This patch brings the necessary workaround into the pmac_zilog driver itself to bring it back to working condition. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit b6966b1be568e83a48585369731f1123a6f85157 Author: Mark Nelson Date: Mon Mar 23 20:30:41 2009 +0000 powerpc/wdrtas: Update wdrtas_get_interval to use rtas_data_buf The buffer passed to the ibm,get-system-parameter RTAS call must be in the RMA. To ensure we pass an address in the RMA use rtas_data_buf for the actual RTAS call and then copy the result to value. We can't just make it static because this can be compiled in as a module. Also add the WDRTAS_SP_SPI_LEN so we don't litter '4' throughout the function. Signed-off-by: Mark Nelson Tested-by: Adrian Reber Acked-by: Utz Bacher Signed-off-by: Paul Mackerras commit ae6e59caefd8d4097ccb096c95df95ec7e52fe88 Merge: 0221c81 f379188 Author: Paul Mackerras Date: Tue Apr 7 12:54:08 2009 +1000 Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge commit 0dd7b0cbb2e426553f184f5aeba40a2203f33700 Merge: d855ebe d2e8e52 Author: Takashi Iwai Date: Tue Apr 7 04:51:12 2009 +0200 Merge branch 'topic/misc' into for-linus commit d855ebec4573e52b93dddf9ac0dbca89203ee0e5 Merge: e50a96e fd60cc8 Author: Takashi Iwai Date: Tue Apr 7 04:50:46 2009 +0200 Merge branch 'topic/hda' into for-linus commit fd60cc897a6a5093acd9d6554013e679fcc6c5a1 Author: Matthew Ranostay Date: Mon Apr 6 09:30:46 2009 -0400 ALSA: hda - Add VREF powerdown sequence for another board Add powerdown sequence for VREF using a shared jack when the headphone is present and the microphone isn't on. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit d2e8e52976b9d0a34db529b06952d5187b78af8c Author: Deepika Makhija Date: Sat Apr 4 18:08:28 2009 +0530 ALSA: oss - volume control for CSWITCH and CROUTE Added an else part to check SNDRV_MIXER_OSS_PRESENT_CVOLUME for MIC (slot 7) in commit 36c7b833e5d2501142a371e4e75281d3a29fbd6b Similarly, checks and volume control is required for SNDRV_MIXER_OSS_PRESENT_CSWITCH and SNDRV_MIXER_OSS_PRESENT_CROUTE as well. Signed-off-by: Deepika Makhija Signed-off-by: Viral Mehta Signed-off-by: Takashi Iwai commit bca68467b59a24396554d8dd5979ee363c174854 Author: Akinobu Mita Date: Mon Apr 6 18:42:42 2009 +0900 ALSA: hda - add missing comma in ad1884_slave_vols Signed-off-by: Akinobu Mita Cc: Signed-off-by: Takashi Iwai commit e50a96e7c2aa523175b7b5642641327e2c587151 Merge: 8c941de 5c15a68 Author: Takashi Iwai Date: Tue Apr 7 04:17:31 2009 +0200 Merge branch 'topic/asoc' into for-linus commit 8c941de17679345a52fe53ac32d8aa53ebea369d Merge: 5f9c510 a7d9c09 Author: Takashi Iwai Date: Tue Apr 7 04:16:32 2009 +0200 Merge branch 'topic/usb-audio' into for-linus commit a7d9c0990d5503775784fef7ff44d74d7e3294fd Author: Clemens Ladisch Date: Fri Apr 3 09:48:26 2009 +0200 sound: usb-audio: allow period sizes less than 1 ms To enable periods shorter than 1 ms, we have to make sure that short periods are only available for alternate settings that have a small enough data packet interval. Furthermore, the code that aligns URBs to USB frames is now superfluous. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 744b89e542b9a16c9afb8a88f623fbe059c88ccb Author: Clemens Ladisch Date: Fri Apr 3 09:45:01 2009 +0200 sound: usb-audio: save data packet interval in audioformat structure The data packet interval needs to be available in the audioformat structure, together with the other audio format parameters, so that it can be used to influence ALSA hardware parameters. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 4608eb089b41386e96bd1410326073a6c1c221ba Author: Clemens Ladisch Date: Fri Apr 3 09:42:42 2009 +0200 sound: usb-audio: remove check_hw_params_convention() This removes the check_hw_params_convention() function because 1) it is not necessary, as the hw_rule_* functions also work correctly (i.e., as no-ops) when the device supports all combinations of the audio format parameters; and 2) it would become too complex when adding a fourth altsetting-dependent hardware parameter, as this would require another three loops to check dependecies with rate/channels/format. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 488fe1665fd90f204fbc825b90060b9e0394e4be Author: Clemens Ladisch Date: Fri Apr 3 09:41:40 2009 +0200 sound: usb-audio: show sample format width in proc file When listing the device's sample formats in the stream? proc file, the sample format number itself is rather obscure, so we better show the format width, too. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 4ef4327b30957a16619ac7d47c749465e62de8c3 Merge: 3989203 a938b8c Author: Linus Torvalds Date: Mon Apr 6 18:08:58 2009 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (120 commits) cx231xx: Convert to snd_card_create() V4L/DVB (11440): PWC: fix build error when CONFIG_INPUT=m V4L/DVB (11439): UVC: uvc_status_cleanup(): undefined reference to `input_unregister_device' V4L/DVB (11438): au0828: fix Kconfig dependance V4L/DVB (11437): pvrusb2: Drop client_register/unregister stubs V4L/DVB (11436): radio-mr800: convert to to v4l2_device V4L/DVB (11435): dsbr100 radio: convert to to v4l2_device V4L/DVB: zr364xx: remove unused #include V4L/DVB: usbvision: remove unused #include V4L/DVB (11427): gspca - m5602: Minor cleanups V4L/DVB (11426): gspca - m5602: Don't touch hflip/vflip register on Read/Modify/Write V4L/DVB (11425): gspca - m5602: Move the vflip quirk to probe stage. V4L/DVB (11424): gspca - m5602-ov9650: Use the local ctrl cache. Adjust image on vflip. V4L/DVB (11423): gspca - m5602-ov9650: Add a disconnect hook, setup a ctrl cache ctrl. V4L/DVB (11422): gspca - m5602-ov9650: Replace a magic constant with a define V4L/DVB (11421): gspca - m5602-ov9650: Synthesize modesetting. V4L/DVB (11420): gspca - m5602: Improve error handling in the ov9650 driver V4L/DVB (11419): gspca - m5602-ov9650: Don't read exposure data from COM1. V4L/DVB (11418): gspca - m5602-ov9650: Auto white balancing is on by default V4L/DVB (11417): gspca - m5602-ov9650: Autogain is on by default ... commit 3989203290fba6fdf6bc4825fbf6526e1bf17977 Merge: d508afb 37efa23 Author: Linus Torvalds Date: Mon Apr 6 18:05:43 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: b44: Use kernel DMA addresses for the kernel DMA API forcedeth: Fix resume from hibernation regression. xfrm: fix fragmentation on inter family tunnels ibm_newemac: Fix dangerous struct assumption gigaset: documentation update gigaset: in file ops, check for device disconnect before anything else bas_gigaset: use tasklet_hi_schedule for timing critical tasklets net/802/fddi.c: add MODULE_LICENSE smsc911x: remove unused #include axnet_cs: fix phy_id detection for bogus Asix chip. bnx2: Use request_firmware() b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}() socket: use percpu_add() while updating sockets_in_use virtio_net: Set the mac config only when VIRITO_NET_F_MAC myri_sbus: use request_firmware e1000: fix loss of multicast packets vxge: should include tcp.h Conflict in firmware/WHENCE (SCSI vs net firmware) commit 37efa239901493694a48f1d6f59f8de17c2c4509 Author: Michael Buesch Date: Mon Apr 6 09:52:27 2009 +0000 b44: Use kernel DMA addresses for the kernel DMA API We must not use the device DMA addresses for the kernel DMA API, because device DMA addresses have an additional offset added for the SSB translation. Use the original dma_addr_t for the sync operation. Cc: stable@kernel.org Signed-off-by: Michael Buesch Signed-off-by: David S. Miller commit 35a7433c789ba6df6d96b70fa745ae9e6cac0038 Author: Ed Swierk Date: Mon Apr 6 17:49:12 2009 -0700 forcedeth: Fix resume from hibernation regression. Reset phy state on resume, fixing a regression caused by powering down the phy on hibernate. Signed-off-by: Ed Swierk Signed-off-by: David S. Miller commit a938b8c5be8fe5c28800c9cef4aa43d569aa57a8 Author: Mauro Carvalho Chehab Date: Mon Apr 6 21:25:29 2009 -0300 cx231xx: Convert to snd_card_create() Convert from snd_card_new() to the new snd_card_create() function. Signed-off-by: Mauro Carvalho Chehab commit f11ee73b0cca8a6c521cc4ac849a07ccf119fd1a Author: Randy Dunlap Date: Mon Apr 6 18:59:31 2009 -0300 V4L/DVB (11440): PWC: fix build error when CONFIG_INPUT=m Fix build errors when USB_PWC=y and INPUT=m. Signed-off-by: Randy Dunlap Acked-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 82bea2020fad535dbd4b1466595c8c9ae23b4943 Author: Randy Dunlap Date: Mon Apr 6 18:57:55 2009 -0300 V4L/DVB (11439): UVC: uvc_status_cleanup(): undefined reference to `input_unregister_device' Fix build errors when USB_VIDEO_CLASS=y and INPUT=m. Fixes kernel bugzilla #12671. Signed-off-by: Randy Dunlap Acked-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 2aa93bc1bcd8ec61416a59e6bec1225021b30e22 Author: Alexander Beregalov Date: Sun Apr 5 23:14:43 2009 -0300 V4L/DVB (11438): au0828: fix Kconfig dependance Fix this build error: ERROR: "videobuf_queue_vmalloc_init" [drivers/media/video/au0828/au0828.ko] undefined! ERROR: "videobuf_vmalloc_free" [drivers/media/video/au0828/au0828.ko] undefined! ERROR: "videobuf_to_vmalloc" [drivers/media/video/au0828/au0828.ko] undefined! Signed-off-by: Alexander Beregalov Signed-off-by: Mauro Carvalho Chehab commit 6c4b75578043e986121a4cc1c26fd0194ca54b62 Author: Jean Delvare Date: Sat Apr 4 18:13:33 2009 -0300 V4L/DVB (11437): pvrusb2: Drop client_register/unregister stubs The client_register and client_unregister methods are optional so there is no point in defining stub ones. Especially when these methods are likely to be removed soon. Signed-off-by: Jean Delvare Acked-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit b466248df0d93c66e3eedd67711ce879def8a5f1 Author: Alexey Klimov Date: Fri Apr 3 18:45:27 2009 -0300 V4L/DVB (11436): radio-mr800: convert to to v4l2_device radio-mr800: convert to to v4l2_device. Signed-off-by: Alexey Klimov Signed-off-by: Mauro Carvalho Chehab commit 406827cccca472b2b2d9dd69020a93504bf29561 Author: Alexey Klimov Date: Fri Apr 3 18:45:17 2009 -0300 V4L/DVB (11435): dsbr100 radio: convert to to v4l2_device dsbr100: convert to v4l2_device. Signed-off-by: Alexey Klimov Signed-off-by: Mauro Carvalho Chehab commit ec624803b47a5cc08fc270005890b3bead5df262 Author: Huang Weiyi Date: Thu Apr 2 12:30:26 2009 -0300 V4L/DVB: zr364xx: remove unused #include Remove unused #include in drivers/media/video/zr364xx.c. Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit f2caedd919bfef6abe9ad99cf3e210615f6a692d Author: Huang Weiyi Date: Thu Apr 2 12:30:19 2009 -0300 V4L/DVB: usbvision: remove unused #include Remove unused #include in drivers/media/video/usbvision/usbvision-i2c.c. Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit 3c19a9543d15b6aa53a17746fd575ca9a70da9af Author: Erik Andr?n Date: Sun Jan 4 07:35:27 2009 -0300 V4L/DVB (11427): gspca - m5602: Minor cleanups Remove an unnecessary error check and reorder some code. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 5196d7c63197b03b29985e8bd9bfa4425b253673 Author: Erik Andr?n Date: Sun Jan 4 07:28:42 2009 -0300 V4L/DVB (11426): gspca - m5602: Don't touch hflip/vflip register on Read/Modify/Write Touching the hflip/vflip register while doing the read/modify/write corrupts the image. Just read from the sensor ctrl cache instead and all is good. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 7460f524980d1d7c39f05b7e95d6d2fba072fd8a Author: Erik Andr?n Date: Sun Jan 4 04:52:50 2009 -0300 V4L/DVB (11425): gspca - m5602: Move the vflip quirk to probe stage. The vflip quirk is better checked at probe time as it's only needed once. Also add an extra reset at init time to resolve a suspend to ram regression. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit be63b722a56f0fe8fbe8e76cbdadaee0429cd291 Author: Erik Andr?n Date: Sat Jan 3 13:58:12 2009 -0300 V4L/DVB (11424): gspca - m5602-ov9650: Use the local ctrl cache. Adjust image on vflip. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit d9c700d415f05760f0129f798223cb4ac6a46d4b Author: Erik Andr?n Date: Sat Jan 3 12:10:11 2009 -0300 V4L/DVB (11423): gspca - m5602-ov9650: Add a disconnect hook, setup a ctrl cache ctrl. Reading and writing to a register doesn't always work reliably. Add a cache and ensure that it is deallocated properly upon module disconnect. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 1a3dd5d91a46417e887e285e6d7ceb68097a8535 Author: Erik Andr?n Date: Sat Jan 3 10:56:51 2009 -0300 V4L/DVB (11422): gspca - m5602-ov9650: Replace a magic constant with a define Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit bd99ffbd2aa51bca79a34aed0bc5b54ecd2b6751 Author: Erik Andr?n Date: Sat Jan 3 10:55:52 2009 -0300 V4L/DVB (11421): gspca - m5602-ov9650: Synthesize modesetting. Previously all resolution setting was done with precalculated tables. When the image is vflipped we need to adjust the alignment which would require another table. Now we can adjust the parameters on the fly instead. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 6b0555008e03209b1590054960b4a3506301071c Author: Erik Andr?n Date: Fri Jan 2 17:58:08 2009 -0300 V4L/DVB (11420): gspca - m5602: Improve error handling in the ov9650 driver Some errors were not propagated properly. Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit 7136e705d8db46f22657523ee108be35c59ce3e9 Author: Erik Andr?n Date: Wed Dec 31 07:25:42 2008 -0300 V4L/DVB (11419): gspca - m5602-ov9650: Don't read exposure data from COM1. ov9650: Reading the COM1 register corrupts the image. Decrease the granularity of the exposure and limit its upper range as setting such high values doesn't have any effect on the image. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 5a0489b3beb9de0c42f2a93113d6bd148473ac9b Author: Erik Andr?n Date: Wed Dec 31 06:36:52 2008 -0300 V4L/DVB (11418): gspca - m5602-ov9650: Auto white balancing is on by default Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 8a38c649aca595cca3a3b346e72599a2fa67db57 Author: Erik Andr?n Date: Wed Dec 31 04:49:33 2008 -0300 V4L/DVB (11417): gspca - m5602-ov9650: Autogain is on by default Autogain is on by default, properly set the default value in the v4l2 ctrl. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit dac136e655faccb51ea2869388e5db5a5dd0b148 Author: Erik Andr?n Date: Tue Dec 30 17:35:34 2008 -0300 V4L/DVB (11416): gspca - m5602: Constify all sensor structs Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit 71b755b08e9946592c5354fbe6373eff7660ccbd Author: Erik Andr?n Date: Tue Dec 30 17:18:23 2008 -0300 V4L/DVB (11415): gspca - m5602: Remove an unused member in the sd struct. Remove an unused sd struct member. Remove a redundant define while we're at it. Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit e17cc08c2f0d714715c8c737899a6b9732c868b2 Author: Erik Andr?n Date: Tue Dec 30 17:06:55 2008 -0300 V4L/DVB (11414): gspca - m5602-mt9m111: Move v4l2 controls to main sensor file. Move over the v4l2 controls to the sensor specific source file. Remove the now redundant sensor struct member. Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit 74cadfe1314f4cc6060dcfa5cea9ef13c6a824fd Author: Erik Andr?n Date: Tue Dec 30 16:48:42 2008 -0300 V4L/DVB (11413): gspca - m5602-mt9m111: Separate mode vectors per sensor. By separating the supported for each sensor into a separate vector we can eliminate the nmodes variable and instead calculate it at runtime. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 4eecb1767e0f1f800948eec9a3705c49a1b768aa Author: Erik Andr?n Date: Tue Dec 30 15:29:48 2008 -0300 V4L/DVB (11412): gspca - m5602-ov9650: Checkpatch fixes Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit e4cc4fcc7b85ec32f05343b02229492c06baba1a Author: Erik Andr?n Date: Tue Dec 30 15:27:17 2008 -0300 V4L/DVB (11411): gspca - m5602: Rework v4l ctrl handling in all sensors Previously, all sensors allocated a part of a large ctrl vector. Define this vector separately for each sensor instead. Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit e335f224e35f413775a549889318afe6bd0342b0 Author: Erik Andr?n Date: Tue Dec 30 07:47:11 2008 -0300 V4L/DVB (11410): gspca - m5602-ov9650: Always init the ov9650 before starting a stream This is a hack preventing a suspend-to-ram/disk regression. Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit 3d3ec926e98bc10c4c48ee7422aecdc335ab1222 Author: Erik Andr?n Date: Mon Dec 29 12:49:25 2008 -0300 V4L/DVB (11409): gspca - m5602-ov9650: Set the ov9650 sensor in soft sleep when inactive. In order to save energy, put the sensor in soft sleep mode when not active Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit 4a7581f084ce308a448f4940ed2c664e9e3d78a1 Author: Lukas Karas Date: Sun Dec 28 14:09:21 2008 -0300 V4L/DVB (11408): gspca - m5602-s5k83a: Add led support to the s5k83a sensor. This patch toggles the led seen on many laptops having a m5602 connected to a Samsung s5k83a sensor. Signed-off-by: Lukas Karas Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit dc913258ffb3dd90d6bafdd9111565777b5aad08 Author: Erik Andr?n Date: Sat Dec 27 14:06:06 2008 -0300 V4L/DVB (11407): gspca - m5602-ov9650: Clean up ov9650_start() function. Cleans some unnecessary temporary variable usage in the ov9650 start function. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit e31f9dd6624de2250d32b7ca88042b0bc51b3cc5 Author: Erik Andr?n Date: Sat Dec 27 13:30:10 2008 -0300 V4L/DVB (11406): gspca - m5602-ov9650: Add QCIF resolution support Adds QCIF support for the ov9650 sensor Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 051781b3a8ea31f1834fddb916607a3088a28f71 Author: Erik Andr?n Date: Sat Dec 27 12:28:00 2008 -0300 V4L/DVB (11405): gspca - m5602: Simplify error handling Simplfy error handling by replacing goto statements with return equivalents. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit ad567ec23501dfdf00dcc8915709a1fda556b6f4 Author: Erik Andr?n Date: Fri Dec 26 12:57:42 2008 -0300 V4L/DVB (11404): gspca - m5602-s5k4aa: Add start function and VGA resolution init. Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 148d0b8deb4348e953e71ed17829e7817cf29e0e Author: Erik Andr?n Date: Fri Dec 26 11:56:43 2008 -0300 V4L/DVB (11403): gspca - m5602-s5k4aa: No more "default" mode Signed-off-by: Erik Andr?n Signed-off-by: Mauro Carvalho Chehab commit 51412aac67526e82d3b6c6351c0c9f0548656256 Author: Jean-Francois Moine Date: Thu Mar 26 06:03:28 2009 -0300 V4L/DVB (11402): gspca - vc032x: Remove the JPEG tables of mi1320_soc. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 14edcd5d5bc7717b26a7887564a4ec7356d85219 Author: Stefan Richter Date: Wed Apr 1 17:25:00 2009 -0300 Revert "V4L/DVB (10962): fired-avc: fix printk formatting warning." Commit 34aecd2851bba5c2b7dae2f0dbe8e629b1c5e4ac was made obsolete and invalid by commit 40cf65d149053889c8876c6c2b4ce204fde55baa. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit f15da16d869be8be5ef991f8d042532c119310fa Author: David Wong Date: Wed Apr 1 04:35:10 2009 -0300 V4L/DVB (11398): Support for Legend Silicon LGS8913/LGS8GL5/LGS8GXX China DMB-TH digital demodulator This patch contains the unified driver for Legend Silicon LGS8913 and LGS8GL5. It should replace lgs8gl5.c in media/dvb/frontends in the future. Signed-off-by: David T.L. Wong Signed-off-by: Mauro Carvalho Chehab commit 81d1d09f926394c19a19ceeb139462908ac63a01 Author: Alexey Klimov Date: Tue Mar 31 21:01:04 2009 -0300 V4L/DVB (11393): radio-si470x: fix possible bug with freeing memory order Patch fixes cleanup procedure in si470x_usb_driver_probe. Add new label err_video and change order of freeing memory. Signed-off-by: Alexey Klimov Signed-off-by: Mauro Carvalho Chehab commit b7732a32af3335454fd274d1b09375416336b5b1 Author: Dean Anderson Date: Mon Mar 30 11:59:56 2009 -0300 V4L/DVB (11392): patch: s2255drv driver removal problem fixed This patch fixes kfree problem on driver removal, fixes streamoff problem and removes unnecessary videobuf_waiton from free_buffer function. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 746ce939a2729fc6f15944f65d7b15574a243692 Author: Geert Uytterhoeven Date: Tue Mar 31 10:34:10 2009 -0300 V4L/DVB (11392a): Remove reference to obsolete linux-dvb@linuxtv.org linux-dvb@linuxtv.org auto-responds with: | This ML is deprecated. Please use linux-media@vger.kernel.org instead. | For more info about linux-media@vger.kernel.org, please read: | http://vger.kernel.org/vger-lists.html#linux-media Hence remove it from MAINTAINERS. There are still a few references to it in various docs and source files With kind regards, Geert Uytterhoeven Software Architect Sony Techsoft Centre Europe The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium Phone: +32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: Geert.Uytterhoeven@sonycom.com Internet: http://www.sony-europe.com/ A division of Sony Europe (Belgium) N.V. VAT BE 0413.825.160 · RPR Brussels Fortis · BIC GEBABEBB · IBAN BE41293037680010 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Signed-off-by: Geert Uytterhoeven Signed-off-by: Mauro Carvalho Chehab commit ff1a3ebb9cd9baecd167500c660bd76129b67b1c Author: Alexey Klimov Date: Sun Mar 29 20:19:54 2009 -0300 V4L/DVB (11391): pci-isa radios: remove open and release functions Patch removes empty open and release functions in pci and isa radio drivers, setting them to NULL. V4L module doesn't call for them due to previous patch. Signed-off-by: Alexey Klimov Signed-off-by: Mauro Carvalho Chehab commit 65d9ff9c85d3c2e06d22aed78efee8404563eff6 Author: Hans Verkuil Date: Sun Mar 29 20:19:38 2009 -0300 V4L/DVB (11390): 2-dev.c: return 0 for NULL open and release callbacks Patch allows v4l2_open and v4l2_release functions return 0 if open and release driver callbacks set to NULL. This will be used in radio drivers. -- Signed-off-by: Hans Verkuil Signed-off-by: Alexey Klimov Signed-off-by: Mauro Carvalho Chehab commit dfa76fa2824967c0ec196fbcba36d3e74b66d3aa Author: Adam Baker Date: Sun Mar 29 19:17:10 2009 -0300 V4L/DVB (11387): Sensor orientation reporting Add support to the SQ-905 driver to pass back to user space the sensor orientation information obtained from the camera during init. Modifies gspca and the videodev2.h header to create the necessary API. [mchehab@redhat.com: Changed "Output is" to "Frames are" at the comments, as suggested at LMML] Signed-off-by: Adam Baker Signed-off-by: Mauro Carvalho Chehab commit 2659e468a38d7baa758baa5e59529e48eb8930c9 Author: Matthias Schwarzott Date: Sun Mar 29 16:36:02 2009 -0300 V4L/DVB (11386): saa7134: Add analog RF tuner support for Avermedia A700 DVB-S Hybrid+FM card Thanks to panagonov for requesting support and testing patches. Signed-off-by: Matthias Schwarzott Signed-off-by: Mauro Carvalho Chehab commit 6c31e598368bfff49fc3e694c5b7624635871acb Author: Hans Verkuil Date: Thu Apr 2 11:37:41 2009 -0300 V4L/DVB (11381): ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support. Remove support for the debug call VIDIOC_INT_S_AUDIO_ROUTING from cx18 and ivtv. These internal ioctls shouldn't be exposed. These were only used through the cx18-ctl and ivtv-ctl utilities, and only when testing a new card variant. This cleanup allows the removal of this ioctl from v4l2-common.h. Cc: Andy Walls Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5325b4272a53b43f55b82cc369c310c2fcacdca1 Author: Hans Verkuil Date: Thu Apr 2 11:26:22 2009 -0300 V4L/DVB (11380): v4l2-subdev: change s_routing prototype It is no longer needed to use a struct pointer as argument, since v4l2_subdev doesn't require that ioctl-like approach anymore. Instead just pass the input, output and config (new!) arguments directly. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c0ff29150d37615ac703802ab3edc775fd402491 Author: Hans Verkuil Date: Wed Apr 1 20:22:26 2009 -0300 V4L/DVB (11379): mxb: fix copy-and-paste bug in mute. The line-in was muted twice instead of the line-in and the cd-in. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3ff4ad815c5824ab35375d72ea8fe14fb3230daa Author: Hans Verkuil Date: Wed Apr 1 03:15:52 2009 -0300 V4L/DVB (11377): v4l: increase version numbers of drivers converted to v4l2_subdev. With all the v4l2_subdev changes that were made to these drivers it is a good idea to increase the version number of each driver. It's just the patch level that is increased, except for the zoran and saa7146 drivers where the minor number was increased due to the more substantial changes that were made to those two drivers. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 940088a16221fa517f5b921266afa8e46f49b784 Author: Hans Verkuil Date: Wed Apr 1 04:00:30 2009 -0300 V4L/DVB (11376): tvaudio.h: add static inline to retrieve the list of possible i2c addrs. Rather than duplicating this list everywhere, just put it in tvaudio.h. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1792f68b0eb464a9bc84e7d182e2ab4d00541c8c Author: Hans Verkuil Date: Mon Mar 30 11:47:55 2009 -0300 V4L/DVB (11375): v4l2: use v4l2_i2c_new_probed_subdev_addr where appropriate. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e6574f2fbecdb8af807169d345c10131ae060a88 Author: Hans Verkuil Date: Wed Apr 1 03:57:53 2009 -0300 V4L/DVB (11373): v4l2-common: add explicit v4l2_device pointer as first arg to new_(probed)_subdev The functions v4l2_i2c_new_subdev and v4l2_i2c_new_probed_subdev relied on i2c_get_adapdata to return the v4l2_device. However, this is not always possible on embedded platforms. So modify the API to pass the v4l2_device pointer explicitly. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 868f985c2fb85b5f32785bb55a349d180a30f3d3 Author: Hans Verkuil Date: Mon Mar 30 11:40:54 2009 -0300 V4L/DVB (11374): v4l2-common: add v4l2_i2c_new_probed_subdev_addr Add utility function to probe for a single address, rather than a list of addresses. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit acebc70d4a789df21270690c70928b8a836caad7 Author: Hans Verkuil Date: Sun Mar 29 20:04:44 2009 -0300 V4L/DVB (11372): v4l2: use old-style i2c API for kernels < 2.6.26 instead of < 2.6.22 Originally the intention was to switch to the new style i2c API starting with the introduction of the API in 2.6.22. However, the i2c_new_probed_device() function has a lethal bug that wasn't fixed until 2.6.25. Or more accurately, it was only fixed in the stable series of 2.6.25 and 2.6.26. Given the fact that the new i2c API also changed starting with 2.6.26 (the addition of i2c_device_id), it is easiest to switch APIs starting with 2.6.26. This patch updates all the legacy code accordingly. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0c84674353a8c344d169aabce4dc4d44daaa270d Author: Hans Verkuil Date: Sun Mar 29 19:40:01 2009 -0300 V4L/DVB (11371): v4l2: remove legacy fields in v4l2-i2c-drv.h. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f41737ece472cd803ffb24ac9f5d6fdd1d871341 Author: Hans Verkuil Date: Wed Apr 1 03:52:39 2009 -0300 V4L/DVB (11370): v4l2-subdev: move s_std from tuner to core. s_std didn't belong in the tuner ops. Stricly speaking it should be part of the video ops, but it is used by audio and tuner devices as well, so it is more efficient to make it part of the core ops. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cc26b076cf8b1040ccc514302ef9a24042272ec3 Author: Hans Verkuil Date: Sun Mar 29 19:20:26 2009 -0300 V4L/DVB (11369): v4l2-subdev: add load_fw and use that instead of abusing core->init. The init callback was used in several places to load firmware. Make a separate load_fw callback for that. This makes the code a lot more understandable. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7c9fc9d50f97c9a6733ff1a22b6e31bcd91778e2 Author: Hans Verkuil Date: Wed Apr 1 03:49:59 2009 -0300 V4L/DVB (11368): v4l2-subdev: move s_standby from core to tuner. s_standby is only used to put the tuner in powersaving mode, so move it from core to tuner. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 78a3b4db2e53a1903c86e2856e175d85a3849e84 Author: Hans Verkuil Date: Wed Apr 1 03:41:09 2009 -0300 V4L/DVB (11367): v4l2-common: remove legacy code Now that all drivers are converted to v4l2_subdev we can remove legacy code in v4l2-common. Also move the documentation of the internal API to v4l2-subdev.h where it really belongs. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b74c0aac357e5c71ee6de98b9887fe478bc73cf4 Author: Hans Verkuil Date: Sun Mar 29 18:00:07 2009 -0300 V4L/DVB (11366): v4l: remove obsolete header and source v4l2-subdev.c and v4l2-i2c-drv-legacy.h were used to support the old i2c API. All v4l drivers are now converted to v4l2_subdev, so these two files can be removed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 647da444951bc11c0d9c4680abf71e2520d8eae5 Author: Hans Verkuil Date: Sun Mar 29 17:56:18 2009 -0300 V4L/DVB (11365): tvaudio: remove i2c legacy code All drivers that use tvaudio now use v4l2_subdev, so we can remove the legacy code from tvaudio. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 75b4c260fa93d99979a8b5bec5a621daff469398 Author: Hans Verkuil Date: Wed Apr 1 03:32:22 2009 -0300 V4L/DVB (11364): tuner: remove i2c legacy code. All drivers that use the tuner module now use v4l2_subdev, so we can remove the legacy code from this module. Note that TUNER_SET_CONFIG is still called by tuner-simple.c, so we have to handle it via a .command callback. There must be a better way to do this, but for now this will work. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 762decd3bfb58f190b7cc2e9cc186ba95cca3dcf Author: Hans Verkuil Date: Sun Mar 29 17:34:31 2009 -0300 V4L/DVB (11363): tvp5150: remove i2c legacy code. All drivers that use tvp5150 now use v4l2_subdev, so we can remove the legacy code from tvp5150. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ef6078e98e40170a8a3d4e6b205184a2ede87a02 Author: Hans Verkuil Date: Sun Mar 29 17:32:35 2009 -0300 V4L/DVB (11362): saa7115: remove i2c legacy code All drivers that use saa7115 now use v4l2_subdev, so we can remove the legacy code from saa7115. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 46e226742618cf3e33635536decdffd48f3f0ebe Author: Hans Verkuil Date: Sun Mar 29 17:30:34 2009 -0300 V4L/DVB (11361): msp3400: remove i2c legacy code All drivers that use msp3400 now use v4l2_subdev, so we can remove the legacy code from msp3400. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 36fa674e6ca918fccc95ce8dbb16a8e68c0c1ef3 Author: Mauro Carvalho Chehab Date: Sun Apr 5 08:02:15 2009 -0300 V4L/DVB (11360): em28xx: use usb_interface.dev for v4l2_device_register Signed-off-by: Mauro Carvalho Chehab commit 119753a4640e9961cdb75c89630e8ffbedad79a7 Author: Janne Grunau Date: Wed Apr 1 08:49:16 2009 -0300 V4L/DVB (11358): w9968cf: use usb_interface.dev for v4l2_device_register Signed-off-by: Janne Grunau Signed-off-by: Mauro Carvalho Chehab commit 4bb685108e0189e4c3acda06f79886d79465b45a Author: Janne Grunau Date: Wed Apr 1 08:48:29 2009 -0300 V4L/DVB (11357): au0828: remove explicitly set v4l2_device.name and unused au0828_instance Signed-off-by: Janne Grunau Acked-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit a4124aa95834a6c508e963354205b25cac5352f0 Author: Janne Grunau Date: Wed Apr 1 08:47:35 2009 -0300 V4L/DVB (11356): au0828: use usb_interface.dev for v4l2_device_register Signed-off-by: Janne Grunau Acked-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 70ad6383541c56dc82071b30249df56dfdcdd27f Author: Janne Grunau Date: Wed Apr 1 08:46:50 2009 -0300 V4L/DVB (11355): pvrusb2: use usb_interface.dev for v4l2_device_register Signed-off-by: Janne Grunau Acked-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit a878440d994e11bc3e4eb81d378b32fa32e9d80c Author: Janne Grunau Date: Wed Apr 1 08:46:00 2009 -0300 V4L/DVB (11354): usbvision: use usb_interface.dev for v4l2_device_register Signed-off-by: Janne Grunau Acked-by: Thierry Merle Signed-off-by: Mauro Carvalho Chehab commit 6e7f7b37e719746da67ecfc54a264783d473ca05 Author: Janne Grunau Date: Wed Apr 1 08:41:13 2009 -0300 V4L/DVB (11353): cx231xx: remove explicitly set v4l2_device.name Signed-off-by: Janne Grunau Signed-off-by: Mauro Carvalho Chehab commit 7231748af687819fa1699c80e64ed6b47a4a3ff0 Author: Janne Grunau Date: Wed Apr 1 08:39:29 2009 -0300 V4L/DVB (11352): cx231xx: use usb_interface.dev for v4l2_device_register Signed-off-by: Janne Grunau Signed-off-by: Mauro Carvalho Chehab commit 5fb1b2567982cffce355e4b3139a3de4430be899 Author: Mauro Carvalho Chehab Date: Sat Mar 28 06:55:35 2009 -0300 V4L/DVB (11250): cx231xx: Fix Kconfig help items Signed-off-by: Mauro Carvalho Chehab commit 2c6beca875f0237ae9cfb2bb26144b60b9418c3a Author: Mauro Carvalho Chehab Date: Sun Mar 22 08:53:36 2009 -0300 V4L/DVB (11135): cx231xx: use usb_make_path() for bus_info VIDIOC_QUERYCAP should return the proper bus info. In the case of USB, this should be generated by usb_make_path(), being something like: usb-0000:00:1d.7-2 Cc: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit 4be1ad36683b23355f059c3386f97a4427d1a56a Author: Mauro Carvalho Chehab Date: Sun Mar 22 08:28:30 2009 -0300 V4L/DVB (11134): cx231xx: dmesg cleanup Remove some printk's that were needed only during development phase. Also, cleans the printed messages to produce a nicer result. Signed-off-by: Mauro Carvalho Chehab commit 38350ba9549b8c981f58ad3d037b335cbae14c43 Author: Mauro Carvalho Chehab Date: Sun Mar 22 08:02:12 2009 -0300 V4L/DVB (11133): cx231xx: don't print pcb config debug messages by default Cc: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit 90960744a1ea83b70ace7983c80173220c9451c3 Author: Mauro Carvalho Chehab Date: Sun Mar 22 07:52:02 2009 -0300 V4L/DVB (11132): cx231xx: usb probe cleanups Simplifies the usb probe logic, cleaning the printed messages during the probing phase. Cc: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit b905de30e300b959ea89c3af9d436e7f73e9e628 Author: Mauro Carvalho Chehab Date: Sun Mar 22 05:46:36 2009 -0300 V4L/DVB (11131): cx231xx: avoid trying to access unfilled dev struct cx231xxinfo needs dev->name. However, this is not declared on the time the check for the max number of supported devices is done. Signed-off-by: Mauro Carvalho Chehab commit 92fcbd3f4ea07a8efd2d2881645baae0a061c82e Author: Mauro Carvalho Chehab Date: Sat Mar 21 22:16:34 2009 -0300 V4L/DVB (11130): cx231xx: fix an inverted logic at vidioc_streamoff Cc: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit ecc67d108d6ade14d79c8546f5db36613c780d59 Author: Sri Deevi Date: Sat Mar 21 22:00:20 2009 -0300 V4L/DVB (11129): cx231xx: Use generic names for each device block Signed-off-by: Srinivasa Deevi Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b1196126b016d0f28a99c16b27c403d0ecac501a Author: Sri Deevi Date: Fri Mar 20 23:33:48 2009 -0300 V4L/DVB (11128): cx231xx: convert the calls to subdev format This patch converts cx231xx to the new v4l2 dev/subdev, doing: - Conversion of i2c calls to subdev calls; - all subdev calls to call_all(); - Corrected the header file order in cx231xx.h; - Added tuner frequency setting. Signed-off-by: Srinivasa Deevi Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ed559edf35bdefb91c7eba5ea3dfd1e939aaa782 Author: Sri Deevi Date: Fri Mar 13 18:35:14 2009 -0300 V4L/DVB (11038): Fix the issue with audio module & correction of Names The audio module requested in driver differs with module created by Makefile. Makefile is corrected to create the same module name required by driver. Also, corrected the strings that shows wrong name. Signed-off-by: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit 00ca732451c8aaec430c84a0c5cd1e1c01227dfa Author: Hans Verkuil Date: Fri Mar 13 13:36:00 2009 -0300 V4L/DVB (10989): cx25840: cx23885 detection was broken An earlier commit accidentally broke the detection of the cx25837 part of the cx23885. Reinstated the commented out code. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d73abcff75cd3b1b5c910df454ac332beb29eed1 Author: Hans Verkuil Date: Thu Mar 12 18:38:40 2009 -0300 V4L/DVB (10982): cx231xx: fix compile warning Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6e4f574ba43511ac1cb860027275e08529c5a28f Author: Sri Deevi Date: Tue Mar 10 21:16:26 2009 -0300 V4L/DVB (10958): cx231xx: some additional CodingStyle and minor fixes changed the pcb-config.c/h to pcb-cfg.c/h for short names. Signed-off-by: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit b9255176453086b2531c5559350bd5c92b771cc5 Author: Sri Deevi Date: Wed Mar 4 17:49:01 2009 -0300 V4L/DVB (10957): cx231xx: Fix CodingStyle Fixes several CodingStyle issues on the driver. Signed-off-by: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit 818fdf341369110ff91296843797a9431a3d9b31 Author: Mauro Carvalho Chehab Date: Fri Mar 13 07:41:58 2009 -0300 V4L/DVB (10957a): cx231xx: Fix compilation breakage Only cx231xx-video needs linux/version.h, due to KERNEL_VERSION macro, that is used by V4L2 API. This patch moves the KERNEL_VERSION to its proper place and starts with 0,0,1. There are still much more to be fixed on later patches Signed-off-by: Mauro Carvalho Chehab commit cde4362f0244a70bab73e37e24f167186bb9a8be Author: Mauro Carvalho Chehab Date: Tue Mar 3 13:31:36 2009 -0300 V4L/DVB (10956): cx231xx: First series of manual CodingStyle fixes This patch cleans up CodingStyle on the following source files: There are still much more to be fixed on later patches Signed-off-by: Mauro Carvalho Chehab commit 84b5dbf39ed2f51224841bbbf08439158d69d427 Author: Mauro Carvalho Chehab Date: Tue Mar 3 06:14:34 2009 -0300 V4L/DVB (10955): cx231xx: CodingStyle automatic fixes with Lindent Signed-off-by: Mauro Carvalho Chehab commit e0d3bafd02586cfde286c320f56906fd9fa8d256 Author: Sri Deevi Date: Tue Mar 3 14:37:50 2009 -0300 V4L/DVB (10954): Add cx231xx USB driver Signed-off-by: Srinivasa Deevi [mchehab@redhat.com: Remove the Kconfig changes, to avoid git breakages] Signed-off-by: Mauro Carvalho Chehab commit 95b14fb23b543e0a9213b4ba3cc4fc640d9e453f Author: Mauro Carvalho Chehab Date: Tue Mar 3 14:36:55 2009 -0300 V4L/DVB (10953): cx25840: Fix CodingStyle errors introduced by the last patch Signed-off-by: Mauro Carvalho Chehab commit 149783b58170da0b7ebe9e86995f8cb350f33b6d Author: Sri Deevi Date: Tue Mar 3 06:07:42 2009 -0300 V4L/DVB (10952): cx25840: prepare it to be used by cx231xx module cx231xx has a cx25840 inside the chip. However, some different initializations are used for this variant. Signed-off-by: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit 073d696d547ef933e1f0748086da785e95cb8395 Author: Janne Grunau Date: Wed Apr 1 08:30:06 2009 -0300 V4L/DVB (11351): v4l: use usb_interface for v4l2_device_register If usb_interface.dev is used as dev parameter for v4l2_device_register v4l2_dev.name contains the v4l driver/module name and usb device and interface instead of a simple "usb x-y". It also matches the recommendation to set the parent devices for usb drivers. Signed-off-by: Janne Grunau Signed-off-by: Mauro Carvalho Chehab commit 6acc81c394393b853e731cc67f17ef277d521123 Author: Paulius Zaleckas Date: Fri Apr 3 10:34:05 2009 -0300 V4L/DVB (11350): Add camera (CSI) driver for MX1 Add support for CMOS Sensor Interface on i.MX1 and i.MXL SoCs. create mode 100644 arch/arm/mach-mx1/ksym_mx1.c create mode 100644 arch/arm/mach-mx1/mx1_camera_fiq.S create mode 100644 arch/arm/plat-mxc/include/mach/mx1_camera.h create mode 100644 drivers/media/video/mx1_camera.c Signed-off-by: Paulius Zaleckas Signed-off-by: Darius Augulis Acked-by: Sascha Hauer Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit b71df97a3ffdb2bfc286c3fa0c2b1a0aa3a6bf88 Author: Guennadi Liakhovetski Date: Fri Apr 3 10:34:02 2009 -0300 V4L/DVB (11349): mx3-camera: adapt the clock definition and the driver to the new clock naming With the i.MX31 transition to clkdev clock names have changed, but mistakenly the "mx3-camera.0" has been registered with a non-NULL connection ID, which is not necessary, since this is the only clock, used by the capture interface driver. Fix the clock definition and the driver to use NULL as a connection ID. Signed-off-by: Guennadi Liakhovetski Acked-by: Sascha Hauer Signed-off-by: Mauro Carvalho Chehab commit f982651410f00378e42d9daab274adee5c762523 Author: Guennadi Liakhovetski Date: Fri Apr 3 10:14:02 2009 -0300 V4L/DVB (11347): mt9t031: use platform power hook Use platform power hook to turn the camera on and off. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 6252d25776f7e74f22acad7acb0165338927fe1e Author: Stuart Hall Date: Thu Apr 2 05:25:09 2009 -0300 V4L/DVB (11345): af9015: support for DigitalNow TinyTwin remote Patch to provide basic support for DigitalNow TinyTwin Remote. It uses same remote as TwinHan AzureWave AD-TU700(704J). Signed-off-by: Stuart Hall Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 16af6f5a7fc2c56c4d8246b850b96324be2fec13 Author: Devin Heitmueller Date: Wed Apr 1 00:11:31 2009 -0300 V4L/DVB (11343): au0828: make i2c clock speed per-board configurable Setup the i2c clock speed to be definable on a per-board basis. This allows us to explicitly set the clock speed to 30 KHz on the 950q, and also gets rid of code which sets it on a basis of what chip the i2c master is talking to at any given time (which could have caused issues because i2c slaves should never receive commands at a clock higher than their supported clock speed). Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 9beb0de9adc789a7da22dac811b03ff342b27b63 Author: Devin Heitmueller Date: Tue Mar 31 23:58:49 2009 -0300 V4L/DVB (11342): au0828: better document i2c registers Change the #define entries for the i2c registers to be more meaningful, and document the valid values for the registers. Note that this changeset makes *no* functional changes to the code. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 3956fefc593c45a480466c76fdbfee5063d766bf Author: Antti Palosaari Date: Tue Mar 31 17:01:02 2009 -0300 V4L/DVB (11340): af9015: add support for AverMedia AVerTV Volar Black HD (A850) Add USB ID (07ca:850a) and configuration hack for AverMedia AVerTV Volar Black HD (A850) DVB-T USB stick. Tested-by: Olivier MENUEL Tested-by: Thomas Renard Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit dcd14f414f6e5ab739e9738a7a18d4d8503a9798 Author: Antti Palosaari Date: Mon Mar 30 17:57:51 2009 -0300 V4L/DVB (11339): af9015: remove wrong definitions Remove wrong GPIO definitions. GPIOs used by AF9015 are property of the AF9013 demodulator and are coming from there. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 261448405eb578972244ae406a2d785bc095f193 Author: Marc Schneider Date: Thu Mar 26 21:07:18 2009 -0300 V4L/DVB (11338): af9015: add support for TrekStor DVB-T USB Stick Add USB ID (15a4:901b) and remote for TrekStor DVB-T USB Stick. Signed-off-by: Marc Schneider Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 58fe1595455566a1cfe22db6f5f59bc989e5a80f Author: Antti Palosaari Date: Thu Mar 26 20:41:05 2009 -0300 V4L/DVB (11337): af9015: add new USB ID for KWorld USB DVB-T TV Stick II (VS-DVB-T 395U) Add new USB ID (1b80:e395) for KWorld USB DVB-T TV Stick II (VS-DVB-T 395U). Thanks to Julian Aron Prenner for reporting this. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 34013e2de3bf752114915509879380f8394fca5a Author: Antti Palosaari Date: Thu Mar 26 20:27:10 2009 -0300 V4L/DVB (11336): af9015: remove experimental Remove experimental from DVB USB AF9015 device. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit fcd62cf7f62a67976b72669934127cb4ecee2b1e Author: Mike Isely Date: Wed Apr 1 01:55:26 2009 -0300 V4L/DVB (11334): pvrusb2: Fix uninitialized tuner_setup field(s) Any time a struct (especially one not defined by this driver) is allocated, we MUST zero its underlying storage. This makes our usage of the struct predictable and robust against future changes where fields might be added that we don't know about. Failing to do this with tuner_setup left the config field uninitialized which then caused trouble with the tuner type used for HVR-1950 devices. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 7bf56f94a15ac0655bfb259ce693ccab011b1363 Author: Mike Isely Date: Wed Apr 1 01:51:53 2009 -0300 V4L/DVB (11333): pvrusb2: Report def_val items in sysfs symbolically, consistent with cur_val Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 5b72d715250bf238af86d76ac527dff8d99b601d Author: Mike Isely Date: Wed Apr 1 01:49:57 2009 -0300 V4L/DVB (11332): pvrusb2: Fix incorrect reporting of default value for non-integer controls Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit f2cf250af156bef127433efd255abfae6aab02f6 Author: Douglas Schilling Landgraf Date: Tue Mar 31 17:10:58 2009 -0300 V4L/DVB (11331): em28xx: convert to v4l2_subdev Converted em28xx driver to v4l2_subdev. Thanks to Hans Verkuil for helping this conversion. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 9fc4d219b93ca0222f342fb3ca75bb62cc8be05c Author: Russell King Date: Sun Mar 29 08:12:27 2009 -0300 V4L/DVB (11329): Fix buglets in v4l1 compatibility layer The following patch fixes a few bugs I've noticed in the V4L1 compatibility layer: - VIDEO_MODE_AUTO for get/set input ioctls was not being handled - wrong V4L2 ioctl being used in v4l1_compat_select_tuner Signed-off-by: Russell King Signed-off-by: Mauro Carvalho Chehab commit 80801da83389b2c6e55e1f8f5d17f923ce54f7c8 Author: Juan Jesús García de Soria Lucena Date: Sat Mar 28 23:36:18 2009 -0300 V4L/DVB (11328): Add AVerMedia A310 USB IDs to CE6230 driver. The CE6230 DVB USB driver works correctly for the AVerMedia A310 USB2.0 DVB-T tuner. Add the required USB ID's and hardware names so that the driver will handle it. Signed-off-by: Juan Jesús García de Soria Lucena Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit db6cbc8cf2fa699a876e4f76ef069b9a2861900a Author: Kuninori Morimoto Date: Tue Mar 31 03:44:22 2009 -0300 V4L/DVB (11327): ov772x: add edge contrl support Signed-off-by: Kuninori Morimoto Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit e951cbf20cdc7c55c9c752d28411d956675befd6 Author: Guennadi Liakhovetski Date: Tue Mar 31 03:44:22 2009 -0300 V4L/DVB (11326): mt9m001: fix advertised pixel clock polarity MT9M001 datasheet says, that the data is ready on the falling edge of the pixel clock, but the driver wrongly sets the SOCAM_PCLK_SAMPLE_RISING flag. Changing this doesn't seem to produce any visible difference, still, it is better to comply to the datasheet. Reported-by: Sascha Oppermann Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit eee1663fa71e32b146a584cb9a7c22bb6302ec14 Author: Guennadi Liakhovetski Date: Tue Mar 31 03:44:22 2009 -0300 V4L/DVB (11325): soc-camera: fix breakage caused by 1fa5ae857bb14f6046205171d98506d8112dd74e soc-camera re-uses struct devices multiple times in calls to device_register(), therefore it has to reset the embedded struct kobject to avoid the "tried to init an initialized object" error, which then also erases its name. Now with the transition to kobject's name for device names, we have to re-initialise the name before each call to device_register(). Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 6cb2c0009e8f27abad514c44d60b58913189b8c6 Author: Kuninori Morimoto Date: Tue Mar 31 03:44:22 2009 -0300 V4L/DVB (11324): ov772x: wrong pointer for soc_camera_link is modified priv->client->dev.platrom_data mean ov772x_camera_info in ov772x driver. So, struct soc_camera_link doesn't exist there. This patch modify this bug. Signed-off-by: Kuninori Morimoto Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit ae7410e712b33d32337df80f71f702d12a8ebb81 Author: Guennadi Liakhovetski Date: Tue Mar 31 03:44:22 2009 -0300 V4L/DVB (11323): pxa-camera: simplify the .buf_queue path by merging two loops pxa_dma_update_sg_tail() is called only once, runs exactly the same loop as the caller and has to recalculate the last element in an sg-list, that the caller has already calculated. Eliminate redundancy by merging the two loops and re-using the calculated pointer. This also saves a bit of performance which is always good during video-capture. Signed-off-by: Guennadi Liakhovetski Acked-by: Robert Jarzmik Signed-off-by: Mauro Carvalho Chehab commit 8c62e221c71a0240f16ea8aa29609f93a68c2ff9 Author: Robert Jarzmik Date: Tue Mar 31 03:44:22 2009 -0300 V4L/DVB (11322): pxa_camera: Fix overrun condition on last buffer The last buffer queued will often overrun, as the DMA chain is finished, and the time the dma irq handler is activated, the QCI fifos are filled by the sensor. The fix is to ignore the overrun condition on the last queued buffer, and restart the capture only on intermediate buffers of the chain. Moreover, a fix was added to the very unlikely condition where in YUV422P mode, one channel overruns while another completes at the very same time. The capture is restarted after the overrun as before, but the other channel completion is now ignored. Signed-off-by: Robert Jarzmik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 256b02332a0ba1d7382d736d776e605be63ded17 Author: Robert Jarzmik Date: Tue Mar 31 03:44:21 2009 -0300 V4L/DVB (11321): pxa_camera: Redesign DMA handling The DMA transfers in pxa_camera showed some weaknesses in multiple queued buffers context : - poll/select problem The bug shows up with capture_example tool from v4l2 hg tree. The process just "stalls" on a "select timeout". - multiple buffers DMA starting When multiple buffers were queued, the DMA channels were always started right away. This is not optimal, as a special case appears when the first EOF was not yet reached, and the DMA channels were prematurely started. - Maintainability DMA code was a bit obfuscated. Rationalize the code to be easily maintainable by anyone. - DMA hot chaining DMA is not stopped anymore to queue a buffer, the buffer is queued with DMA running. As a tribute, a corner case exists where chaining happens while DMA finishes the chain, and the capture is restarted to deal with the missed link buffer. This patch attemps to address these issues / improvements. create mode 100644 Documentation/video4linux/pxa_camera.txt Signed-off-by: Robert Jarzmik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 37f5aefd537d5f98b3fa9726362effeccf1d2161 Author: Robert Jarzmik Date: Tue Mar 31 03:44:21 2009 -0300 V4L/DVB (11320): pxa_camera: Remove YUV planar formats hole All planes were PAGE aligned (ie. 4096 bytes aligned). This is not consistent with YUV422 format, which requires Y, U and V planes glued together. The new implementation forces the alignement on 8 bytes (DMA requirement), which is almost always the case (granted by width x height being a multiple of 8). The test cases include tests in both YUV422 and RGB565 : - a picture of size 111 x 111 (cross RAM pages example) - a picture of size 1023 x 4 in (under 1 RAM page) - a picture of size 1024 x 4 in (exactly 1 RAM page) - a picture of size 1025 x 4 in (over 1 RAM page) - a picture of size 1280 x 1024 (many RAM pages) Signed-off-by: Robert Jarzmik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 92a8337b380f0978ac81f096d6324d3ad689f83e Author: Robert Jarzmik Date: Tue Mar 31 03:44:21 2009 -0300 V4L/DVB (11319): pxa_camera: Enforce YUV422P frame sizes to be 16 multiples Due to DMA constraints, the DMA chain always transfers bytes from the QCI fifos to memory in 8 bytes units. In planar formats, that could mean 0 padding between Y and U plane (and between U and V plane), which is against YUV422P standard. Therefore, a frame size is required to be a multiple of 16 (so U plane size is a multiple of 8). It is enforced in try_fmt() and set_fmt() primitives, be aligning height then width on 4 multiples as need be, to reach a 16 multiple. Signed-off-by: Robert Jarzmik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit fedd73ccce8c77b677f8a9090feab8f8c6c9b03c Author: Kyle McMartin Date: Mon Mar 30 22:36:19 2009 -0300 V4L/DVB (11318): fix misspelling of kconfig option CUSTOMISE appears to be the one actually defined... Signed-off-by: Kyle McMartin Signed-off-by: Mauro Carvalho Chehab commit d508afb437daee7cf07da085b635c44a4ebf9b38 Author: Trond Myklebust Date: Mon Apr 6 16:41:35 2009 -0700 NFS: Fix a double free in nfs_parse_mount_options() Due to an apparent typo, commit a67d18f89f5782806135aad4ee012ff78d45aae7 (NFS: load the rpc/rdma transport module automatically) lead to the 'proto=' mount option doing a double free, while Opt_mountproto leaks a string. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit bbae8bcc49bc4d002221dab52c79a50a82e7cd1f Author: Linus Torvalds Date: Mon Apr 6 17:16:47 2009 -0700 ext3: make default data ordering mode configurable This makes the defautl ext3 data ordering mode (when no explicit ordering is set) configurable, so as to allow people to default to 'data=writeback' and get the resulting latency improvements. This is a non-issue if a filesystem has been explicitly set to some ordering (with 'tune2fs'). Signed-off-by: Linus Torvalds commit cae5a29d3c4ec7c4214966021c9ee827e66bd67b Author: Mark Lord Date: Mon Apr 6 16:43:45 2009 -0400 sata_mv: shorten register names Rename a slew of register name constants in sata_mv, removing the _OFS suffix from them, and shortening some of them in other ways as well. Also, bump up the version number to reflect all recent changes. In theory, no actual changes to the generated code, other than the version number bump. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 12f3b6d7551306c00cf834540a33184de67c9187 Author: Mark Lord Date: Mon Apr 6 15:26:24 2009 -0400 sata_mv: workaround errata SATA#13 Add remainder of workaround for errata SATA#13. This prevents writes of certain adjacent 32-bit registers from being combined into single 64-bit writes, which might fail for the affected registers. Most of sata_mv is already safe from this issue, but adding this code to mv_write_cached_reg() will catch the remaining cases and hopefully prevent future ones. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit ba68460b8e019dfd9c73ab69f5ed163a8b24e296 Author: Mark Lord Date: Mon Apr 6 15:25:39 2009 -0400 sata_mv: cosmetic renames Add _OFS suffix to more of the register offset names, for consistency with the rest of the driver. Also tag the defines for LTMODE and PHY_MODE4 to note that read-after-write is necessary when updating those regs. No code changes here. [NOTE: this commit is undone a few commits later] Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 2009177329ae565d9e9efd31b399d2f4ed4f0c44 Author: Mark Lord Date: Mon Apr 6 15:24:57 2009 -0400 sata_mv: workaround errata SATA#26 Workaround for errata SATA#26. Prevents accidently putting a drive to sleep when attempting COMRESET, by ORing 0xf000 with the values written to SCR_CONTROL. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 65ad7fef10b50b6c06d6165fa847e2d3636b0a66 Author: Mark Lord Date: Mon Apr 6 15:24:14 2009 -0400 sata_mv: workaround errata PCI#7 Workaround for 60x1-B2 errata PCI#7. Write-combining may be unreliable when chip operates in PCI-X mode, so disable write-combining when in PCI-X mode. Also, update the errata comments at the top of sata_mv, and include a note about errata PCI#11. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit c361acbc59c434315f8649ab06e5b7d5b297d1b7 Author: Mark Lord Date: Mon Apr 6 15:22:21 2009 -0400 sata_mv: replace 0x1f with ATA_PIO4 (v2) Cosmetic change: replace .pio_mask=0x1f with .pio_mask=ATA_PIO4 everywhere. Originally from Erik Inge Bolsø, now reworked for latest sata_mv. Signed-off-by: Erik Inge Bolsø Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 933cb8e5fcdebd4b666165e3f039f814d62b0e52 Author: Mark Lord Date: Mon Apr 6 12:30:43 2009 -0400 sata_mv: fix irq mask races Prevent racing on the main interrupt mask during port_start and port_stop. Otherwise, we end up with IRQs masked on inactive ports, and hotplug insertions then get missed later on. Found while debugging (out of tree) target mode operations, but the bug is present and impacting mainline as well. This patch should also be considered for -stable. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 44c65d169c5d2e5c872581ebc65f12710d7c3b71 Author: Mark Lord Date: Mon Apr 6 12:29:49 2009 -0400 sata_mv: revert SoC irq breakage Revert most of commit 6be96ac1d5e4d913e1f48299db083ada5321803b2, originally from Lennert Buijtenheck (Marvell) and Saeed Bishara (Marvell), since that commit causes sata_mv to oops at startup on SOC "Kirkwood". The SOC variants do not have the hpriv->irq_{cause,mask}_ofs registers, so don't try to write to them! This patch should also be considered for -stable. Reported-by: Maxime Bizon Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit d1d88e5de491f7b0862a0adaed427211c0e4a0a6 Author: Steffen Klassert Date: Mon Apr 6 03:58:50 2009 +0000 xfrm: fix fragmentation on inter family tunnels If an ipv4 packet (not locally generated with IP_DF flag not set) bigger than mtu size is supposed to go via a xfrm ipv6 tunnel, the packetsize check in xfrm4_tunnel_check_size() is omited and ipv6 drops the packet without sending a notice to the original sender of the ipv4 packet. Another issue is that ipv4 connection tracking does reassembling of incomming fragmented packets. If such a reassembled packet is supposed to go via a xfrm ipv6 tunnel it will be droped, even if the original sender did proper fragmentation. According to RFC 2473 (section 7) tunnel ipv6 packets resulting from the encapsulation of an original packet are considered as locally generated packets. If such a packet passed the checks in xfrm{4,6}_tunnel_check_size() fragmentation is allowed according to RFC 2473 (section 7.1/7.2). This patch sets skb->local_df in xfrm6_prepare_output() to achieve fragmentation in this case. Signed-off-by: Steffen Klassert Signed-off-by: David S. Miller commit 10fd9d7ec48194754de6497ded2ef53cbd2c313e Author: Jean Delvare Date: Mon Apr 6 02:27:10 2009 +0000 ibm_newemac: Fix dangerous struct assumption The ibm_newemac driver includes code which assumes that the work_struct which is included in every delayed_work is the first member of that structure. This is currently the case but might change in the future, so use to_delayed_work() instead, which doesn't make such an assumption. Signed-off-by: Jean Delvare Cc: Josh Boyer Signed-off-by: David S. Miller commit c69c6d107ab18e330f22f9380da353fed29c296b Author: Tilman Schmidt Date: Sun Apr 5 06:39:33 2009 +0000 gigaset: documentation update Update, correct and clarify instructions for loading the driver and for setting the UNDOCREQ kernel configuration option. Impact: documentation Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 51370e5b21c5825cff7482e1c38f4e7c5dab3e2b Author: Tilman Schmidt Date: Sun Apr 5 06:39:33 2009 +0000 gigaset: in file ops, check for device disconnect before anything else When the device is disconnected, the dev structure goes away, so trying to report another error via dev_printk is bound to oops. To avoid that, first check whether the device is still connected and return quietly if it isn't. Impact: error handling Signed-off-by: Tilman Schmidt Reported-by: Paul Bolle Tested-by: Paul Bolle Signed-off-by: David S. Miller commit 368fd81d2db26e3338c7f42778a695510aff31b3 Author: Tilman Schmidt Date: Sun Apr 5 06:39:33 2009 +0000 bas_gigaset: use tasklet_hi_schedule for timing critical tasklets The tasklets for isochronous data transfer need to run within 8 msec to avoid over/underruns, so schedule them with high priority to fix reported issues with occasional over/underruns. Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit d9677a45cfee59e2877e645762a4ddb2d1d35978 Author: Adrian Bunk Date: Sun Apr 5 06:36:21 2009 +0000 net/802/fddi.c: add MODULE_LICENSE This patch adds the missing MODULE_LICENSE("GPL"). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 29ebd9a90cc6967271ae9238d6461ee28caa9a64 Author: Huang Weiyi Date: Sat Apr 4 15:53:17 2009 +0000 smsc911x: remove unused #include Remove unused #include in drivers/net/smsc911x.c. Signed-off-by: Huang Weiyi Signed-off-by: David S. Miller commit ad3620a072bc1ba93b0146f6f5467ae928b449a6 Author: Ken Kawasaki Date: Sat Apr 4 14:49:07 2009 +0000 axnet_cs: fix phy_id detection for bogus Asix chip. axnet_cs: (1) Some Asix phy return bogus value except 0 or 0xffff. Skip this phy_id. (2) Some Asix chip need to set "select Internal PHY" bit at AX88190_init. Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit 4c1e9aa41b2f9afe8f26e2efe5bb4695f6c40772 Author: David Milburn Date: Fri Apr 3 15:36:41 2009 -0500 libata: ahci enclosure management bios workaround During driver initialization ahci_start_port may not be able to turn LEDs off because the hardware may still be transmitting a message. And since the BIOS may not be setting the LEDs to off the drive LEDs may end up in a fault state. This has been seen on ICH9r and ICH10r when configured in AHCI mode instead of RAID mode, this patch doesn't key off a specific set of device IDs but will give the EM transmit bit a chance to clear if busy. Signed-off-by: David Milburn Signed-off-by: Jeff Garzik commit 0c659b82d11eaf5e1bee1f2bcb9994b9d09d175c Author: Matthew Wilcox Date: Thu Apr 2 10:37:25 2009 -0400 ata: Add TRIM infrastructure This is common code shared between the IDE and libata implementations Signed-off-by: David Woodhouse Signed-off-by: Matthew Wilcox Signed-off-by: Jeff Garzik commit c3f93b8fc6471ddbbc2a7e89fdfcfc8367e17564 Author: Tejun Heo Date: Tue Mar 31 10:44:34 2009 +0900 ata_piix: VGN-BX297XP wants the controller power up on suspend Sony VGN-BX297XP fails suspend if the controller is powered down when calling into ACPI suspend. Add the machine to piix_broken_suspend list. This problem was reported by GNUtoo@no-log.org on bko#10293. Signed-off-by: Tejun Heo Cc: Rafael J. Wysocki Reported-by: GNUtoo@no-log.org Signed-off-by: Jeff Garzik commit 2d1299aad5b6f6ceeb92d066c58717a164df4876 Author: David Daney Date: Tue Mar 31 15:04:39 2009 -0700 libata: Remove some redundant casts from pata_octeon_cf.c Signed-off-by: David Daney Signed-off-by: Jeff Garzik commit 8feb4d20b4b867e7a44f7486ecb028cc01a564ae Author: Alan Cox Date: Wed Apr 1 15:01:39 2009 +0100 pata_artop: typo Fix a typo (this was in the original patch but was not merged when the code fixes were for some reason) Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 5c15a6869a75000fecea61e9985f4753311ec534 Author: Anton Vorontsov Date: Sat Apr 4 22:33:19 2009 +0400 ASoC: fsl_dma: Pass the proper device for dma mapping routines The driver should pass a device that specifies internal DMA ops, but substream->pcm is just a logical device, and thus doesn't have arch- specific dma callbacks, therefore following bug appears: Freescale Synchronous Serial Interface (SSI) ASoC Driver ------------[ cut here ]------------ kernel BUG at arch/powerpc/include/asm/dma-mapping.h:237! Oops: Exception in kernel mode, sig: 5 [#1] ... NIP [c02259c4] snd_malloc_dev_pages+0x58/0xac LR [c0225c74] snd_dma_alloc_pages+0xf8/0x108 Call Trace: [df02bde0] [df02be2c] 0xdf02be2c (unreliable) [df02bdf0] [c0225c74] snd_dma_alloc_pages+0xf8/0x108 [df02be10] [c023a100] fsl_dma_new+0x68/0x124 [df02be20] [c02342ac] soc_new_pcm+0x1bc/0x234 [df02bea0] [c02343dc] snd_soc_new_pcms+0xb8/0x148 [df02bed0] [c023824c] cs4270_probe+0x34/0x124 [df02bef0] [c0232fe8] snd_soc_instantiate_card+0x1a4/0x2f4 [df02bf20] [c0233164] snd_soc_instantiate_cards+0x2c/0x68 [df02bf30] [c0234704] snd_soc_register_platform+0x60/0x80 [df02bf50] [c03d5664] fsl_soc_platform_init+0x18/0x28 ... This patch fixes the issue by using card's device instead. Signed-off-by: Anton Vorontsov Acked-by: Timur Tabi Signed-off-by: Mark Brown commit e0724bf6e4a1f2e678d2b2aab01cae22e17862f0 Merge: 38d9aef de09757 Author: Linus Torvalds Date: Mon Apr 6 15:00:19 2009 -0700 Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 * 'linux-next' of git://git.infradead.org/ubifs-2.6: UBIFS: fix recovery bug UBIFS: add R/O compatibility UBIFS: fix compiler warnings UBIFS: fully sort GCed nodes UBIFS: fix commentaries UBIFS: introduce a helpful variable UBIFS: use KERN_CONT UBIFS: fix lprops committing bug UBIFS: fix bogus assertion UBIFS: fix bug where page is marked uptodate when out of space UBIFS: amend key_hash return value UBIFS: improve find function interface UBIFS: list usage cleanup UBIFS: fix dbg_chk_lpt_sz() commit 38d9aefb5ce8f26358b0d5cd933cfa9e267105b1 Merge: 432870d 1b24bc3 Author: Linus Torvalds Date: Mon Apr 6 15:00:00 2009 -0700 Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 * 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: add fsync capability commit 432870dab85a2f69dc417022646cb9a70acf7f94 Author: Oleg Nesterov Date: Mon Apr 6 16:16:02 2009 +0200 exit_notify: kill the wrong capable(CAP_KILL) check The CAP_KILL check in exit_notify() looks just wrong, kill it. Whatever logic we have to reset ->exit_signal, the malicious user can bypass it if it execs the setuid application before exiting. Signed-off-by: Oleg Nesterov Acked-by: Serge Hallyn Acked-by: Roland McGrath Signed-off-by: Linus Torvalds commit 22ae77bc7ac115b9d518d5cbc13d39317079b2b0 Merge: e379ec7 30bbf14 Author: Linus Torvalds Date: Mon Apr 6 14:56:26 2009 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: (53 commits) [MTD] struct device - replace bus_id with dev_name(), dev_set_name() [MTD] [NOR] Fixup for Numonyx M29W128 chips [MTD] mtdpart: Make ecc_stats more realistic. powerpc/85xx: TQM8548: Update DTS file for multi-chip support powerpc: NAND: FSL UPM: document new bindings [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays [MTD] [NAND] FSL-UPM: add multi chip support [MTD] [NOR] Add device parent info to physmap_of [MTD] [NAND] Add support for NAND on the Socrates board [MTD] [NAND] Add support for 4KiB pages. [MTD] sysfs support should not depend on CONFIG_PROC_FS [MTD] [NAND] Add parent info for CAFÉ controller [MTD] support driver model updates [MTD] driver model updates (part 2) [MTD] driver model updates [MTD] [NAND] move gen_nand's probe function to .devinit.text [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text [MTD] fix use after free in register_mtd_blktrans [MTD] [MAPS] Drop now unused sharpsl-flash map [MTD] ofpart: Check name property to determine partition nodes. ... Manually fix trivial conflict in drivers/mtd/maps/Makefile commit e379ec7c42343c6b6ef06a98de7c94db41c1423e Author: Alan Cox Date: Mon Apr 6 14:55:50 2009 +0100 LANANA: Fix dates As noted by Janne Grunau it would be good if the date was also right. (Web site also resynched) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 91a9e99d76d71b1b16f422fae4bd844245f14638 Author: Alexander Beregalov Date: Tue Apr 7 01:35:56 2009 +0400 md/raid1: fix build breakage Fix this build error: drivers/md/raid1.c: In function 'raid1_congested': drivers/md/raid1.c:589: error: 'BDI_write_congested' undeclared BDI_write_congested was changed in commit 1faa16d228 ("block: change the request allocation/congestion logic to be sync/async based") Signed-off-by: Alexander Beregalov Cc: Neil Brown Cc: Jens Axboe Signed-off-by: Linus Torvalds commit bf538fe4689694b0b90d358dda91cde7b438097d Author: Alan Cox Date: Mon Apr 6 17:35:42 2009 +0100 8250: Fix warning The 8430 patch was short a const so caused a warning. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 1f85449ffd146cf2b91a47dff694281bcfd2558b Author: Roel Kluin Date: Mon Apr 6 17:35:34 2009 +0100 rio: addition has higher precedence than ?: Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 22654b41a724ccf937248ab0877e113c12a2cf8a Author: Alan Cox Date: Mon Apr 6 17:35:25 2009 +0100 symbol: Remove various bits of left over junk There are various bits of code here that are unfinished and instead of being harmless either confuse or spew stuff into the logs at higher than debug level. They can and should go away. Also remove the bogus use of tty->lowlatency. We fixed the need for this hack long ago (with the flip buffer rewrite) but people keep copying it into drivers. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 912299f6f0587bb6c221705ed9949709b36b3c56 Author: Alan Cox Date: Mon Apr 6 17:35:12 2009 +0100 tty: pl2303 needs identifiers for Siemens S81 as well as EF81 Closes bug 9065 Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 7abcf20b8f32dd679b162b33c07e427c67d4a1fb Author: Alan Cox Date: Mon Apr 6 17:35:01 2009 +0100 cdc-acm: zydas 1602 identifier needed Bugzilla #9095 and a couple of other confirmations Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 60de8ad37436850ac214fe06ecf338da266c2205 Author: Breno Leitao Date: Mon Apr 6 17:34:53 2009 +0100 icom: remove unused variables Signed-off-by: Breno Leitao Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 06e82df015afad2d96d030f76f5e4d13e6dcdfa4 Author: Alexander Beregalov Date: Mon Apr 6 17:34:34 2009 +0100 mux: fix build problem Fixes: In file included from drivers/serial/mux.c:37: include/linux/serial_core.h: In function 'uart_handle_sysrq_char': include/linux/serial_core.h:467: error: 'struct uart_port' has no member named 'sysrq' include/linux/serial_core.h:468: error: 'struct uart_port' has no member named 'sysrq' Signed-off-by: Alexander Beregalov Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e713abead3324f6d4381a3d280b7ce35b7eadb7a Author: Breno Leitao Date: Mon Apr 6 17:34:27 2009 +0100 jsm: Fix the return variable and removing the unused retval. As it was, the retval was never returned, so its assignments were silly. Just consolidate everything to rc, and remove the unused retval variable. Signed-off-by: Breno Leitao Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit aacf17adc62650fa0eb59559b737f543d003575e Author: Breno Leitao Date: Mon Apr 6 17:34:17 2009 +0100 jsm: define init function as __devinit Signed-off-by: Breno Leitao Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0326e6d596491db64d787136cbd703bde0ee8d77 Author: Jiri Slaby Date: Mon Apr 6 17:34:10 2009 +0100 mxser: remove tty_port_tty_get from mxser_check_modem_status mxser_check_modem_status is called with tty parameter, so the reference should be increased by callers already -- for ioctl syscall it is held whole time gap since open to close, for interrupt, the reference count is increased in the irq handler. There is no tty_kref_put in that function, so this also fixes a refcounting bug. Signed-off-by: Jiri Slaby Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0e0fd7d73ed130583dca16405b029f56bf65109f Author: Jiri Slaby Date: Mon Apr 6 17:34:04 2009 +0100 tty: moxa, fix refcounting in moxa_poll_port There is missing tty_kref_put on some paths in moxa_poll_port, although the reference is always taken. Fix it. Signed-off-by: Jiri Slaby Reported-by: Jan 'Yenya' Kasprzak Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit bbb8e6bf10c5c3c9c70a94aa26cb27f95f10dee5 Author: Alan Cox Date: Mon Apr 6 17:33:55 2009 +0100 isicom: isicom kref leak fix The isicom driver leaks a kref on the shutdown path. Drop the additional kref we took Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8d5a05da823ebd83a5147e1bfe19036a57a4d33c Author: Alan Cox Date: Mon Apr 6 17:33:48 2009 +0100 ucc: Fix leaky error path Found by Daniel Marjamäki using cppcheck Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 5c9f5806836a9079d6c2d38d567d5f0662863bf4 Author: Scott James Remnant Date: Mon Apr 6 17:33:26 2009 +0100 riscom8: Auto-load riscom8 module when device opened. The riscom8 module is missing the char-major-48-* alias that would cause it to be auto-loaded when a device of that type is opened. This patch adds the alias. Signed-off-by: Scott James Remnant Signed-off-by: Tim Gardner Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e766aeb882b41355d8732cf49aa9412baef852c5 Author: Scott James Remnant Date: Mon Apr 6 17:33:18 2009 +0100 usb: Auto-load cdc_acm module when device opened. The cdc_acm module is missing the char-major-166-* alias that would cause it to be auto-loaded when a device of that type is opened. This patch adds the alias. Signed-off-by: Scott James Remnant Signed-off-by: Tim Gardner Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 5350d3ba3d4cee899fa0b95fc0d30202ac8073e7 Author: Scott James Remnant Date: Mon Apr 6 17:33:11 2009 +0100 specialix: Auto-load specialix module when device opened. The specialix module is missing the char-major-75-* alias that would cause it to be auto-loaded when a device of that type is opened. This patch adds the alias. Signed-off-by: Scott James Remnant Signed-off-by: Tim Gardner Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9f56fad741163fe2111cbbcfb7ff795ebdabdab1 Author: Scott James Remnant Date: Mon Apr 6 17:33:04 2009 +0100 cyclades: Auto-load cyclades module when device opened. The cyclades module is missing the char-major-19-* alias that would cause it to be auto-loaded when a device of that type is opened. This patch adds the alias. Signed-off-by: Scott James Remnant Signed-off-by: Tim Gardner Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 14f8d3ff3141caa8bf8326381ab8e6ce06c564b8 Author: Scott James Remnant Date: Mon Apr 6 17:32:58 2009 +0100 applicom: Auto-load applicom module when device opened. The applicom module is missing the char-major-10-157 alias that would cause it to be auto-loaded when a device of that type is opened. This patch adds the alias. Signed-off-by: Scott James Remnant Signed-off-by: Tim Gardner Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f4487101c7c5e529777b297eda5a5b69347f51a0 Author: Graf Yang Date: Mon Apr 6 17:32:49 2009 +0100 blackfin: Subtract ANOMALY_05000230 on quot Fix bug - up arrow key works abnormal for bf561 ezkit board Signed-off-by: Graf Yang Signed-off-by: Bryan Wu Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8c4210e3362e1cd44bd10c857dc5f69c0bf434da Author: Sonic Zhang Date: Mon Apr 6 17:32:42 2009 +0100 Fix DMA rx ring buffer handling Reported-by: Qian Zhang Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit df04baf1e6a62ff232fa224504ccaa987b5be230 Author: Sonic Zhang Date: Mon Apr 6 17:32:35 2009 +0100 blackfin: Fix tty compile error in PIO mode Fixes this compile issue: drivers/serial/bfin_5xx.c: In function bfin_serial_rx_chars: drivers/serial/bfin_5xx.c:178: error: struct uart_info has no member named tty Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 59e4e3e65d3f856cfcdc66de2db5530d7b161f68 Author: Mike Frysinger Date: Mon Apr 6 17:32:28 2009 +0100 blackfin: Use unsigned long for flags with irq functions Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f933d3c740b32bdd284c74b2e40e838b585ecf0f Author: Michael Hennerich Date: Mon Apr 6 17:32:21 2009 +0100 blackfin: BF538/9 serial uart support Enable third UART on BF538/9 Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 04bf7e745b841619d2f14f2f8b6f2c97f1c6757e Author: Will Page Date: Mon Apr 6 17:32:15 2009 +0100 8250_pci: add support for National Instruments legacy 8420 RS232 boards Signed-off-by: Will Page Signed-off-by: Shawn Bohrer Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 46a0fac9438764533245928b78d35fbaa5d7adf4 Author: Shawn Bohrer Date: Mon Apr 6 17:32:07 2009 +0100 8250_pci: add support for National Instruments 843x RS232 devices This implements basic support for all 843x RS232 devices, but does not add DMA support. This means that sustained data transfers at high baud rates may not be possible on multiple ports simultaneously. Signed-off-by: Shawn Bohrer Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 97ea33f9e375e4f9b3049ca861e5c91cc626c55f Author: Matthew Garrett Date: Mon Apr 6 17:32:01 2009 +0100 serial: Update PNP IDs Add new Wacom device IDs to the 8250_pnp serial driver, to support autoconfig on some newer tablet PCs. Also add a comment to clarify that the FUJ02E6 device is a custom protocol, not a Wacom tablet. Signed-off-by: Matthew Garrett Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 3eba1da43e043cd760c98cd227546d310e145843 Author: Danny Kukawka Date: Mon Apr 6 17:31:54 2009 +0100 8250_pnp.c: add another Wacom tablet Add another serial Wacom tablet with pnp_id: WACF009. Signed-off-by: Danny Kukawka Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 1c2d008c9e73626cc354751c62b94177c4094f8b Author: David Howells Date: Mon Apr 6 15:47:25 2009 +0100 Make CONFIG_SLOW_WORK an automatic rather than manual config option Make CONFIG_SLOW_WORK an automatic rather than manual config option so that people configuring their kernels don't have to make the choice. It can be selected automatically by those things that require it (such as FS-Cache). Signed-off-by: David Howells Acked-by: Jeff Garzik Acked-by: Kyle McMartin Signed-off-by: Linus Torvalds commit c47ae9adfdd3a9551969534dbb0d5606ec646526 Author: Adrian Bunk Date: Mon Apr 6 15:36:04 2009 +0100 FRV: Fix compile breakage This patch fixes the follwing build error caused by commit 7ca43e7564679604d86e9ed834e7bbcffd8a4a3f (mm: use debug_kmap_atomic): ... AS arch/frv/mm/tlb-miss.o In file included from arch/frv/mm/tlb-miss.S:13: ... Assembler messages: include/asm-generic/ioctl.h:73: Error: unrecognized instruction `extern unsigned int __invalid_size_argument_for_IO...' ... Signed-off-by: Adrian Bunk Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit ffa009c366e33f3eae48bba2547051fe15795f64 Merge: 8e320d0 46f06b7 Author: Linus Torvalds Date: Mon Apr 6 14:26:05 2009 -0700 Merge git://git.infradead.org/iommu-2.6 * git://git.infradead.org/iommu-2.6: drivers/pci/intr_remapping.c: include acpi.h intel-iommu: Fix oops in device_to_iommu() when devices not found. intel-iommu: Handle PCI domains appropriately. intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges. x2apic/intr-remap: decouple interrupt remapping from x2apic x86, dmar: check if it's initialized before disable queue invalidation intel-iommu: set compatibility format interrupt Intel IOMMU Suspend/Resume Support - Interrupt Remapping Intel IOMMU Suspend/Resume Support - Queued Invalidation Intel IOMMU Suspend/Resume Support - DMAR intel-iommu: Add for_each_iommu() and for_each_active_iommu() macros commit 8e320d02718d2872d52ef88a69a493e420494269 Merge: 5d6700e 303a0e1 Author: Linus Torvalds Date: Mon Apr 6 13:46:27 2009 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md/raid1 - don't assume newly allocated bvecs are initialised. commit 46f06b72378d3187f0d12f7a60d020676bfbf332 Author: Alexander Beregalov Date: Mon Apr 6 16:45:28 2009 +0100 drivers/pci/intr_remapping.c: include acpi.h Fix this build error: drivers/pci/intr_remapping.c: In function 'ir_parse_ioapic_scope': drivers/pci/intr_remapping.c:617: error: invalid use of undefined type 'struct acpi_dmar_hardware_unit' Signed-off-by: Alexander Beregalov Signed-off-by: David Woodhouse commit 5d6700ea7bfb4704a8d5d10c6ebf0e947410f9ce Author: Stephen Rothwell Date: Mon Apr 6 15:08:29 2009 +1000 percpu: __percpu_depopulate_mask can take a const mask This eliminates a compiler warning: mm/allocpercpu.c: In function 'free_percpu': mm/allocpercpu.c:146: warning: passing argument 2 of '__percpu_depopulate_mask' discards qualifiers from pointer target type Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 0cb55ad2ad5513f55304d026bb4319a9311163d0 Author: Randy Dunlap Date: Sun Apr 5 15:55:22 2009 -0700 docs: alphabetize entries in kernel-parameters.txt Move entries to be in alpha order as specified near the beginning of this file. Clean up some whitespace and line-length miscues. Add '=' to "selinux" option syntax. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 88cacbb21be116b4b5ce9811a90868e585efdd68 Author: Randy Dunlap Date: Sun Apr 5 15:45:34 2009 -0700 docbook: fix fatal filename error Fix docbook fatal error: docproc: block/blktrace.c: No such file or directory Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit cd5f9a4c3199b090e91ea0064cb110985ba54814 Author: Linus Torvalds Date: Mon Apr 6 13:38:46 2009 -0700 kernel/sysctl.c: avoid annoying warnings Some of the limit constants are used only depending on some complex configuration dependencies, yet it's not worth making the simple variables depend on those configuration details. Just mark them as perhaps not being unused, and avoid the warning. Signed-off-by: Linus Torvalds commit 609862be074cc20e007c640fd936ffe798b41abc Merge: 12fe32e eedeeab Author: Linus Torvalds Date: Mon Apr 6 13:37:30 2009 -0700 Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: add stack dumps to asserts hrtimer: fix rq->lock inversion (again) commit 4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e Author: David Woodhouse Date: Mon Apr 6 13:30:01 2009 -0700 intel-iommu: Fix oops in device_to_iommu() when devices not found. It's possible for a device in the drhd->devices[] array to be NULL if it wasn't found at boot time, which means we have to check for that case. Signed-off-by: David Woodhouse commit 12fe32e4f942ac5c71a4ab70b039fee65c0dc29d Merge: a638562 2121db7 Author: Linus Torvalds Date: Mon Apr 6 13:30:00 2009 -0700 Merge branch 'kmemtrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'kmemtrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kmemtrace: trace kfree() calls with NULL or zero-length objects kmemtrace: small cleanups kmemtrace: restore original tracing data binary format, improve ABI kmemtrace: kmemtrace_alloc() must fill type_id kmemtrace: use tracepoints kmemtrace, rcu: don't include unnecessary headers, allow kmemtrace w/ tracepoints kmemtrace, rcu: fix rcupreempt.c data structure dependencies kmemtrace, rcu: fix rcu_tree_trace.c data structure dependencies kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies kmemtrace, mm: fix slab.h dependency problem in mm/failslab.c kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_unlzma.c kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_bunzip2.c kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_inflate.c kmemtrace, squashfs: fix slab.h dependency problem in squasfs kmemtrace, befs: fix slab.h dependency problem kmemtrace, security: fix linux/key.h header file dependencies kmemtrace, fs: fix linux/fdtable.h header file dependencies kmemtrace, fs: uninline simple_transaction_set() kmemtrace, fs, security: move alloc_secdata() and free_secdata() to linux/security.h commit a63856252d2112e7c452696037a86ceb12f47f80 Merge: b24241a 04826f4 Author: Linus Torvalds Date: Mon Apr 6 13:25:56 2009 -0700 Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux * 'for-2.6.30' of git://linux-nfs.org/~bfields/linux: (81 commits) nfsd41: define nfsd4_set_statp as noop for !CONFIG_NFSD_V4 nfsd41: define NFSD_DRC_SIZE_SHIFT in set_max_drc nfsd41: Documentation/filesystems/nfs41-server.txt nfsd41: CREATE_EXCLUSIVE4_1 nfsd41: SUPPATTR_EXCLCREAT attribute nfsd41: support for 3-word long attribute bitmask nfsd: dynamically skip encoded fattr bitmap in _nfsd4_verify nfsd41: pass writable attrs mask to nfsd4_decode_fattr nfsd41: provide support for minor version 1 at rpc level nfsd41: control nfsv4.1 svc via /proc/fs/nfsd/versions nfsd41: add OPEN4_SHARE_ACCESS_WANT nfs4_stateid bmap nfsd41: access_valid nfsd41: clientid handling nfsd41: check encode size for sessions maxresponse cached nfsd41: stateid handling nfsd: pass nfsd4_compound_state* to nfs4_preprocess_{state,seq}id_op nfsd41: destroy_session operation nfsd41: non-page DRC for solo sequence responses nfsd41: Add a create session replay cache nfsd41: create_session operation ... commit b24241a09208874d5d770bee30791daae41ad762 Merge: 22eb5aa abe213d Author: Linus Torvalds Date: Mon Apr 6 13:25:27 2009 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Delete unused i2c-algo-sgi helper module i2c: Delete many unused driver IDs i2c: Deprecate client_register and client_unregister methods commit 22eb5aa6c7940861f9603581665b9d9a1c60be30 Merge: d7ca6f8 015640e Author: Linus Torvalds Date: Mon Apr 6 13:24:49 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (74 commits) [SCSI] sg: fix q->queue_lock on scsi_error_handler path [SCSI] replace __inline with inline [SCSI] a2091: make 2 functions static [SCSI] a3000: make 2 functions static [SCSI] ses: #if 0 the unused ses_match_host() [SCSI] use kmem_cache_zalloc instead of kmem_cache_alloc/memset [SCSI] sg: fix iovec bugs introduced by the block layer conversion [SCSI] qlogicpti: use request_firmware [SCSI] advansys: use request_firmware [SCSI] qla1280: use request_firmware [SCSI] libiscsi: fix iscsi pool error path [SCSI] cxgb3i: call ddp release function directly [SCSI] cxgb3i: merge cxgb3i_ddp into cxgb3i module [SCSI] cxgb3i: close all tcp connections upon chip reset [SCSI] cxgb3i: re-read ddp settings information after chip reset [SCSI] cxgb3i: re-initialize ddp settings after chip reset [SCSI] cxgb3i: subscribe to error notification from cxgb3 driver [SCSI] aacraid driver update [SCSI] mptsas: remove unneeded check [SCSI] config: Make need for SCSI_CDROM clearer ... commit d7ca6f8cdffa5765e486edb3dada9121fba8e6aa Merge: 3cd6927 13a7b5d Author: Linus Torvalds Date: Mon Apr 6 13:24:00 2009 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: backlight: Adds HP Jornada 700 series backlight driver backlight: Add HP Jornada 700 series LCD driver backlight: fix pwm_bl.c when multiple PWM backlights exist backlight: mbp_nvidia_bl - Add a debug switch backlight: Add support for MacBook 5, MacBook Air 2, and MacBook Pro 5 commit 3cd69271f86770499425c7cea2902512ba936a75 Merge: 1aa2a7c 67a32ec Author: Linus Torvalds Date: Mon Apr 6 13:22:45 2009 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds: leds: introduce lp5521 led driver leds: just ignore invalid GPIOs in leds-gpio leds: Fix &&/|| confusion in leds-pca9532.c leds: move h1940-leds's probe function to .devinit.text leds: remove an unnecessary "goto" on drivers/leds/leds-s3c24.c leds: add BD2802GU LED driver leds: remove experimental flag from leds-clevo-mail leds: Prevent multiple LED triggers with the same name leds: Add gpio-led trigger leds: Add rb532 LED driver for the User LED leds: Add suspend/resume state flags to leds-gpio leds: simple driver for pwm driven LEDs leds: Fix leds-gpio driver multiple module_init/exit usage leds: Add dac124s085 driver leds: allow led-drivers to use a variable range of brightness values leds: Add openfirmware platform device support commit 72800360fdd782eda3489e555adf3b6b3abc064a Author: Alex Chiang Date: Mon Mar 30 10:50:19 2009 -0600 PCI: pci_slot: grab refcount on slot's bus If a logical hot unplug (remove) is performed on a physical PCI slot's parent bridge, and then pci_slot is unloaded, we will encounter an oops: [] kobject_release+0x9a/0x290 [] ? kobject_release+0x0/0x290 [] kref_put+0x37/0x80 [] kobject_put+0x27/0x60 [] ? pci_destroy_slot+0x3c/0xc0 [] pci_destroy_slot+0x45/0xc0 [] acpi_pci_slot_remove+0x5c/0x91 [pci_slot] [] acpi_pci_unregister_driver+0x4b/0x62 [] acpi_pci_slot_exit+0x10/0x12 [pci_slot] [] sys_delete_module+0x161/0x250 We need to grab a reference to the parent PCI bus, which will pin the bus and prevent it from being released until pci_slot is unloaded. Cc: lenb@kernel.org Reviewed-by: Kenji Kaneshige Tested-by: Kenji Kaneshige Reported-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 5d4a4b25ddc3e864d3a562c024bebdc922118854 Author: Alex Chiang Date: Mon Mar 30 10:50:14 2009 -0600 PCI Hotplug: acpiphp: grab refcount on p2p subordinate bus If a logical hot unplug (remove) is performed on a bridge claimed by acpiphp and then acpiphp is unloaded, we will encounter an oops. This is because acpiphp will access the bridge's subordinate bus, which was released by the user's prior hot unplug. The solution is to grab a reference on the subordinate PCI bus. This will prevent the bus from release until acpiphp is unloaded. Reviewed-by: Kenji Kaneshige Tested-by: Kenji Kaneshige Reported-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit c2ac7cdc6707a8a3fc5cdaebb65cb724ba8ecdef Author: Alex Chiang Date: Mon Mar 30 10:50:09 2009 -0600 PCI: allow PCI core hotplug to remove PCI root bus There is no reason to prevent removal of root bus devices. A subsequent rescan will find them just fine. Reviewed-by: Kenji Kaneshige Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit d6141668c24d7d75c3486499c05a6b382cbc2bbe Author: Anton Vorontsov Date: Wed Apr 1 02:23:41 2009 +0400 PCI: Fix oops in pci_vpd_truncate pci_vpd_truncate() should check for dev->vpd->attr, otherwise this might happen: sky2 driver version 1.22 Unable to handle kernel paging request for data at address 0x0000000c Faulting instruction address: 0xc01836fc Oops: Kernel access of bad area, sig: 11 [#1] [...] NIP [c01836fc] pci_vpd_truncate+0x38/0x40 LR [c029be18] sky2_probe+0x14c/0x518 Call Trace: [ef82bde0] [c029bda4] sky2_probe+0xd8/0x518 (unreliable) [ef82be20] [c018a11c] local_pci_probe+0x24/0x34 [ef82be30] [c018a14c] pci_call_probe+0x20/0x30 [ef82be50] [c018a330] __pci_device_probe+0x64/0x78 [ef82be60] [c018a44c] pci_device_probe+0x30/0x58 [ef82be80] [c01aa270] really_probe+0x78/0x1a0 [ef82bea0] [c01aa460] __driver_attach+0xa4/0xa8 [ef82bec0] [c01a96ac] bus_for_each_dev+0x60/0x9c [ef82bef0] [c01aa0b4] driver_attach+0x24/0x34 [ef82bf00] [c01a9e08] bus_add_driver+0x12c/0x1cc [ef82bf20] [c01aa87c] driver_register+0x6c/0x110 [ef82bf30] [c018a770] __pci_register_driver+0x4c/0x9c [ef82bf50] [c03782c8] sky2_init_module+0x30/0x40 [ef82bf60] [c0001dbc] do_one_initcall+0x34/0x1a0 [ef82bfd0] [c0362240] do_initcalls+0x38/0x58 This happens with CONFIG_SKY2=y, and "ip=on" kernel command line, so pci_vpd_truncate() is called before late_initcall(pci_sysfs_init), therefore ->attr isn't yet initialized. Acked-by: Stephen Hemminger Signed-off-by: Anton Vorontsov Signed-off-by: Jesse Barnes commit 0cdbe30f0b04466a1fee11b81b3667bd1b982549 Author: Yuji Shimada Date: Mon Apr 6 10:24:21 2009 +0900 PCI: don't corrupt enable_cnt when doing manual resource alignment This patch fixes breakage of of enable_cnt in quirk_resource_alignment. Currently, quirk_resource_alignment calls pci_disable_device. pci_disable_device decrements enable_cnt, so that enable_cnt becomes -1. The patch disables memory decoding, writing command register directly. So enable_cnt is not broken. Signed-off-by: Yuji Shimada Signed-off-by: Jesse Barnes commit 5446a6bdb51e71da7a203e395b0b4c668d559a3a Author: Alex Chiang Date: Wed Apr 1 18:24:12 2009 -0600 PCI: annotate pci_rescan_bus as __ref, not __devinit pci_rescan_bus was annotated as __devinit, which is wrong, because it will never be part of device initialization. Howevever, we can't simply drop the annotation, because then we get section warnings about calling pci_scan_child_bus (which is correctly marked as __devinit). pci_rescan_bus will only get built when CONFIG_HOTPLUG is set, meaning that __devinit is a nop, so we know that pci_scan_child_bus has not been freed. Annotate as __ref to silence modpost. Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit 52a8873ba4e82d6e87f8478b3e7f9c12d8b37c38 Author: Randy Dunlap Date: Wed Apr 1 17:45:30 2009 -0700 PCI-IOV: fix missing kernel-doc Fix PCI iov kernel-doc warning: Warning(drivers/pci/iov.c:638): No description found for parameter 'nr_virtfn' Signed-off-by: Randy Dunlap Signed-off-by: Jesse Barnes commit 296ccb086dfb89b5b8d73ef08c795ffdff12a597 Author: Yuji Shimada Date: Fri Apr 3 16:41:46 2009 +0900 PCI: Setup disabled bridges even if buses are added This patch sets up disabled bridges even if buses have already been added. pci_assign_unassigned_resources is called after buses are added. pci_assign_unassigned_resources calls pci_bus_assign_resources. pci_bus_assign_resources calls pci_setup_bridge to configure BARs of bridges. Currently pci_setup_bridge returns immediately if the bus have already been added. So pci_assign_unassigned_resources can't configure BARs of bridges that were added in a disabled state; this patch fixes the issue. On logical hot-add, we need to prevent the kernel from re-initializing bridges that have already been initialized. To achieve this, pci_setup_bridge returns immediately if the bridge have already been enabled. We don't need to check whether the specified bus is a root bus or not. pci_setup_bridge is not called on a root bus, because a root bus does not have a bridge. The patch adds a new helper function, pci_is_enabled. I made the function name similar to pci_is_managed. The codes which use enable_cnt directly are changed to use pci_is_enabled. Acked-by: Alex Chiang Signed-off-by: Yuji Shimada Signed-off-by: Jesse Barnes commit 7eb93b175d4de9438a4b0af3a94a112cb5266944 Author: Yu Zhao Date: Fri Apr 3 15:18:11 2009 +0800 PCI: SR-IOV quirk for Intel 82576 NIC If BIOS doesn't allocate resources for the SR-IOV BARs, zero the Flash BAR and program the SR-IOV BARs to use the old Flash Memory Space. Please refer to Intel 82576 Gigabit Ethernet Controller Datasheet section 7.9.2.14.2 for details. http://download.intel.com/design/network/datashts/82576_Datasheet.pdf Signed-off-by: Yu Zhao Signed-off-by: Jesse Barnes commit 04826f43d4f0a4d56423eb8abb9f2ec9987df5b5 Author: Benny Halevy Date: Mon Apr 6 12:00:49 2009 +0300 nfsd41: define nfsd4_set_statp as noop for !CONFIG_NFSD_V4 Fixes following modpost error: ERROR: "nfsd4_set_statp" [fs/nfsd/nfsd.ko] undefined! Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit f0ad670d7061efad138df19aefe569263c4ea37b Author: Benny Halevy Date: Mon Apr 6 12:00:36 2009 +0300 nfsd41: define NFSD_DRC_SIZE_SHIFT in set_max_drc Fixes the following compiler error: fs/nfsd/nfssvc.c: In function 'set_max_drc': fs/nfsd/nfssvc.c:240: error: 'NFSD_DRC_SIZE_SHIFT' undeclared CONFIG_NFSD_V4 is not set Reported-by: Alexander Beregalov Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit abe213d7f6fb87f48f4324320733f666db1bc11b Author: Jean Delvare Date: Mon Apr 6 18:12:25 2009 +0200 i2c: Delete unused i2c-algo-sgi helper module The i2c-algo-sgi code was merged into the vino driver, so we can delete it now. Signed-off-by: Jean Delvare commit 7c8ad4aff0699197469327d0e50d1e48f2ccb39b Author: Jean Delvare Date: Mon Apr 6 18:12:25 2009 +0200 i2c: Delete many unused driver IDs Delete many unused I2C driver IDs. We should be able to get rid of i2c_driver.id pretty soon now. Signed-off-by: Jean Delvare commit e3ee703366da3a4ce80f24b47a5df56cd816c5d6 Author: Jean Delvare Date: Mon Apr 6 18:12:24 2009 +0200 i2c: Deprecate client_register and client_unregister methods The new i2c binding model makes the client_register and client_unregister methods of struct i2c_adapter useless, so we can remove them with the rest of the legacy model. Signed-off-by: Jean Delvare commit 13a7b5dc0d1768c8ae817e43cbe50597090b650a Author: Kristoffer Ericson Date: Wed Feb 18 11:50:43 2009 +0000 backlight: Adds HP Jornada 700 series backlight driver Signed-off-by: Kristoffer Ericson Signed-off-by: Richard Purdie commit 9e124435c772c650457a952b27bcbdb9a95d48d0 Author: Kristoffer Ericson Date: Wed Feb 18 11:47:26 2009 +0000 backlight: Add HP Jornada 700 series LCD driver Signed-off-by: Kristoffer Ericson Signed-off-by: Richard Purdie commit b8cdd877f2cbcc07b5a287b7273a8eaa4c11ad04 Author: Eric Miao Date: Tue Feb 10 13:30:37 2009 +0800 backlight: fix pwm_bl.c when multiple PWM backlights exist When multiple PWMs are used as backlights, the current code uses pdev->name as the backlight name when registering, which will be conflicting, use dev_name() instead. Signed-off-by: Peter Edwards Signed-off-by: Eric Miao Signed-off-by: Richard Purdie commit 1a468ba10c3bdbc25ef7aa7fecda20ee27007bdf Author: Mario Schwalbe Date: Sun Jan 11 00:19:31 2009 +0000 backlight: mbp_nvidia_bl - Add a debug switch This patch adds a debug switch to enable (little) diagnostic output, to help to trace down the remaining problems. Signed-off-by: Mario Schwalbe Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit c78a628849675580c7c5e1f07193c632e4b6827f Author: Mario Schwalbe Date: Sun Jan 11 00:11:34 2009 +0000 backlight: Add support for MacBook 5, MacBook Air 2, and MacBook Pro 5 This patch adds support for the new Apple models incorporating an Nvidia chipset. Apple still uses the same protocol as on older models, but the registers moved to a different address. To do this, two sets of functions are added for the Intel/Nvidia chipset models and passed by the DMI_MATCH function. The initial code has been contributed by Hu Gang . The driver is known to work on MacBook Pro 3, MacBook Pro 4 and MacBook Pro 5. Its known to work with limitations on MacBook 5 / MacBook Air 2. Changing brightness within X doesn't work, if using Nvidia's proprietary graphics driver with no known fix at present. Changing brightness on a text console or using the open-source driver does work. MacBook Pro 5 has a known bug where the initial brightness after bootup is the last recently used brightness (in Mac OSX), while the firmware reports maximum. Impossible to fix. [akpm@linux-foundation.org: build fix] [rpurdie@linux.intel.com: Rebased the patch against latest git] Signed-off-by: Mario Schwalbe Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 67a32ec750109fdfc7cba311145a18d543521822 Author: Felipe Balbi Date: Wed Feb 18 14:05:54 2009 +0200 leds: introduce lp5521 led driver LP5521 is a three channel led driver with support for hardware accelerated patterns (currently used via lp5521-only sysfs interface). Currently, it's used on n810 device. Signed-off-by: Felipe Balbi Signed-off-by: Richard Purdie commit d379ee8acd0719736ee7f1d1ccc3b5765880eaf8 Author: David Brownell Date: Thu Mar 5 16:46:44 2009 -0800 leds: just ignore invalid GPIOs in leds-gpio Sometimes it's awkward to make sure that the array in the platform_data handed to the leds-gpio driver has only valid data ... some leds may not be always available, and coping with that currently requires patching or rebuilding the array. This patch fixes that by making it be OK to pass an invalid GPIO (such as "-EINVAL") ... such table entries are skipped. [rpurdie@linux.intel.com: adjusted to apply against other led tree changes] Signed-off-by: David Brownell Tested-by: Diego Dompe Signed-off-by: Richard Purdie commit 7fbc3a9b132e93b2ba1fd889c1ad8a4135731cc3 Author: Riku Voipio Date: Tue Mar 3 22:13:06 2009 +0200 leds: Fix &&/|| confusion in leds-pca9532.c This fixes the expression in the driver to do the correct thing, not that I think anyone would send SND_* without EV_SND. Thanks to Roel Kluin for noticing. Signed-off-by: Riku Voipio Signed-off-by: Richard Purdie commit b0edba7ef89a64614e40023bf87ed5b402834e04 Author: Uwe Kleine-König Date: Sat Mar 28 00:26:38 2009 +0100 leds: move h1940-leds's probe function to .devinit.text A pointer to h1940leds_probe is passed to the core via platform_driver_register and so the function must not disappear when the .init sections are discarded. Otherwise (if also having HOTPLUG=y) unbinding and binding a device to the driver via sysfs will result in an oops as does a device being registered late. An alternative to this patch is using platform_driver_probe instead of platform_driver_register plus removing the pointer to the probe function from the struct platform_driver. Signed-off-by: Uwe Kleine-König Signed-off-by: Richard Purdie commit bfb2cc48f077017f6224e725886d07d76e3f96db Author: Zhenwen Xu Date: Fri Apr 3 15:35:52 2009 +0100 leds: remove an unnecessary "goto" on drivers/leds/leds-s3c24.c This goto is unnecessary. Signed-off-by: Zhenwen Xu Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 0b56129be72c38179697b7441aacbe133d515ff9 Author: Kim Kyuwon Date: Wed Mar 4 11:59:29 2009 -0800 leds: add BD2802GU LED driver ROHM BD2802GU is a RGB LED controller attached to i2c bus and specifically engineered for decoration purposes. This RGB controller incorporates lighting patterns and illuminates. This driver is designed to minimize power consumption, so when there is no emitting LED, it enters to reset state. And because the BD2802GU has lots of features that can't be covered by the current LED framework, it provides Advanced Configuration Function(ADF) mode, so that user applications can set registers of BD2802GU directly. Here are basic usage examples : ; to turn on LED (not blink) $ echo 1 > /sys/class/leds/led1_R/brightness ; to blink LED $ echo timer > /sys/class/leds/led1_R/trigger $ echo 1 > /sys/class/leds/led1_R/delay_on $ echo 1 > /sys/class/leds/led1_R/delay_off ; to turn off LED $ echo 0 > /sys/class/leds/led1_R/brightness [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Kim Kyuwon Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 95dc5768c9e9ce207319e17bcf7e28288c671d02 Author: Németh Márton Date: Fri Apr 3 07:42:47 2009 +0200 leds: remove experimental flag from leds-clevo-mail The leds-clevo-mail driver is in the mainline kernel since 2.6.25 and works without severe problems. Make this driver available for a larger audience. Signed-off-by: Márton Németh Signed-off-by: Richard Purdie commit 700c6ea2242cf04ba3612fa7cf74763fffcc04fd Author: Adam Nielsen Date: Wed Feb 18 08:18:04 2009 +1000 leds: Prevent multiple LED triggers with the same name Signed-off-by: Adam Nielsen Signed-off-by: Richard Purdie commit 17354bfe85275f1bdde7f4a27ebc1ba53e053939 Author: Felipe Balbi Date: Tue Feb 17 13:18:11 2009 +0200 leds: Add gpio-led trigger The gpio led trigger will allow leds to be triggered by gpio events. When we give the led a gpio number, the trigger will request_irq() on that so we don't have to keep polling for gpio state. It's useful for usecases as n810's keypad leds that could be triggered by the gpio event generated when user slides up to show the keypad. We also provide means for userland to tell us what is the desired brightness for that special led when it goes on so userland could use information from ambient light sensors and not set led brightness too high if it's not necessary. Signed-off-by: Felipe Balbi Signed-off-by: Richard Purdie commit ac67e23bed58a0e34a8cb9ecd1de6c78569f8ef2 Author: Phil Sutter Date: Thu Jan 22 19:35:48 2009 +0100 leds: Add rb532 LED driver for the User LED Mikrotik built six LEDs into the Routerboard 532, from which one is destined for custom use, the so called "User LED". This patch adds a driver for it, based on the LEDs class. Signed-off-by: Phil Sutter Acked-by: Florian Fainelli Signed-off-by: Richard Purdie commit defb512d2576992c63ba1c18c24eea31cfeaa26e Author: Richard Purdie Date: Tue Feb 17 15:04:07 2009 +0000 leds: Add suspend/resume state flags to leds-gpio Add an option to preserve LED state when suspending/resuming to the LED gpio driver. Based on a suggestion from Robert Jarzmik. Tested-by: Robert Jarzmik Signed-off-by: Richard Purdie commit 41c42ff5dbe29b7b826e6736f960959c76e7acf0 Author: Luotao Fu Date: Wed Feb 11 13:24:40 2009 -0800 leds: simple driver for pwm driven LEDs Add a simple driver for pwm driver LEDs. pwm_id and period can be defined in board file. It is developed for pxa, however it is probably generic enough to be used on other platforms with pwm. Signed-off-by: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit b2bdc3e7130001804f27e7c1254930143119f435 Author: Richard Purdie Date: Mon Feb 2 23:04:42 2009 +0000 leds: Fix leds-gpio driver multiple module_init/exit usage You can't have multiple module_init()/module_exit calls so resort to messy ifdefs potentially pending some code refactoring. Signed-off-by: Richard Purdie commit ac2dd0f110d5ab0359de7786e88e9971954ac7ee Author: Guennadi Liakhovetski Date: Sat Jan 10 18:58:28 2009 +0000 leds: Add dac124s085 driver Add an LED driver using the DAC124S085 DAC from NatSemi [randy.dunlap@oracle.com: use header files for interfaces] Signed-off-by: Guennadi Liakhovetski Signed-off-by: Randy Dunlap Signed-off-by: Richard Purdie commit 1bd465e6b0e2b559db47420fea686507a01cfab0 Author: Guennadi Liakhovetski Date: Sat Jan 10 18:54:39 2009 +0000 leds: allow led-drivers to use a variable range of brightness values This patch allows drivers to override the default maximum brightness value of 255. We take care to preserve backwards-compatibility as much as possible, so that user-space ABI doesn't change for existing drivers. LED trigger code has also been updated to use the per-LED maximum. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Richard Purdie commit a7d878af94b223013a48078e0c8c0a654c24a057 Author: Trent Piepho Date: Sat Jan 10 17:26:01 2009 +0000 leds: Add openfirmware platform device support Add bindings to support LEDs defined as of_platform devices in addition to the existing bindings for platform devices. New options in Kconfig allow the platform binding code and/or the of_platform code to be turned on. The of_platform code is of course only available on archs that have OF support. The existing probe and remove methods are refactored to use new functions create_gpio_led(), to create and register one led, and delete_gpio_led(), to unregister and free one led. The new probe and remove methods for the of_platform driver can then share most of the common probe and remove code with the platform driver. The suspend and resume methods aren't shared, but they are very short. The actual led driving code is the same for LEDs created by either binding. The OF bindings are based on patch by Anton Vorontsov . They have been extended to allow multiple LEDs per device. Signed-off-by: Trent Piepho Acked-by: Grant Likely Acked-by: Sean MacLennan Signed-off-by: Richard Purdie commit 1aa2a7cc6fd7b5c86681a6ae9dfd1072c261a435 Author: Jens Axboe Date: Mon Apr 6 14:48:08 2009 +0200 block: switch sync_dirty_buffer() over to WRITE_SYNC We should now have the logic in place to handle this properly without regressing on the write performance, so re-enable the sync writes. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit aeb6fafb8fa53266d70ca7474fcda2bdaf96524a Author: Jens Axboe Date: Mon Apr 6 14:48:07 2009 +0200 block: Add flag for telling the IO schedulers NOT to anticipate more IO By default, CFQ will anticipate more IO from a given io context if the previously completed IO was sync. This used to be fine, since the only sync IO was reads and O_DIRECT writes. But with more "normal" sync writes being used now, we don't want to anticipate for those. Add a bio/request flag that informs the IO scheduler that this is a sync request that we should not idle for. Introduce WRITE_ODIRECT specifically for O_DIRECT writes, and make sure that the other sync writes set this flag. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 644b2d99b7a8677a56909a7b1fde31677eba4471 Author: Jens Axboe Date: Mon Apr 6 14:48:06 2009 +0200 block: enabling plugging on SSD devices that don't do queuing For the older SSD devices that don't do command queuing, we do want to enable plugging to get better merging. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 4194b1eaf18ddc3eee9597e8800b6d2ffdfd3614 Author: Jens Axboe Date: Mon Apr 6 14:48:05 2009 +0200 jbd2: use WRITE_SYNC_PLUG instead of WRITE_SYNC When you are going to be submitting several sync writes, we want to give the IO scheduler a chance to merge some of them. Instead of using the implicitly unplugging WRITE_SYNC variant, use WRITE_SYNC_PLUG and rely on sync_buffer() doing the unplug when someone does a wait_on_buffer()/lock_buffer(). Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 6c4bac6b3351fd278dc3537dae42f88f733ff12e Author: Jens Axboe Date: Mon Apr 6 14:48:04 2009 +0200 jbd: use WRITE_SYNC_PLUG instead of WRITE_SYNC When you are going to be submitting several sync writes, we want to give the IO scheduler a chance to merge some of them. Instead of using the implicitly unplugging WRITE_SYNC variant, use WRITE_SYNC_PLUG and rely on sync_buffer() doing the unplug when someone does a wait_on_buffer()/lock_buffer(). Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 9cf6b720f84d6999ff9a514d0a939dd183846aaf Author: Jens Axboe Date: Mon Apr 6 14:48:03 2009 +0200 block: fsync_buffers_list() should use SWRITE_SYNC_PLUG Then it can submit all the buffers without unplugging for each one. We will kick off the pending IO if we come across a new address space. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit a1f242524c3c1f5d40f1c9c343427e34d1aadd6e Author: Jens Axboe Date: Mon Apr 6 14:48:02 2009 +0200 Add WRITE_SYNC_PLUG and SWRITE_SYNC_PLUG (S)WRITE_SYNC always unplugs the device right after IO submission. Sometimes we want to build up a queue before doing so, so add variants that explicitly DON'T unplug the queue. The caller must then do that after submitting all the IO. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 1faa16d22877f4839bd433547d770c676d1d964c Author: Jens Axboe Date: Mon Apr 6 14:48:01 2009 +0200 block: change the request allocation/congestion logic to be sync/async based This makes sure that we never wait on async IO for sync requests, instead of doing the split on writes vs reads. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 30bbf1406714cf464c56e96e4ad6a291907f5023 Author: Kay Sievers Date: Tue Mar 24 17:26:10 2009 -0700 [MTD] struct device - replace bus_id with dev_name(), dev_set_name() Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers Signed-off-by: David Woodhouse commit 504a3e72208fc6a65924426ff5693982590bccdc Author: Darius Augulis Date: Wed Mar 25 11:23:51 2009 +0200 [MTD] [NOR] Fixup for Numonyx M29W128 chips Prevent NUMONYX M29W128G memories from using write buffer, because it doesn't work properly. Signed-off-by: Darius Augulis Signed-off-by: David Woodhouse commit d8877f191e35718ba11a4d46950131e74c40566c Author: Yauhen Kharuzhy Date: Fri Mar 27 00:41:09 2009 +0200 [MTD] mtdpart: Make ecc_stats more realistic. In the existing implementation, ecc_stats fields are incremented only by one, regardless of master mtd errors number. For example, if there are N errors were corrected by ECC, partition ecc_stats.corrected will be incremented by one. This commit changes simple increment to sum of old value and parent mtd error count. Signed-off-by: Yauhen Kharuzhy Signed-off-by: David Woodhouse commit 7995c7e94ff4db2ddb865ab42cc5a2e6abbbd71a Author: Wolfgang Grandegger Date: Mon Mar 30 12:02:45 2009 +0200 powerpc/85xx: TQM8548: Update DTS file for multi-chip support This patch adds multi-chip support for the Micron MT29F8G08FAB NAND flash memory on the TQM8548 modules. Signed-off-by: Wolfgang Grandegger Signed-off-by: David Woodhouse commit 21e9d9456f6022caa80fcd9057035af82091f58f Author: Wolfgang Grandegger Date: Mon Mar 30 12:02:44 2009 +0200 powerpc: NAND: FSL UPM: document new bindings This patch adds documentation for the new NAND FSL UPM bindings for: NAND: FSL-UPM: add multi chip support NAND: FSL-UPM: Add wait flags to support board/chip specific delays It also documents the old binding for "chip-delay". Signed-off-by: Wolfgang Grandegger Acked-by: Anton Vorontsov Signed-off-by: David Woodhouse commit ade92a636f15d7e5b92e2df22e8fcb6c7640cd4f Author: Wolfgang Grandegger Date: Mon Mar 30 12:02:43 2009 +0200 [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays The NAND flash on the TQM8548_BE modules requires a short delay after running the UPM pattern. The TQM8548_BE requires a further short delay after writing out a buffer. Normally the R/B pin should be checked, but it's not connected on the TQM8548_BE. The existing driver uses similar fixed delay points. To manage these extra delays in a more general way, I introduced the "fsl,ump-wait-flags" property allowing the board- specific driver to specify various types of extra delay. Signed-off-by: Wolfgang Grandegger Acked-by: Anton Vorontsov Signed-off-by: David Woodhouse commit b6e0e8c07754c8aefd6ff3536463fed5f71405a0 Author: Wolfgang Grandegger Date: Mon Mar 30 12:02:42 2009 +0200 [MTD] [NAND] FSL-UPM: add multi chip support This patch adds support for multi-chip NAND devices to the FSL-UPM driver. This requires support for multiple GPIOs for the RNB pins. The NAND chips are selected through address lines defined by the FDT property "fsl,upm-addr-line-cs-offsets". Signed-off-by: Wolfgang Grandegger Acked-by: Anton Vorontsov Signed-off-by: David Woodhouse commit db99a5523175ba15fef4719c722cea11b94911bb Author: David Woodhouse Date: Mon Apr 6 07:15:42 2009 -0700 [MTD] [NOR] Add device parent info to physmap_of Signed-off-by: David Woodhouse commit 1b578193af3b94c3d55d9aaf6b53275b1cb59a41 Author: Wolfgang Grandegger Date: Wed Mar 25 11:48:38 2009 +0100 [MTD] [NAND] Add support for NAND on the Socrates board Signed-off-by: Ilya Yanok Acked-by: Wolfgang Grandegger Signed-off-by: David Woodhouse commit f379188958ae8af30105eb1f27d0e0abf6a51558 Author: Anton Vorontsov Date: Sat Apr 4 22:31:20 2009 +0400 fsl-diu-fb: Pass the proper device for dma mapping routines The driver should pass a device that specifies internal DMA ops, but currently NULL pointers are passed, and thus following bug pops up: Freescale DIU driver ------------[ cut here ]------------ kernel BUG at arch/powerpc/include/asm/dma-mapping.h:237! Oops: Exception in kernel mode, sig: 5 [#1] ... NIP [c01658b4] allocate_buf+0x0/0x8 LR [c0306554] fsl_diu_probe+0x2b4/0x518 Call Trace: [df02be10] [c030638c] fsl_diu_probe+0xec/0x518 (unreliable) [df02be60] [c020cdec] of_platform_device_probe+0x5c/0x84 [df02be80] [c018f5d0] really_probe+0x78/0x1a0 [df02bea0] [c018f7c0] __driver_attach+0xa4/0xa8 [df02bec0] [c018ea00] bus_for_each_dev+0x60/0x9c [df02bef0] [c018f414] driver_attach+0x24/0x34 [df02bf00] [c018f168] bus_add_driver+0x12c/0x1cc [df02bf20] [c018fbdc] driver_register+0x6c/0x110 [df02bf30] [c020ccb4] of_register_driver+0x54/0x70 [df02bf40] [c03d0a50] fsl_diu_init+0x70/0xa4 ... This patch fixes the issue. Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit 65cc0fa3bde00e81f83348ef162a83ab9fff2079 Author: Scott Wood Date: Fri Apr 3 15:58:46 2009 -0500 powerpc/pq2fads: Update device tree for use with device-tree-aware u-boot. Add aliases, and correct CS0 offset to match how u-boot programs it (this was not a problem with cuImage because the wrapper would reprogram the localbus to match the device tree). Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit 4d8107f474029167ae69862bf6b2c7273be757c7 Author: Scott Wood Date: Fri Apr 3 16:15:49 2009 -0500 cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console. Previously, if udbg was using the CPM uart, and the normal CPM uart driver was enabled, but the console was directed elsewhere, udbg would not be stopped prior to initialization. This resulted in udbg hanging forever waiting for the CPM to process a descriptor. Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit bd86ef378412fc30282daf722a833f734e4e2236 Author: Scott Wood Date: Fri Apr 3 15:48:44 2009 -0500 cpm_uart: Initialize port.dev before it's used. Previously, this caused NULL to sometimes be passed as a device to the DMA code. With recent DMA changes, that now causes a BUG(). Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit d91e4ea7047d96733d763f1626f1f21ff4298cef Author: Kumar Gala Date: Wed Jan 7 15:53:29 2009 -0600 powerpc: Add support for CoreInt delivery of interrupts on MPIC CoreInt provides a mechansim to deliver the IRQ vector directly into the core on an interrupt (via the SPR EPR) rather than having to go IACK on the PIC. This is suppose to provide an improvment in interrupt latency by reducing the time to get the IRQ vector. Signed-off-by: Kumar Gala commit 81ec5364a58c0545b694dee02fe65b9ae48f37b6 Author: Thomas Gleixner Date: Wed Dec 12 17:27:03 2007 +0100 [MTD] [NAND] Add support for 4KiB pages. Signed-off-by: Thomas Gleixner Signed-off-by: Sebastian Siewior Signed-off-by: David Woodhouse commit 09318c47b6121c8d18cee50ca7e270a8b7dfd274 Author: Dan Carpenter Date: Mon Apr 6 03:50:46 2009 +0200 ASoC: Fix null dereference in ak4535_remove() ak4535_remove() from sound/soc/codecs/ak4535.c calls i2c_unregister_device() with a possibly null pointer. This bug was found by smatch (http://repo.or.cz/w/smatch.git/). Signed-off-by: Dan Carpenter Signed-off-by: Mark Brown commit 303a0e11d0ee136ad8f53f747f3c377daece763b Author: NeilBrown Date: Mon Apr 6 14:40:38 2009 +1000 md/raid1 - don't assume newly allocated bvecs are initialised. Since commit d3f761104b097738932afcc310fbbbbfb007ef92 newly allocated bvecs aren't initialised to NULL, so we have to be more careful about freeing a bio which only managed to get a few pages allocated to it. Otherwise the resync process crashes. This patch is appropriate for 2.6.29-stable. Cc: stable@kernel.org Cc: "Jens Axboe" Reported-by: Gabriele Tozzi Signed-off-by: NeilBrown commit 5f9c510e9e18cd029e15190d35dd4271f2ef393b Merge: c707e95 fa075ed Author: Takashi Iwai Date: Mon Apr 6 04:00:20 2009 +0200 Merge branch 'topic/atmel' into for-linus commit c707e950015750c48fdc82c2746415213c0c534d Merge: 8ac65de 7d2ac10 Author: Takashi Iwai Date: Mon Apr 6 04:00:15 2009 +0200 Merge branch 'topic/misc' into for-linus commit 8ac65de6474e72f1cfc130e3cc1a4bfd5cf8e310 Merge: 0855250 f3cd3f5 Author: Takashi Iwai Date: Mon Apr 6 04:00:12 2009 +0200 Merge branch 'topic/hda' into for-linus commit f3cd3f5d341dc5218d0138a67945182e83174af9 Author: Wu Fengguang Date: Thu Apr 2 19:44:18 2009 +0800 ALSA: hda - enable SPDIF output for Intel DX58SO board ALC889 has two SPDIF outputs: 0x06, 0x10. Board vendors can use either or both. DX58SO uses 0x10, but the driver assumes 0x06. The safe solution is to add 0x10 as slave output to the existing 0x06. Reported-by: Jeroen Van Breedam Tested-by: Jeroen Van Breedam Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit fa075ed2dc80440bf3e9092d38a66c3227b174c1 Author: Hans-Christian Egtvedt Date: Thu Apr 2 13:42:26 2009 +0200 ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4 This patch increases periods_min to 6 from 4, this will remove any hickups where the buffer is not filled fast enough from user space. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit 60a56cce7acb6c66fc6c4fdfef0049e73cfdc8be Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:18 2009 +0200 ALSA: snd-atmel-abdac: replace bus_id with dev_name() This patch replaces the references to bus_id to the new dev_name() API. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit 23572856e0363a1d4dcf896f59860f86809da7fc Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:17 2009 +0200 ALSA: snd-atmel-ac97c: replace bus_id with dev_name() This patch replaces the references to bus_id to the new dev_name() API. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit bd74a1843e06eef47bdb17452ed363255eb1d6e3 Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:16 2009 +0200 ALSA: snd-atmel-ac97c: cleanup registers when removing driver This patch will set the channel A and control channel mode register to zero before disabling the AC97C peripheral. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit 81baf3a7f686c5d22359cb06fc11d20907ba12f8 Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:15 2009 +0200 ALSA: snd-atmel-ac97c: do a proper reset of the external codec This patch will enable the AC97C before resetting the external codec, leaving the AC97C disabled will result in floating I/O lines that can affect the reset procedure. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit df163587eab15a24cc34cf8434a5657416f8a203 Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:14 2009 +0200 ALSA: snd-atmel-ac97c: enable interrupts to catch events for error reporting This patch will enable interrupts from AC97C and report about error conditions that occurs. On channel A both overrun and underrun will be enabled depending if playback and/or capture are enabled. On the control channel the overrun interrupt is enabled. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit c42eec0f193ed408118e20d85ea8c2e69c529993 Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:13 2009 +0200 ALSA: snd-atmel-ac97c: set correct size for buffer hardware parameter This patch will set a proper maximum bytes for the buffer, which is: channels * bytes per sample * maximum periods * maximum bytes per period. It also sets the minimum periods to 6, a value chosen from testing, with a minimum of 6 periods the system has good time to fill in new audio data without skipping. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit 128ed6a9266daac5d7b0e082339742e16caf7caa Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:12 2009 +0200 ALSA: snd-atmel-ac97c: do not overwrite OCA and ICA when assigning channels This patch will take care not to overwrite OCA and ICA registers when assigning input and output channels. It will also make sure the registers are at a known state when enabling a channel and clean up properly in case of an error. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit d54bb9f0c57e39a9a7c8ba523f2c0c1a955d8efb Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:11 2009 +0200 ALSA: snd-atmel-ac97c: remove dead break statements after return in switch case Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit 8321fc0113a1be0cdfc9cbad1db1de74073acd8f Author: Hans-Christian Egtvedt Date: Thu Apr 2 08:21:10 2009 +0200 ALSA: snd-atmel-ac97c: cleanup register definitions This patch will remove traces of channel B registers, since they are not used by the AC97C driver. Channel B might be used for other purposes. The driver also adds channel status bits TXEMPTY and OVRUN and a AC97C_CH_MASK macro to ease clearing a channel settings. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Takashi Iwai commit ff2e7337b5b087620bdea9477f779413a7f096cb Author: Matthew Ranostay Date: Wed Apr 1 14:49:48 2009 -0400 ALSA: Add 92HD81B1C device id Added device id in struct for codec 92HD81B1C (0x111d76d5). Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit 7d2ac1036b7ff57f73ab64fd897867ddc07bcffe Author: Uwe Kleine-König Date: Sat Mar 28 00:27:10 2009 +0100 ALSA: move snd_powermac's probe function to .devinit.text A pointer to snd_pmac_probe is passed to the core via platform_driver_register and so the function must not disappear when the .init sections are discarded. Otherwise (when having HOTPLUG=y) unbinding and binding a device to the driver via sysfs will result in an oops as does a device being registered late. An alternative to this patch is using platform_driver_probe instead of platform_driver_register plus removing the pointer to the probe function from the struct platform_driver. Signed-off-by: Uwe Kleine-König Cc: Jaroslav Kysela Cc: Johannes Berg Cc: Rene Herman Cc: Andrew Morton Signed-off-by: Takashi Iwai commit 0855250e218eba2eab574959058432beedf0ea5f Merge: b114701 1661c61 Author: Takashi Iwai Date: Mon Apr 6 03:47:27 2009 +0200 Merge branch 'topic/isa-misc' into for-linus commit b114701c0e8d580a05643c874d87e2501ab729cb Merge: 0221c81 103f211 Author: Takashi Iwai Date: Mon Apr 6 03:47:20 2009 +0200 Merge branch 'topic/asoc' into for-linus commit 1661c6155589f8faa1338f3cda696ea3f4cb2da1 Author: Krzysztof Helt Date: Tue Mar 24 22:37:14 2009 +0100 ALSA: opl3sa2: add ZV port control Add ZV port control switch. This patch is done after solution given in the ALSA bug #2872 report. The patch resolves the issue. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 Merge: de18836 0221c81 Author: Ingo Molnar Date: Mon Apr 6 01:41:22 2009 +0200 Merge branch 'linus' into irq/threaded Conflicts: include/linux/irq.h kernel/irq/handle.c commit 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c Merge: 48f286a def5754 Author: Linus Torvalds Date: Sun Apr 5 12:36:11 2009 -0700 Merge branch 'audit.b62' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b62' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: Audit: remove spaces from audit_log_d_path audit: audit_set_auditable defined but not used audit: incorrect ref counting in audit tree tag_chunk audit: Fix possible return value truncation in audit_get_context() audit: ignore terminating NUL in AUDIT_USER_TTY messages Audit: fix handling of 'strings' with NULL characters make the e->rule.xxx shorter in kernel auditfilter.c auditsc: fix kernel-doc notation audit: EXECVE record - removed bogus newline commit 48f286a28fe13fcbc510720fcffb872a184b51dd Merge: ea43179 fa15ce8 Author: Linus Torvalds Date: Sun Apr 5 11:38:37 2009 -0700 Merge branch 'for-next' of git://git.o-hand.com/linux-mfd * 'for-next' of git://git.o-hand.com/linux-mfd: mfd: fix da903x warning mfd: fix MAINTAINERS entry mfd: Use the value of the final spin when reading the AUXADC mfd: Storage class should be before const qualifier mfd: PASIC3: supply clock_rate to DS1WM via driver_data mfd: remove DS1WM clock handling mfd: remove unused PASIC3 bus_shift field pxa/magician: remove deprecated .bus_shift from PASIC3 platform_data mfd: convert PASIC3 to use MFD core mfd: convert DS1WM to use MFD core mfd: Support active high IRQs on WM835x mfd: Use bulk read to fill WM8350 register cache mfd: remove duplicated #include from pcf50633 commit ea431793f198e26d1553f36ed8b5a830b531eee4 Merge: 32fb6c1 276e79e Author: Linus Torvalds Date: Sun Apr 5 11:36:31 2009 -0700 Merge branch 'for-linus' of git://repo.or.cz/cris-mirror * 'for-linus' of git://repo.or.cz/cris-mirror: CRISv32: Remove extraneous space between -I and the path. cris: convert obsolete hw_interrupt_type to struct irq_chip BUG to BUG_ON changes cpumask: use mm_cpumask() wrapper: cris cpumask: Use accessors code.: cris cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: cris commit 32fb6c17566ec66de87324a834c7776f40e35e78 Merge: 45e36c1 7ec0a72 Author: Linus Torvalds Date: Sun Apr 5 11:16:25 2009 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (140 commits) ACPI: processor: use .notify method instead of installing handler directly ACPI: button: use .notify method instead of installing handler directly ACPI: support acpi_device_ops .notify methods toshiba-acpi: remove MAINTAINERS entry ACPI: battery: asynchronous init acer-wmi: Update copyright notice & documentation acer-wmi: Cleanup the failure cleanup handling acer-wmi: Blacklist Acer Aspire One video: build fix thinkpad-acpi: rework brightness support thinkpad-acpi: enhanced debugging messages for the fan subdriver thinkpad-acpi: enhanced debugging messages for the hotkey subdriver thinkpad-acpi: enhanced debugging messages for rfkill subdrivers thinkpad-acpi: restrict access to some firmware LEDs thinkpad-acpi: remove HKEY disable functionality thinkpad-acpi: add new debug helpers and warn of deprecated atts thinkpad-acpi: add missing log levels thinkpad-acpi: cleanup debug helpers thinkpad-acpi: documentation cleanup thinkpad-acpi: drop ibm-acpi alias ... commit 45e36c1666aa6c8b0c538abcf984b336184d8c3f Merge: 87fc94d 68b42d1 Author: Linus Torvalds Date: Sun Apr 5 11:15:54 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits) sh: sh7785lcr: Map whole PCI address space. sh: Fix up DSP context save/restore. sh: Fix up number of on-chip DMA channels on SH7091. sh: update defconfigs. sh: Kill off broken direct-mapped cache mode. sh: Wire up ARCH_HAS_DEFAULT_IDLE for cpuidle. sh: Add a command line option for disabling I/O trapping. sh: Select ARCH_HIBERNATION_POSSIBLE. sh: migor: Fix up CEU use flags. input: migor_ts: add wakeup support rtc: rtc-sh: use set_irq_wake() input: sh_keysc: use enable/disable_irq_wake() sh: intc: set_irq_wake() support sh: intc: install enable, disable and shutdown callbacks clocksource: sh_cmt: use remove_irq() and remove clockevent workaround sh: ap325 and Migo-R use new sh_mobile_ceu_info flags sh: Fix up -Wformat-security whining. sh: ap325rxa: Add ov772x support, again. sh: Sanitize asm/mmu.h for assembly use. sh: Tidy up sh7786 pinmux table. ... commit 87fc94d54b639d8c39fc4a11db0e142f84096e13 Merge: 3516c6a 8e706c4 Author: Linus Torvalds Date: Sun Apr 5 11:15:28 2009 -0700 Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 * 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: add hardware handshake support to atmel_serial avr32: add RTS/CTS/CLK pin selection for the USARTs Add RTC support for Merisc boards avr32: at32ap700x: setup DMA for AC97C in the machine code avr32: at32ap700x: setup DMA for ABDAC in the machine code Add Merisc board support avr32: use gpio_is_valid() to check USBA vbus_pin I/O line atmel-usba-udc: use gpio_is_valid() to check vbus_pin I/O line avr32: fix timing LCD parameters for EVKLCD10X boards avr32: use GPIO line PB15 on EVKLCD10x boards for backlight avr32: configure MCI detect and write protect pins for EVKLCD10x boards avr32: set pin mask to alternative 18 bpp for EVKLCD10x boards avr32: add pin mask for 18-bit color on the LCD controller avr32: fix 15-bit LCDC pin mask to use MSB lines commit 3516c6a8dc0b1153c611c4cf0dc4a51631f052bb Merge: 714f83d ba0e1eb Author: Linus Torvalds Date: Sun Apr 5 11:06:45 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits) Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers Staging: serqt_usb: fix build due to proc tty changes Staging: serqt_usb: fix checkpatch errors Staging: serqt_usb: add TODO file Staging: serqt_usb: Lindent the code Staging: add USB serial Quatech driver staging: document that the wifi staging drivers a bit better Staging: echo cleanup Staging: BUG to BUG_ON changes Staging: remove some pointless conditionals before kfree_skb() Staging: line6: fix build error, select SND_RAWMIDI Staging: line6: fix checkpatch errors in variax.c Staging: line6: fix checkpatch errors in toneport.c Staging: line6: fix checkpatch errors in pcm.c Staging: line6: fix checkpatch errors in midibuf.c Staging: line6: fix checkpatch errors in midi.c Staging: line6: fix checkpatch errors in dumprequest.c Staging: line6: fix checkpatch errors in driver.c Staging: line6: fix checkpatch errors in audio.c Staging: line6: fix checkpatch errors in pod.c ... commit 714f83d5d9f7c785f622259dad1f4fad12d64664 Merge: 8901e7f 645dae9 Author: Linus Torvalds Date: Sun Apr 5 11:04:19 2009 -0700 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits) tracing, net: fix net tree and tracing tree merge interaction tracing, powerpc: fix powerpc tree and tracing tree interaction ring-buffer: do not remove reader page from list on ring buffer free function-graph: allow unregistering twice trace: make argument 'mem' of trace_seq_putmem() const tracing: add missing 'extern' keywords to trace_output.h tracing: provide trace_seq_reserve() blktrace: print out BLK_TN_MESSAGE properly blktrace: extract duplidate code blktrace: fix memory leak when freeing struct blk_io_trace blktrace: fix blk_probes_ref chaos blktrace: make classic output more classic blktrace: fix off-by-one bug blktrace: fix the original blktrace blktrace: fix a race when creating blk_tree_root in debugfs blktrace: fix timestamp in binary output tracing, Text Edit Lock: cleanup tracing: filter fix for TRACE_EVENT_FORMAT events ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release() x86: kretprobe-booster interrupt emulation code fix ... Fix up trivial conflicts in arch/parisc/include/asm/ftrace.h include/linux/memory.h kernel/extable.c kernel/module.c commit def57543418a5f47debae28a0a9dea2effc11692 Author: Eric Paris Date: Tue Mar 10 18:00:14 2009 -0400 Audit: remove spaces from audit_log_d_path audit_log_d_path had spaces in the strings which would be emitted on the error paths. This patch simply replaces those spaces with an _ or removes the needless spaces entirely. Signed-off-by: Eric Paris Signed-off-by: Al Viro commit 679173b724631f49e537a15fa48ea2000bdc1808 Author: Eric Paris Date: Mon Jan 26 18:09:45 2009 -0500 audit: audit_set_auditable defined but not used after 0590b9335a1c72a3f0defcc6231287f7817e07c8 audit_set_auditable() is now only used by the audit tree code. If CONFIG_AUDIT_TREE is unset it will be defined but unused. This patch simply moves the function inside a CONFIG_AUDIT_TREE block. cc1: warnings being treated as errors /home/acme_unencrypted/git/linux-2.6-tip/kernel/auditsc.c:745: error: ‘audit_set_auditable’ defined but not used make[2]: *** [kernel/auditsc.o] Error 1 make[1]: *** [kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... Signed-off-by: Eric Paris Signed-off-by: Al Viro commit 318b6d3d7ddbcad3d6867e630711b8a705d873d7 Author: Eric Paris Date: Tue Jan 13 17:32:40 2009 -0500 audit: incorrect ref counting in audit tree tag_chunk tag_chunk has bad exit paths in which the inotify ref counting is wrong. At the top of the function we found &old_watch using inotify_find_watch(). inotify_find_watch takes a reference to the watch. This is never dropped on an error path. Signed-off-by: Eric Paris Signed-off-by: Al Viro commit 6d208da89aabee8502debe842832ca0ab298d16d Author: Paul Moore Date: Wed Apr 1 15:47:27 2009 -0400 audit: Fix possible return value truncation in audit_get_context() The audit subsystem treats syscall return codes as type long, unfortunately the audit_get_context() function mistakenly converts the return code to an int type in the parameters which could cause problems on systems where the sizeof(int) != sizeof(long). Signed-off-by: Paul Moore Signed-off-by: Al Viro commit 55ad2f8d340678397de5916b9cd960f17ebd7150 Author: Miloslav Trmac Date: Thu Mar 19 09:52:47 2009 -0400 audit: ignore terminating NUL in AUDIT_USER_TTY messages AUDIT_USER_TTY, like all other messages sent from user-space, is sent NUL-terminated. Unlike other user-space audit messages, which come only from trusted sources, AUDIT_USER_TTY messages are processed using audit_log_n_untrustedstring(). This patch modifies AUDIT_USER_TTY handling to ignore the trailing NUL and use the "quoted_string" representation of the message if possible. Signed-off-by: Miloslav Trmac Cc: Eric Paris Cc: Al Viro Cc: Steve Grubb Signed-off-by: Andrew Morton Signed-off-by: Al Viro commit b3897f567100d18e0597f638b911d23aa5e0dd23 Author: Miloslav Trmac Date: Thu Mar 19 09:48:27 2009 -0400 Audit: fix handling of 'strings' with NULL characters currently audit_log_n_untrustedstring() uses audit_string_contains_control() to check if the 'string' has any control characters. If the 'string' has an embedded NULL audit_string_contains_control() will return that the data has no control characters and will then pass the string to audit_log_n_string with the total length, not the length up to the first NULL. audit_log_n_string() does a memcpy of the entire length and so the actual audit record emitted may then contain a NULL and then whatever random memory is after the NULL. Since we want to log the entire octet stream (if we can't trust the data to be a string we can't trust that a NULL isn't actually a part of it) we should just consider NULL as a control character. If the caller is certain they want to stop at the first NULL they should be using audit_log_untrustedstring. Signed-off-by: Eric Paris Signed-off-by: Al Viro commit c28bb7da74ab74a2860d652493aaff7de104d79e Author: Zhenwen Xu Date: Thu Mar 12 22:16:12 2009 +0800 make the e->rule.xxx shorter in kernel auditfilter.c make the e->rule.xxx shorter in kernel/auditfilter.c -- --------------------------------- Zhenwen Xu - Open and Free Home Page: http://zhwen.org My Studio: http://dim4.cn >From 99692dc640b278f1cb1a15646ce42f22e89c0f77 Mon Sep 17 00:00:00 2001 From: Zhenwen Xu Date: Thu, 12 Mar 2009 22:04:59 +0800 Subject: [PATCH] make the e->rule.xxx shorter in kernel/auditfilter.c Signed-off-by: Zhenwen Xu Signed-off-by: Al Viro commit 6b96255998053a89f45c0855de954b71f5c3887b Author: Randy Dunlap Date: Mon Jan 5 13:41:13 2009 -0800 auditsc: fix kernel-doc notation Fix auditsc kernel-doc notation: Warning(linux-2.6.28-git7//kernel/auditsc.c:2156): No description found for parameter 'attr' Warning(linux-2.6.28-git7//kernel/auditsc.c:2156): Excess function parameter 'u_attr' description in '__audit_mq_open' Warning(linux-2.6.28-git7//kernel/auditsc.c:2204): No description found for parameter 'notification' Warning(linux-2.6.28-git7//kernel/auditsc.c:2204): Excess function parameter 'u_notification' description in '__audit_mq_notify' Signed-off-by: Randy Dunlap cc: Al Viro cc: Eric Paris Signed-off-by: Al Viro commit ca96a895a6bae7efe7b11a35d9f43e6228467562 Author: Jiri Pirko Date: Fri Jan 9 16:44:16 2009 +0100 audit: EXECVE record - removed bogus newline (updated) Added hunk that changes the comment, the rest is the same. EXECVE records contain a newline after every argument. auditd converts "\n" to " " so you cannot see newlines even in raw logs, but they're there nevertheless. If you're not using auditd, you need to work round them. These '\n' chars are can be easily replaced by spaces when creating record in kernel. Note there is no need for trailing '\n' in an audit record. record before this patch: "type=EXECVE msg=audit(1231421801.566:31): argc=4 a0=\"./test\"\na1=\"a\"\na2=\"b\"\na3=\"c\"\n" record after this patch: "type=EXECVE msg=audit(1231421801.566:31): argc=4 a0=\"./test\" a1=\"a\" a2=\"b\" a3=\"c\"" Signed-off-by: Jiri Pirko Acked-by: Eric Paris Signed-off-by: Al Viro commit 8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc Merge: 90975ef 1359096 Author: Linus Torvalds Date: Sun Apr 5 10:35:44 2009 -0700 Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip * 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip: bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE commit 90975ef71246c5c688ead04e8ff6f36dc92d28b3 Merge: cab4e4c 558f6ab Author: Linus Torvalds Date: Sun Apr 5 10:33:07 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask: (36 commits) cpumask: remove cpumask allocation from idle_balance, fix numa, cpumask: move numa_node_id default implementation to topology.h, fix cpumask: remove cpumask allocation from idle_balance x86: cpumask: x86 mmio-mod.c use cpumask_var_t for downed_cpus x86: cpumask: update 32-bit APM not to mug current->cpus_allowed x86: microcode: cleanup x86: cpumask: use work_on_cpu in arch/x86/kernel/microcode_core.c cpumask: fix CONFIG_CPUMASK_OFFSTACK=y cpu hotunplug crash numa, cpumask: move numa_node_id default implementation to topology.h cpumask: convert node_to_cpumask_map[] to cpumask_var_t cpumask: remove x86 cpumask_t uses. cpumask: use cpumask_var_t in uv_flush_tlb_others. cpumask: remove cpumask_t assignment from vector_allocation_domain() cpumask: make Xen use the new operators. cpumask: clean up summit's send_IPI functions cpumask: use new cpumask functions throughout x86 x86: unify cpu_callin_mask/cpu_callout_mask/cpu_initialized_mask/cpu_sibling_setup_mask cpumask: convert struct cpuinfo_x86's llc_shared_map to cpumask_var_t cpumask: convert node_to_cpumask_map[] to cpumask_var_t x86: unify 32 and 64-bit node_to_cpumask_map ... commit cab4e4c43f92582a2bfc026137b3d8a175bd0360 Merge: 5412b53 4950267 Author: Linus Torvalds Date: Sun Apr 5 10:30:21 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param: module: use strstarts() strstarts: helper function for !strncmp(str, prefix, strlen(prefix)) arm: allow usage of string functions in linux/string.h module: don't use stop_machine on module load module: create a request_module_nowait() module: include other structures in module version check module: remove the SHF_ALLOC flag on the __versions section. module: clarify the force-loading taint message. module: Export symbols needed for Ksplice Ksplice: Add functions for walking kallsyms symbols module: remove module_text_address() module: __module_address module: Make find_symbol return a struct kernel_symbol kernel/module.c: fix an unused goto label param: fix charp parameters set via sysfs Fix trivial conflicts in kernel/extable.c manually. commit 5412b5399e095730008a14f2107331b2123733e4 Merge: e4c393f 337fff8 Author: Linus Torvalds Date: Sun Apr 5 10:26:36 2009 -0700 Merge branch 'core/debugobjects' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core/debugobjects' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: debugobjects: delay free of internal objects debugobjects: replace static objects when slab cache becomes available debug_objects: add boot-parameter toggle to turn object debugging off again commit e4c393fd551654179c46b65e4a70ea20d831c783 Merge: 0a053e8 38a6ed3 Author: Linus Torvalds Date: Sun Apr 5 10:23:25 2009 -0700 Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: printk: correct the behavior of printk_timed_ratelimit() vsprintf: unify the format decoding layer for its 3 users, cleanup fix regression from "vsprintf: unify the format decoding layer for its 3 users" vsprintf: fix bug in negative value printing vsprintf: unify the format decoding layer for its 3 users vsprintf: add binary printf printk: introduce printk_once() Fix trivial conflicts (printk_once vs log_buf_kexec_setup() added near each other) in include/linux/kernel.h. commit 0a053e8c71d666daf30da2d407147b1293923d8b Merge: 601cc11 32ab83a Author: Linus Torvalds Date: Sun Apr 5 10:18:21 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (42 commits) atmel-mci: fix sdc_reg typo tmio_mmc: add maintainer mmc: Add OpenFirmware bindings for SDHCI driver sdhci: Add quirk for forcing maximum block size to 2048 bytes sdhci: Add quirk for controllers that need IRQ re-init after reset sdhci: Add quirk for controllers that need small delays for PIO sdhci: Add set_clock callback and a quirk for nonstandard clocks sdhci: Add get_{max,timeout}_clock callbacks sdhci: Add support for hosts reporting inverted write-protect state sdhci: Add support for card-detection polling sdhci: Enable only relevant (DMA/PIO) interrupts during transfers sdhci: Split card-detection IRQs management from sdhci_init() sdhci: Add support for bus-specific IO memory accessors mmc_spi: adjust for delayed data token response omap_hsmmc: Wait for SDBP omap_hsmmc: Fix MMC3 dma omap_hsmmc: Disable SDBP at suspend omap_hsmmc: Do not prefix slot name omap_hsmmc: Allow cover switch to cause rescan omap_hsmmc: Add 8-bit bus width mode support ... commit 7ec0a7290797f57b780f792d12f4bcc19c83aa4f Author: Bjorn Helgaas Date: Mon Mar 30 17:48:24 2009 +0000 ACPI: processor: use .notify method instead of installing handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Signed-off-by: Bjorn Helgaas CC: Zhang Rui CC: Zhao Yakui CC: Venki Pallipadi CC: Anil S Keshavamurthy Signed-off-by: Len Brown commit 373cfc360ec773be2f7615e59a19f3313255db7c Author: Bjorn Helgaas Date: Mon Mar 30 17:48:18 2009 +0000 ACPI: button: use .notify method instead of installing handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Note that events from fixed hardware buttons now show up as a special notify event, so to preserve user-space backward compatibility, we convert that back to ACPI_BUTTON_NOTIFY_STATUS. Signed-off-by: Bjorn Helgaas Reviewed-by: Alex Chiang CC: Alexey Starikovskiy Signed-off-by: Len Brown commit 46ec8598fde74ba59703575c22a6fb0b6b151bb6 Author: Bjorn Helgaas Date: Mon Mar 30 17:48:13 2009 +0000 ACPI: support acpi_device_ops .notify methods This patch adds support for ACPI device driver .notify() methods. If such a method is present, Linux/ACPI installs a handler for device notifications (but not for system notifications such as Bus Check, Device Check, etc). When a device notification occurs, Linux/ACPI passes it on to the driver's .notify() method. In most cases, this removes the need for drivers to install their own handlers for device-specific notifications. For fixed hardware devices like some power and sleep buttons, there's no notification value because there's no control method to execute a Notify opcode. When a fixed hardware device generates an event, we handle it the same as a regular device notification, except we send a ACPI_FIXED_HARDWARE_EVENT value. This is outside the normal 0x0-0xff range used by Notify opcodes. Several drivers install their own handlers for system Bus Check and Device Check notifications so they can support hot-plug. This patch doesn't affect that usage. Signed-off-by: Bjorn Helgaas Reviewed-by: Alex Chiang Signed-off-by: Len Brown commit 478c6a43fcbc6c11609f8cee7c7b57223907754f Merge: 8a3f257 6bb5975 Author: Len Brown Date: Sun Apr 5 02:14:15 2009 -0400 Merge branch 'linus' into release Conflicts: arch/x86/kernel/cpu/cpufreq/longhaul.c Signed-off-by: Len Brown commit 8a3f257c704e02aee9869decd069a806b45be3f1 Merge: 33526a5 1506553 Author: Len Brown Date: Sun Apr 5 01:52:07 2009 -0400 Merge branch 'misc' into release commit 33526a53600ac887d100e3c9b4be3637ac8ae3a5 Merge: 47ae106 786c221 Author: Len Brown Date: Sun Apr 5 01:51:51 2009 -0400 Merge branch 'x2apic' into release commit 47ae106d3f37e1fd715975eaf8130e20e171cf52 Merge: 2e33b23 6328a57 Author: Len Brown Date: Sun Apr 5 01:51:38 2009 -0400 Merge branch 'pnpacpi' into release commit 2e33b234abbb9a77806115d30c3084992a98973c Merge: e2fae0a 0b3f610 Author: Len Brown Date: Sun Apr 5 01:51:22 2009 -0400 Merge branch 'dell-wmi' into release commit e2fae0abf6a9c7a2da1a481b7adb4e24f7778992 Merge: fff251f c07c9a7 Author: Len Brown Date: Sun Apr 5 01:51:16 2009 -0400 Merge branch 'constify' into release commit fff251f6b26bb8f4de15fa5906cf2611623b3661 Merge: 3b4dadf a5032bf 34ff4db Author: Len Brown Date: Sun Apr 5 01:51:10 2009 -0400 Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release commit 3b4dadf05d177289c279c50030c7c75e004952bb Merge: 59b17bf 7e90560 Author: Len Brown Date: Sun Apr 5 01:50:46 2009 -0400 Merge branch 'acpi_enforce_resources' into release commit 59b17bf6ea06abed519dfc788fff1b6b9499d23f Merge: edd8469 0f66af5 Author: Len Brown Date: Sun Apr 5 01:48:46 2009 -0400 Merge branch 'async-battery' into release Conflicts: drivers/acpi/Makefile Signed-off-by: Len Brown commit edd84690d15e4cb144cc60b754d4eaf8fac0a711 Merge: 7c27fd1 ae7d515 Author: Len Brown Date: Sun Apr 5 01:45:50 2009 -0400 Merge branch 'acpi-modparam' into release Conflicts: drivers/acpi/Makefile Signed-off-by: Len Brown commit 7c27fd19b6d985957424348361afa066ff4c74d8 Merge: 336d63b 16dd55f Author: Len Brown Date: Sun Apr 5 01:42:14 2009 -0400 Merge branch 'sony-laptop' into release commit 336d63b8a3cadc1c678f4b16d6105633c7f6af75 Merge: 07290be 0e50183 Author: Len Brown Date: Sun Apr 5 01:42:09 2009 -0400 Merge branch 'thinkpad-acpi' into release commit 07290bed7968c0e08fb3efe193fb148f1fea5e08 Merge: 1264881 4f0175d Author: Len Brown Date: Sun Apr 5 01:42:03 2009 -0400 Merge branch 'acer' into release commit 12648810506eaa063dc23b66514fbb4796f34312 Merge: 7329e93 03ae61d Author: Len Brown Date: Sun Apr 5 01:40:06 2009 -0400 Merge branch 'video' into release Conflicts: drivers/acpi/video.c Signed-off-by: Len Brown commit 7329e9356e5b46e11a1781dff2dc64c2e3284884 Merge: 3266d63 e1eb477 Author: Len Brown Date: Sun Apr 5 01:39:33 2009 -0400 Merge branch 'psd' into release commit 3266d63c0684138f4900d4e5c6fbfab59e054afc Merge: 4926a23 7faa144 Author: Len Brown Date: Sun Apr 5 01:39:26 2009 -0400 Merge branch 'battery' into release commit 4926a236396ffc82be004cc89223a7f2747a44dc Merge: 4f3bff7 4c395bd Author: Len Brown Date: Sun Apr 5 01:39:20 2009 -0400 Merge branch 'hp-wmi' into release commit 4f3bff70a64b105921dac8630bc4381567b21ebd Merge: 2ddb9f1 03a971a Author: Len Brown Date: Sun Apr 5 01:39:12 2009 -0400 Merge branch 'thermal' into release commit 2ddb9f17ba026122b53b34fb4182ece91e24cf92 Merge: a3b2c5e ff69f2b Author: Len Brown Date: Sun Apr 5 01:39:07 2009 -0400 Merge branch 'pmtimer-overflow' into release commit a3b2c5e413ce500d19cb776662ae0ea405cdd994 Merge: 4938370 4658e4e Author: Len Brown Date: Sun Apr 5 01:39:00 2009 -0400 Merge branch 'dynamic-ssdt' into release commit 493837009665a5ea1d91ed5fe4bab0ed546cae86 Merge: e857b33 8308e8a Author: Len Brown Date: Sun Apr 5 01:38:51 2009 -0400 Merge branch 'driver-ops-cleanup' into release commit e857b33d1879fc4284e3151222eee2415c1de88a Merge: 9a38f4e 1c48aa3 Author: Len Brown Date: Sun Apr 5 01:38:42 2009 -0400 Merge branch 'bjorn-cleanups' into release commit 9a38f4eec57cc5104b6a85bc6d0a91b268fbe803 Merge: 67dc092 018f452 Author: Len Brown Date: Sun Apr 5 01:38:31 2009 -0400 Merge branch 'bjorn-initcall-cleanup' into release commit 15065531c1c5902775ae3ade24eb37d0e688353b Author: Johannes Berg Date: Mon Mar 30 12:02:35 2009 +0200 toshiba-acpi: remove MAINTAINERS entry "I'm not much opposed to marking this driver orphaned. I haven't used a Toshiba laptop in four years or so, and disagree with the recent additions of bluetooth and wireless control to the driver. --John" Signed-off-by: Johannes Berg Acked-by: John Belmonte Signed-off-by: Len Brown commit 57579f7629a3d46c307405fbd2ea6bdb650d692f Author: Michael Chan Date: Sat Apr 4 16:51:14 2009 -0700 bnx2: Use request_firmware() Based on original patch by Ben Hutchings and Bastian Blank , with the following main changes: Separated the mips firmware and rv2p firmware into different files to make it easier to update them separately. Added some code to fixup the rv2p code with run-time information such as PAGE_SIZE. Update version to 2.0.0. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 5d4d9e8ad6c646c4811bf0049df761dee6affc3d Author: Michael Buesch Date: Fri Apr 3 00:01:30 2009 +0000 b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}() > > ------------[ cut here ]------------ > > WARNING: at lib/dma-debug.c:539 check_sync+0xe9/0x341() (Not tainted) > > Hardware name: HP Compaq nx6110 (PY501EA#AB9) > > b44 0000:02:0e.0: DMA-API: device driver tries to sync DMA memory it has not > > allocated [device address=0x0000000075941040] [size=1566 bytes] > > Modules linked in: llc bnep l2cap bluetooth autofs4 lm90 hwmon i2c_i801 sunrpc > > ipv6 cpufreq_ondemand acpi_cpufreq uinput snd_intel8x0m snd_intel8x0 > > snd_ac97_codec snd_seq_dummy ac97_bus snd_seq_oss snd_seq_midi_event snd_seq > > snd_seq_device snd_pcm_oss snd_mixer_oss snd_pcm b44 ssb firewire_ohci > > snd_timer ipw2200 iTCO_wdt mii firewire_core snd iTCO_vendor_support libipw > > yenta_socket crc_itu_t lib80211 rsrc_nonstatic soundcore snd_page_alloc joydev > > pcspkr wmi serio_raw ata_generic pata_acpi i915 drm i2c_algo_bit i2c_core video > > output [last unloaded: scsi_wait_scan] > > Pid: 2418, comm: S58ntpd Not tainted 2.6.29-16.fc10.i686.PAE #1 > > Call Trace: > > [] warn_slowpath+0x7c/0xbd > > [] ? register_lock_class+0x17/0x290 > > [] ? mark_lock+0x1e/0x349 > > [] ? _raw_spin_unlock+0x74/0x78 > > [] ? mark_lock+0x1e/0x349 > > [] ? check_sync+0x37/0x341 > > [] check_sync+0xe9/0x341 > > [] ? _spin_unlock_irqrestore+0x45/0x55 > > [] ? trace_hardirqs_on+0xb/0xd > > [] debug_dma_sync_single_for_device+0x2f/0x39 > > [] dma_sync_single_for_device+0x4a/0x59 [b44] > > [] ssb_dma_sync_single_for_device+0x3e/0x48 [b44] > > [] b44_recycle_rx+0x18c/0x196 [b44] > > [] b44_poll+0x277/0x3c0 [b44] > > [] net_rx_action+0xa1/0x1ca > > [] __do_softirq+0x9d/0x154 > > [] do_softirq+0x52/0x7e > > [] irq_exit+0x49/0x77 > > [] do_IRQ+0x97/0xad > > [] common_interrupt+0x2c/0x34 I don't know if this is related, but the following patch seems to fix some DMA mapping bug. Can somebody comment who does understand the code better than me? (completely untested) Signed-off-by: David S. Miller commit 4e69489a0ac11a9b62a25923975bfc370a30eae5 Author: Eric Dumazet Date: Sat Apr 4 16:41:09 2009 -0700 socket: use percpu_add() while updating sockets_in_use sock_alloc() currently uses following code to update sockets_in_use get_cpu_var(sockets_in_use)++; put_cpu_var(sockets_in_use); This translates to : c0436274: b8 01 00 00 00 mov $0x1,%eax c0436279: e8 42 40 df ff call c022a2c0 c043627e: bb 20 4f 6a c0 mov $0xc06a4f20,%ebx c0436283: e8 18 ca f0 ff call c0342ca0 c0436288: 03 1c 85 60 4a 65 c0 add -0x3f9ab5a0(,%eax,4),%ebx c043628f: ff 03 incl (%ebx) c0436291: b8 01 00 00 00 mov $0x1,%eax c0436296: e8 75 3f df ff call c022a210 c043629b: 89 e0 mov %esp,%eax c043629d: 25 00 e0 ff ff and $0xffffe000,%eax c04362a2: f6 40 08 08 testb $0x8,0x8(%eax) c04362a6: 75 07 jne c04362af c04362a8: 8d 46 d8 lea -0x28(%esi),%eax c04362ab: 5b pop %ebx c04362ac: 5e pop %esi c04362ad: c9 leave c04362ae: c3 ret c04362af: e8 cc 5d 09 00 call c04cc080 c04362b4: 8d 74 26 00 lea 0x0(%esi,%eiz,1),%esi c04362b8: eb ee jmp c04362a8 While percpu_add(sockets_in_use, 1) translates to a single instruction : c0436275: 64 83 05 20 5f 6a c0 addl $0x1,%fs:0xc06a5f20 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 62994b2d6beb5f7c59a25bf77e01f191acf74ea2 Author: Alex Williamson Date: Sat Apr 4 16:40:19 2009 -0700 virtio_net: Set the mac config only when VIRITO_NET_F_MAC VIRTIO_NET_F_MAC indicates the presence of the mac field in config space, not the validity of the value it contains. Allow the mac to be changed at runtime, but only push the change into config space with the VIRTIO_NET_F_MAC feature present. Signed-off-by: Alex Williamson Acked-by: Christian Borntraeger Signed-off-by: David S. Miller commit cd36e9efaa5195396ae5344c6ce32c2b0048df6a Author: Jaswinder Singh Rajput Date: Sat Apr 4 16:38:42 2009 -0700 myri_sbus: use request_firmware Firmware blob looks like this... __be16 lanai4_data_size unsigned char lanai4_code[] Signed-off-by: Jaswinder Singh Rajput Signed-off-by: David S. Miller commit 81c522851436dbc058c9c0c11b32e60d76b180ce Author: Jesse Brandeburg Date: Sat Apr 4 16:36:53 2009 -0700 e1000: fix loss of multicast packets e1000 (and e1000e, igb, ixgbe, ixgb) all do a series of operations each time a multicast address is added. The flow goes something like 1) stack adds one multicast address 2) stack passes whole current list of unicast and multicast addresses to driver 3) driver clears entire list in hardware 4) driver programs each multicast address using iomem in a loop This was causing multicast packets to be lost during the reprogramming process. reference with test program: http://kerneltrap.org/mailarchive/linux-netdev/2009/3/14/5160514/thread Thanks to Dave Boutcher for his report and test program. This driver fix prepares an array all at once in memory and programs it in one shot to the hardware, not requiring an "erase" cycle. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2b05e0021b21e1dc484a1237b7fa674e8a3704bb Author: Alexander Beregalov Date: Sat Apr 4 16:36:18 2009 -0700 vxge: should include tcp.h Fix this build error: drivers/net/vxge/vxge-main.c: In function 'vxge_get_vpath_no': drivers/net/vxge/vxge-main.c:695: error: dereferencing pointer to incomplete type ... Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit fa15ce8ad59e9653d50b8596596cb02d3566d4aa Author: Samuel Ortiz Date: Tue Mar 31 12:27:21 2009 +0200 mfd: fix da903x warning The da903x interrupt handler is retruning an int instead of an irqreturn_t. Signed-off-by: Samuel Ortiz commit 895d9f0f15ff6b2d20bfbdc2b8205d1791437294 Author: Samuel Ortiz Date: Mon Mar 23 00:46:18 2009 +0100 mfd: fix MAINTAINERS entry The MFD git repo is living on kernel.org, and patches should be sent at sameo@linux.intel.com. Signed-off-by: Samuel Ortiz commit f3df0b7533ccad7bb3ef25383fea9c990b0033a2 Author: Mark Brown Date: Sun Mar 1 20:11:58 2009 +0100 mfd: Use the value of the final spin when reading the AUXADC Reverse the order of the tests for loop exit so we use a valid value before we time out. Vanishingly unlikely to happen since we retry for several times the expected conversion time. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 3446d4bb93b4d8c7c5b667dd0271669f012fb166 Author: Tobias Klauser Date: Tue Feb 17 10:11:42 2009 +0100 mfd: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Samuel Ortiz commit 47c10edd715d420cabd8622a4a458e9ac755b24d Author: Philipp Zabel Date: Tue Feb 17 10:09:44 2009 +0100 mfd: PASIC3: supply clock_rate to DS1WM via driver_data Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 7d33ccbeecd8393cc690cf9a71008236cdd7cc2c Author: Philipp Zabel Date: Tue Feb 17 10:09:19 2009 +0100 mfd: remove DS1WM clock handling This driver requests a clock that usually is supplied by the MFD in which the DS1WM is contained. Currently, it is impossible for a MFD to register their clocks with the generic clock API due to different implementations across architectures. For now, this patch removes the clock handling from DS1WM altogether, trusting that the MFD enable/disable functions will switch the clock if needed. The clock rate is obtained from a new parameter in driver_data. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit b72019dbd126e60bb5f9f350f76127b1527facba Author: Philipp Zabel Date: Tue Feb 17 10:06:52 2009 +0100 mfd: remove unused PASIC3 bus_shift field Removes the now-unused bus_shift field from pasic3_platform_data. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 0ef2067d0fdb0572bd0df288d1d32e27c929d824 Author: Philipp Zabel Date: Tue Feb 17 10:06:48 2009 +0100 pxa/magician: remove deprecated .bus_shift from PASIC3 platform_data The PASIC3 driver now calculates its register spacing from the resource size. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 0254a8f496f9c939d4068613ace4ffd0d9e6ece2 Author: Philipp Zabel Date: Tue Feb 17 10:06:45 2009 +0100 mfd: convert PASIC3 to use MFD core This patch makes htc-pasic3 register the DS1WM and LED cell drivers through the MFD core infrastructure instead of allocating the platform devices manually. It also calculates the bus_shift parameter from the memory resource size. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit a23a175795cdb202619ac176129b2f0c2a5c9456 Author: Philipp Zabel Date: Tue Feb 17 10:06:41 2009 +0100 mfd: convert DS1WM to use MFD core This patch converts the DS1WM driver into an MFD cell. It also calculates the bus_shift parameter from the memory resource size. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 3206450355100eae8e033645318b95bb60f1faff Author: Mark Brown Date: Fri Feb 6 15:27:13 2009 +0100 mfd: Support active high IRQs on WM835x Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 9dfd338198bec67ebc82ed363078f9d8aa74ec3e Author: Mark Brown Date: Wed Feb 4 22:43:55 2009 +0100 mfd: Use bulk read to fill WM8350 register cache Some I2C controllers have high overheads for setting up I2C operations which makes the register cache setup on startup excessively slow since it does a lot of small transactions. Reduce this overhead by doing a bulk read of the entire register bank and filtering out what we don't need later. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 22e2df7d5ff50e5a62d4945b13c83525a2617ef5 Author: Huang Weiyi Date: Wed Feb 4 22:43:28 2009 +0100 mfd: remove duplicated #include from pcf50633 Removed duplicated #include in drivers/mfd/pcf50633-core.c Signed-off-by: Huang Weiyi Signed-off-by: Samuel Ortiz commit 45b09076149f1360e15919ca7e004e8d3810a0f7 Author: Kevin Cernekee Date: Sat Apr 4 11:03:04 2009 -0700 [MTD] sysfs support should not depend on CONFIG_PROC_FS Move the driver model init code out of the "#ifdef CONFIG_PROC_FS" block. Tested with both values of CONFIG_PROC_FS . Tested with CONFIG_MTD=m . Issue was reported here: http://lkml.org/lkml/2009/4/4/107 Signed-off-by: Kevin Cernekee Signed-off-by: David Woodhouse commit 601cc11d054ae4b5e9b5babec3d8e4667a2cb9b5 Author: Linus Torvalds Date: Fri Apr 3 08:03:22 2009 -0700 Make non-compat preadv/pwritev use native register size Instead of always splitting the file offset into 32-bit 'high' and 'low' parts, just split them into the largest natural word-size - which in C terms is 'unsigned long'. This allows 64-bit architectures to avoid the unnecessary 32-bit shifting and masking for native format (while the compat interfaces will obviously always have to do it). This also changes the order of 'high' and 'low' to be "low first". Why? Because when we have it like this, the 64-bit system calls now don't use the "pos_high" argument at all, and it makes more sense for the native system call to simply match the user-mode prototype. This results in a much more natural calling convention, and allows the compiler to generate much more straightforward code. On x86-64, we now generate testq %rcx, %rcx # pos_l js .L122 #, movq %rcx, -48(%rbp) # pos_l, pos from the C source loff_t pos = pos_from_hilo(pos_h, pos_l); ... if (pos < 0) return -EINVAL; and the 'pos_h' register isn't even touched. It used to generate code like mov %r8d, %r8d # pos_low, pos_low salq $32, %rcx #, tmp71 movq %r8, %rax # pos_low, pos.386 orq %rcx, %rax # tmp71, pos.386 js .L122 #, movq %rax, -48(%rbp) # pos.386, pos which isn't _that_ horrible, but it does show how the natural word size is just a more sensible interface (same arguments will hold in the user level glibc wrapper function, of course, so the kernel side is just half of the equation!) Note: in all cases the user code wrapper can again be the same. You can just do #define HALF_BITS (sizeof(unsigned long)*4) __syscall(PWRITEV, fd, iov, count, offset, (offset >> HALF_BITS) >> HALF_BITS); or something like that. That way the user mode wrapper will also be nicely passing in a zero (it won't actually have to do the shifts, the compiler will understand what is going on) for the last argument. And that is a good idea, even if nobody will necessarily ever care: if we ever do move to a 128-bit lloff_t, this particular system call might be left alone. Of course, that will be the least of our worries if we really ever need to care, so this may not be worth really caring about. [ Fixed for lost 'loff_t' cast noticed by Andrew Morton ] Acked-by: Gerd Hoffmann Cc: H. Peter Anvin Cc: Andrew Morton Cc: linux-api@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: Ingo Molnar Cc: Ralf Baechle > Cc: Al Viro Signed-off-by: Linus Torvalds commit 0f66af530116e9f4dd97f328d91718b56a6fc5a4 Author: Arjan van de Ven Date: Sat Jan 10 14:19:05 2009 -0500 ACPI: battery: asynchronous init The battery driver tends to take quite some time to initialize (100ms-300ms is quite typical). This patch initializes the batter driver asynchronously, so that other things in the kernel can initialize in parallel to this 300 msec. As part of this, the battery driver had to move to the back of the ACPI init order (hence the Makefile change). Without this move, the next ACPI driver would just block on the ACPI/devicee layer semaphores until the battery driver was done anyway, not gaining any boot time. Signed-off-by: Arjan van de Ven Signed-off-by: Len Brown commit 4f0175dc13a57cb5d2abef44eb4394b0b964bdad Author: Carlos Corbacho Date: Sat Apr 4 09:33:39 2009 +0100 acer-wmi: Update copyright notice & documentation Explicitly note in the documentation that the Acer Aspire One is not supported. Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown commit 350e32907cf72ef82bbe7d72525fa2d9dcf64682 Author: Andy Whitcroft Date: Sat Apr 4 09:33:34 2009 +0100 acer-wmi: Cleanup the failure cleanup handling Cleanup the failure cleanup handling for brightness and email led. [cc: Split out from another patch] Signed-off-by: Andy Whitcroft Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown commit a74dd5fdabcd34c93e17e9c7024eeb503c92b048 Author: Carlos Corbacho Date: Sat Apr 4 09:33:29 2009 +0100 acer-wmi: Blacklist Acer Aspire One The Aspire One's ACPI-WMI interface is a placeholder that does nothing, and the invalid results that we get from it are now causing userspace problems as acer-wmi always returns that the rfkill is enabled (i.e. the radio is off, when it isn't). As it's hardware controlled, acer-wmi isn't needed on the Aspire One either. Thanks to Andy Whitcroft at Canonical for tracking down Ubuntu's userspace issues to this. Signed-off-by: Carlos Corbacho Reported-by: Andy Whitcroft Cc: stable@kernel.org Signed-off-by: Len Brown commit 68b42d1b548be1840aff7122fdebeb804daf0fa3 Author: Takashi Yoshii Date: Thu Apr 2 09:03:30 2009 +0000 sh: sh7785lcr: Map whole PCI address space. PCI still doesn't work on sh7785lcr 29bit 256M map mode. On SH7785, PCI -> SHwy address translation is not base+offset but somewhat like base|offset (See HW Manual (rej09b0261) Fig. 13.11). So, you can't export CS2,3,4,5 by 256M at CS2 (results CS0,1,2,3 exported, I guess). There are two candidates. a) 128M@CS2 + 128M@CS4 b) 512M@CS0 Attached patch is B. It maps 512M Byte at 0 independently of memory size. It results CS0 to CS6 and perhaps some more being accessible from PCI. Tested on 7785lcr 29bit 128M map 7785lcr 29bit 256M map (NOT tested on 32bit) Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 01ab10393c510342ec4ce85df11ccfa3df06bbb2 Author: Michael Trimarchi Date: Fri Apr 3 17:32:33 2009 +0000 sh: Fix up DSP context save/restore. There were a number of issues with the DSP context save/restore code, mostly left-over relics from when it was introduced on SH3-DSP with little follow-up testing, resulting in things like task_pt_dspregs() referencing incorrect state on the stack. This follows the MIPS convention of tracking the DSP state in the thread_struct and handling the state save/restore in switch_to() and finish_arch_switch() respectively. The regset interface is also updated, which allows us to finally be rid of task_pt_dspregs() and the special cased task_pt_regs(). Signed-off-by: Michael Trimarchi Signed-off-by: Paul Mundt commit a27873cd234b4248dda342721d6262943e5fa235 Author: Paul Mundt Date: Sat Apr 4 11:40:22 2009 -0400 sh: Fix up number of on-chip DMA channels on SH7091. This accidentally regressed when the multi-IRQ changes went in, switching SH7091 from 4 to 6 channels. Add SH7091 back in to the 4-channel dependency list. Reported-by: Adrian McMenamin Signed-off-by: Paul Mundt commit c451c7c4c9c4f59c7808a7d397d32bef160c14d9 Author: David Woodhouse Date: Sat Apr 4 15:27:45 2009 +0100 [MTD] [NAND] Add parent info for CAFÉ controller Signed-off-by: David Woodhouse commit 87f39f0493edf7051b1b87c6e9eb7f9a74be8e85 Author: David Brownell Date: Thu Mar 26 00:42:50 2009 -0700 [MTD] support driver model updates Follow-on patch to the previous driver model patch for the MTD framework. This one makes various MTD drivers connect to the driver model tree, so /sys/devices/virtual/mtd/* nodes are no longer present ... mostly drivers used on boards I have handy. Based on a patch from Kay Sievers. Signed-off-by: David Brownell Signed-off-by: David Woodhouse commit 694bb7fc19c6b87e106f4c85a2707072e2f111a0 Author: Kevin Cernekee Date: Fri Apr 3 13:00:45 2009 -0700 [MTD] driver model updates (part 2) 1) Add more sysfs attributes: flags, size, erasesize, writesize, oobsize, numeraseregions, name 2) Move core_initcall() code into init_mtd(). The original approach does not work if CONFIG_MTD=m . 3) Add device_unregister() in del_mtd_device() so that devices get removed from sysfs as each driver is unloaded. Signed-off-by: Kevin Cernekee Signed-off-by: David Woodhouse commit 1f24b5a8ecbb2a3c7080f418974d40e3ffedb221 Author: David Brownell Date: Thu Mar 26 00:42:41 2009 -0700 [MTD] driver model updates Update driver model support in the MTD framework, so it fits better into the current udev-based hotplug framework: - Each mtd_info now has a device node. MTD drivers should set the dev.parent field to point to the physical device, before setting up partitions or otherwise declaring MTDs. - Those device nodes always map to /sys/class/mtdX device nodes, which no longer depend on MTD_CHARDEV. - Those mtdX sysfs nodes have a "starter set" of attributes; it's not yet sufficient to replace /proc/mtd. - Enabling MTD_CHARDEV provides /sys/class/mtdXro/ nodes and the /sys/class/mtd*/dev attributes (for udev, mdev, etc). - Include a MODULE_ALIAS_CHARDEV_MAJOR macro. It'll work with udev creating the /dev/mtd* nodes, not just a static rootfs. So the sysfs structure is pretty much what you'd expect, except that readonly chardev nodes are a bit quirky. Signed-off-by: David Brownell Signed-off-by: David Woodhouse commit 276dbf997043cbf38f0087624e0f9c51742c8885 Author: David Woodhouse Date: Sat Apr 4 01:45:37 2009 +0100 intel-iommu: Handle PCI domains appropriately. We were comparing {bus,devfn} and assuming that a match meant it was the same device. It doesn't -- the same {bus,devfn} can exist in multiple PCI domains. Include domain number in device identification (and call it 'segment' in most places, because there's already a lot of references to 'domain' which means something else, and this code is infected with ACPI thinking already). Signed-off-by: David Woodhouse commit 924b6231edfaf1e764ffb4f97ea382bf4facff58 Author: David Woodhouse Date: Sat Apr 4 00:39:25 2009 +0100 intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges. When the DMAR table identifies that a PCI-PCI bridge belongs to a given IOMMU, that means that the bridge and all devices behind it should be associated with the IOMMU. Not just the bridge itself. This fixes the device_to_iommu() function accordingly. (It's broken if you have the same PCI bus numbers in multiple domains, but this function was always broken in that way; I'll be dealing with that later). Signed-off-by: David Woodhouse commit d0b03bd1c6725a3463290d7f9626e4b583518a5a Author: Han, Weidong Date: Fri Apr 3 17:15:50 2009 +0800 x2apic/intr-remap: decouple interrupt remapping from x2apic interrupt remapping must be enabled before enabling x2apic, but interrupt remapping doesn't depend on x2apic, it can be used separately. Enable interrupt remapping in init_dmars even x2apic is not supported. [dwmw2: Update Kconfig accordingly, fix build with INTR_REMAP && !X2APIC] Signed-off-by: Weidong Han Acked-by: Ingo Molnar Signed-off-by: David Woodhouse commit 34aaaa948e3c9dd65b27fa499c5c9e8d8f1227cf Author: Han, Weidong Date: Sat Apr 4 17:21:26 2009 +0800 x86, dmar: check if it's initialized before disable queue invalidation If queue invalidation is disabled after it's already initialized, dmar_enable_qi won't re-enable it due to iommu->qi is allocated. It may result in system hang when use queue invalidation. Add this check to avoid this case. Signed-off-by: Weidong Han Signed-off-by: David Woodhouse commit c07c9a78a95cab0a9bf0b253d0c52e7798af38c5 Author: Len Brown Date: Sat Apr 4 03:33:45 2009 -0400 video: build fix acpi_video_device_write_state() and friends now return ssize_t, while the constify patch assumed it was still int. Signed-off-by: Len Brown commit 0e501834f8c2ba7de2a56e332d346dcf4ac0b593 Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:53 2009 +0000 thinkpad-acpi: rework brightness support Refactor and redesign the brightness control backend... In order to fix bugzilla #11750... Add a new brightness control mode: support direct NVRAM checkpointing of the backlight level (i.e. store directly to NVRAM without the need for UCMS calls), and use that together with the EC-based control. Disallow UCMS+EC, thus avoiding races with the SMM firmware. Switch the models that define HBRV (EC Brightness Value) in the DSDT to the new mode. These are: T40-T43, R50-R52, R50e, R51e, X31-X41. Change the default for all other IBM ThinkPads to UCMS-only. The Lenovo models already default to UCMS-only. Reported-by: Alexey Fisher Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 74a60c0f828016456fc635feae388ffd12bb3bb9 Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:52 2009 +0000 thinkpad-acpi: enhanced debugging messages for the fan subdriver Enhance debugging messages for the fan subdriver. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 56e2c200945dafafb86169762eb1e88aed0ce69e Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:51 2009 +0000 thinkpad-acpi: enhanced debugging messages for the hotkey subdriver Enhance debugging messages for the hotkey subdriver. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit bee4cd9b9eaa8c72832e1ee7f4940604e94beb27 Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:50 2009 +0000 thinkpad-acpi: enhanced debugging messages for rfkill subdrivers Enhance debugging messages for all rfkill subdrivers in thinkpad-acpi. Also, log a warning if the deprecated sysfs attributes are in use. These attributes are going to be removed sometime in 2010. There is an user-visible side-effect: we now coalesce attempts to enable/disable bluetooth or WWAN in the procfs interface, instead of hammering the firmware with multiple requests. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit a4d5effcc73749ee3ebbf578d162905e6fa4e07d Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:49 2009 +0000 thinkpad-acpi: restrict access to some firmware LEDs Some of the ThinkPad LEDs indicate critical conditions that can cause data loss or cause hardware damage when ignored (e.g. force-ejecting a powered up bay; ignoring a failing battery, or empty battery; force- undocking with the dock buses still active, etc). On almost all ThinkPads, LED access is write-only, and the firmware usually does fire-and-forget signaling on them, so you effectively lose whatever message the firmware was trying to convey to the user when you override the LED state, without any chance to restore it. Restrict access to all LEDs that can convey important alarms, or that could mislead the user into incorrectly operating the hardware. This will make the Lenovo engineers less unhappy about the whole issue. Allow users that really want it to still control all LEDs, it is the unaware user that we have to worry about. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 2586d5663d0a17d69383acf6110f16a979a07c4e Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:48 2009 +0000 thinkpad-acpi: remove HKEY disable functionality The HKEY disable functionality basically cripples the entire event model of the ThinkPad firmware and of the thinkpad-acpi driver. Remove this functionality from the driver. HKEY must be enabled at all times while thinkpad-acpi is loaded, and disabled otherwise. For sysfs, according to the sysfs ABI and the thinkpad-acpi sysfs rules of engagement, we will just remove the attributes. This will be done in two stages: disable their function now, after two kernel releases, remove the attributes. For procfs, we call WARN(). If nothing triggers it, I will simply remove the enable/disable commands entirely in the future along with the sysfs attributes. I don't expect much, if any fallout from this. There really isn't any reason to mess with hotkey_enable or with the enable/disable commands to /proc/acpi/ibm/hotkey, and this has been true for years... Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 73a94d86a8625371f76de0ee12dc5bacd3ed42c0 Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:47 2009 +0000 thinkpad-acpi: add new debug helpers and warn of deprecated atts Add a debug helper that discloses the TGID of the userspace task attempting to access the driver. This is highly useful when dealing with bug reports, since often the user has no idea that some userspace application is accessing thinkpad-acpi... Also add a helper to log warnings about sysfs attributes that are deprecated. Use the new helpers to issue deprecation warnings for bluetooth_enable and wwan_enabled, that have been deprecated for a while, now. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 7ff8d62f7f055aaffbeb493863136c1b876bbe2e Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:46 2009 +0000 thinkpad-acpi: add missing log levels Add missing log levels in a standalone commit, to avoid dependencies in future unrelated changes, just because they wanted to use one of the missing log levels. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 3dcc2c3b00cad01a0e3667607f8644e891e4dc8b Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:45 2009 +0000 thinkpad-acpi: cleanup debug helpers Fix the vdbg_printk macro definition to be sane when CONFIG_THINKPAD_ACPI_DEBUG is undefined, and move the mess into a file section of its own. This doesn't change anything in the current code, but future code will need the proper behaviour. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 078ac19ed8f476a7c2d729712e15f5ab516ff491 Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:44 2009 +0000 thinkpad-acpi: documentation cleanup Some cleanups to the documentation of the driver. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 257bc1cb3e29c8da62b9c9e0a4505011776c7040 Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:43 2009 +0000 thinkpad-acpi: drop ibm-acpi alias The driver was renamed two years ago, on 2.6.21. Drop the old compatibility alias, we have given everybody quite enough time to update their configs to the new name. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 1c762ca438447fa3525d84f4a0784a2021a66200 Author: Henrique de Moraes Holschuh Date: Sat Apr 4 04:25:42 2009 +0000 thinkpad-acpi: update copyright notices It is that time of the year again... Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit ba256b41bd58f0821c9c0e203982fb260f09bdeb Author: Harald Welte Date: Wed Jan 14 14:01:17 2009 +0800 panasonic-laptop: use snprintf with PAGE_SIZE in sysfs attributes Instead of just sprintf() into the page-sized buffer provided by the sysfs/device_attribute API, we use snprintf with PAGE_SIZE as an additional safeguard. Signed-off-by: Martin Lucina Signed-off-by: Harald Welte Signed-off-by: Len Brown commit c542aadeb4700bc316834d862d52ba3d2664f13a Author: Harald Welte Date: Wed Jan 14 13:59:50 2009 +0800 panasonic-laptop: Fix autoloading This patch adds MODULE_DEVICE_TABLE() to panasonic-laptop.c in order to ensure automatic loading of the module on systems with the respective "MAT*" ACPI devices. Signed-off-by: Martin Lucina Signed-off-by: Harald Welte Signed-off-by: Len Brown commit b7171ae74b1741245835444bd98a7217958cf929 Author: Jan Engelhardt Date: Mon Jan 12 00:08:19 2009 +0100 ACPI: constify VFTs (2/2) Signed-off-by: Jan Engelhardt Signed-off-by: Len Brown commit 070d8eb1f6b789206486ea6a4a1bb7745d86d314 Author: Jan Engelhardt Date: Mon Jan 12 00:07:55 2009 +0100 ACPI: constify VFTs (1/2) Signed-off-by: Jan Engelhardt Signed-off-by: Len Brown commit 0b3f6109f0c9ff926b5ffc80dc1cebb24f192b35 Author: Matthew Garrett Date: Fri Jan 9 20:17:11 2009 +0000 dell-wmi: new driver for hotkey control Add a WMI driver for Dell laptops. Currently it does nothing but send a generic input event when a button with a picture of a battery on it is pressed, but maybe other uses will appear over time. Signed-off-by: Matthew Garrett Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 609d4bc949a9175a6c8ba9dc1b6fdb4d9dab0427 Author: Jan Beulich Date: Thu Mar 12 11:58:25 2009 +0000 ACPI: constify tables in pci_irq.c Signed-off-by: Jan Beulich Signed-off-by: Len Brown commit 6328a57401dc5f5cf9931738eb7268fcd8058c49 Author: Witold Szczeponik Date: Mon Mar 30 19:31:06 2009 +0200 Enable PNPACPI _PSx Support, v3 (This is an update to the patch presented earlier in http://lkml.org/lkml/2008/12/8/284, with new error handling.) This patch sets the power of PnP ACPI devices to D0 when they are activated and to D3 when they are disabled. The latter is in correspondence with the ACPI 3.0 specification, whereas the former is added in order to be able to power up a device after it has been previously disabled (or when booting up a system). (As a consequence, the patch makes the PnP ACPI code more ACPI compliant.) Section 6.2.2 of the ACPI Specification (at least versions 1.0b and 3.0a) states: "Prior to running this control method [_DIS], the OS[PM] will have already put the device in the D3 state." Unfortunately, there is no clear statement as to when to put a device in the D0 state. :-( Therefore, the patch executes the method calls as _PS3/_DIS and _SRS/_PS0. What is clear: "If the device is disabled, _SRS enables the device at the specified resources." (From the ACPI 3.0a Specification.) The patch fixes a problem with some IBM ThinkPads (at least the 600E and the 600X) where the serial ports have a dedicated power source that needs to be brought up before the serial port can be used. Without this patch, the serial port is enabled but has no power. (In the past, the tpctl utility had to be utilized to turn on the power, but support for this feature stopped with version 5.9 as it did not support the more recent kernel versions.) The error handlers that handle any errors that can occur during the power up/power down phases return the error codes to the caller directly. Comments welcome! :-) No regressions were observed on hardware that does not require this patch. The patch is applied against 2.6.27.x. Signed-off-by: Witold Szczeponik Acked-by: Zhao Yakui Signed-off-by: Len Brown commit 3ef1728898f0285c13aa6901f412b52835e23578 Author: Benny Halevy Date: Fri Apr 3 08:29:20 2009 +0300 nfsd41: Documentation/filesystems/nfs41-server.txt Initial nfs41 server write up describing the status of the linux server implementation. [nfsd41: document unenforced nfs41 compound ordering rules.] [get rid of CONFIG_NFSD_V4_1] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 79fb54abd285b442e1f30f851902f3ddf58e7704 Author: Benny Halevy Date: Fri Apr 3 08:29:17 2009 +0300 nfsd41: CREATE_EXCLUSIVE4_1 Implement the CREATE_EXCLUSIVE4_1 open mode conforming to http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26 This mode allows the client to atomically create a file if it doesn't exist while setting some of its attributes. It must be implemented if the server supports persistent reply cache and/or pnfs. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 8c18f2052e756e7d5dea712fc6e7ed70c00e8a39 Author: Benny Halevy Date: Fri Apr 3 08:29:14 2009 +0300 nfsd41: SUPPATTR_EXCLCREAT attribute Return bitmask for supported EXCLUSIVE4_1 create attributes. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 7e70570647827345352cf6c17461c9fa166f570a Author: Andy Adamson Date: Fri Apr 3 08:29:11 2009 +0300 nfsd41: support for 3-word long attribute bitmask Also, use client minorversion to generate supported attrs Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 95ec28cda323104bbff64fc7ec8ee4c9042e51fa Author: Benny Halevy Date: Fri Apr 3 08:29:08 2009 +0300 nfsd: dynamically skip encoded fattr bitmap in _nfsd4_verify _nfsd4_verify currently skips 3 words from the encoded buffer begining. With support for 3-word attr bitmaps in nfsd41, nfsd4_encode_fattr may encode 1, 2, or 3 words, and not always 2 as it used to be, hence we need to find out where to skip using the encoded bitmap length. Note: This patch may be applied over pre-nfsd41 nfsd. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit c0d6fc8a2d55a8235c301aeb6d5254d5992895d1 Author: Benny Halevy Date: Fri Apr 3 08:29:05 2009 +0300 nfsd41: pass writable attrs mask to nfsd4_decode_fattr In preparation for EXCLUSIVE4_1 Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit f3ec22b5b0b4b220ee600bf1a8b6dc045b4e72bd Author: Marc Eshel Date: Fri Apr 3 08:29:02 2009 +0300 nfsd41: provide support for minor version 1 at rpc level Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 8daf220a6a83c47b9648c28bb819c14c60bad7f9 Author: Benny Halevy Date: Fri Apr 3 08:28:59 2009 +0300 nfsd41: control nfsv4.1 svc via /proc/fs/nfsd/versions Support enabling and disabling nfsv4.1 via /proc/fs/nfsd/versions by writing the strings "+4.1" or "-4.1" correspondingly. Use user mode nfs-utils (rpc.nfsd option) to enable. This will allow us to get rid of CONFIG_NFSD_V4_1 [nfsd41: disable support for minorversion by default] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 84459a1162801fb84734e5f9e6dc5194f791d69b Author: Andy Adamson Date: Fri Apr 3 08:28:56 2009 +0300 nfsd41: add OPEN4_SHARE_ACCESS_WANT nfs4_stateid bmap Separate the access bits from the want bits and enable __set_bit to work correctly with st_access_bmap. Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit d87a8ade95288f28c729e076cd74929f3f199b6c Author: Andy Adamson Date: Fri Apr 3 08:28:53 2009 +0300 nfsd41: access_valid For nfs41, the open share flags are used also for delegation "wants" and "signals". Check that they are valid. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 60adfc50de3855628dea8f8896a65f471f51301c Author: Andy Adamson Date: Fri Apr 3 08:28:50 2009 +0300 nfsd41: clientid handling Extract the clientid from sessionid to set the op_clientid on open. Verify that the clid for other stateful ops is zero for minorversion != 0 Do all other checks for stateful ops without sessions. Signed-off-by: Benny Halevy Signed-off-by: Andy Adamson [fixed whitespace indent] Signed-off-by: Benny Halevy [nfsd41 remove sl_session from nfsd4_open] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 496c262cf01106a546ffb7df6fea84b8b881ee19 Author: Andy Adamson Date: Fri Apr 3 08:28:48 2009 +0300 nfsd41: check encode size for sessions maxresponse cached Calculate the space the compound response has taken after encoding the current operation. pad: add on 8 bytes for the next operation's op_code and status so that there is room to cache a failure on the next operation. Compare this length to the session se_fmaxresp_cached and return nfserr_rep_too_big_to_cache if the length is too large. Our se_fmaxresp_cached will always be a multiple of PAGE_SIZE, and so will be at least a page and will therefore hold the xdr_buf head. Signed-off-by: Andy Adamson [nfsd41: non-page DRC for solo sequence responses] [fixed nfsd4_check_drc_limit cosmetics] Signed-off-by: Benny Halevy [nfsd41: use cstate session in nfsd4_check_drc_limit] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 6668958fac1d05f55420de702f3678d46c1e93a5 Author: Andy Adamson Date: Fri Apr 3 08:28:45 2009 +0300 nfsd41: stateid handling When sessions are used, stateful operation sequenceid and stateid handling are not used. When sessions are used, on the first open set the seqid to 1, mark state confirmed and skip seqid processing. When sessionas are used the stateid generation number is ignored when it is zero whereas without sessions bad_stateid or stale stateid is returned. Add flags to propagate session use to all stateful ops and down to check_stateid_generation. Signed-off-by: Benny Halevy Signed-off-by: Andy Adamson [nfsd4_has_session should return a boolean, not u32] Signed-off-by: Benny Halevy [nfsd41: pass nfsd4_compoundres * to nfsd4_process_open1] [nfsd41: calculate HAS_SESSION in nfs4_preprocess_stateid_op] [nfsd41: calculate HAS_SESSION in nfs4_preprocess_seqid_op] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit dd453dfd70538cadc02cb47ff8d8cfd0cb8cf435 Author: Benny Halevy Date: Fri Apr 3 08:28:41 2009 +0300 nfsd: pass nfsd4_compound_state* to nfs4_preprocess_{state,seq}id_op Currently we only use cstate->current_fh, will also be used by nfsd41 code. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit e10e0cfc2f27364c73b28adbd3c8688d97049e73 Author: Benny Halevy Date: Fri Apr 3 08:28:38 2009 +0300 nfsd41: destroy_session operation Implement the destory_session operation confoming to http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26 [use sessionid_lock spin lock] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit bf864a31d50e3e94d6e76537b97d664913906ff8 Author: Andy Adamson Date: Fri Apr 3 08:28:35 2009 +0300 nfsd41: non-page DRC for solo sequence responses A session inactivity time compound (lease renewal) or a compound where the sequence operation has sa_cachethis set to FALSE do not require any pages to be held in the v4.1 DRC. This is because struct nfsd4_slot is already caching the session information. Add logic to the nfs41 server to not cache response pages for solo sequence responses. Return nfserr_replay_uncached_rep on the operation following the sequence operation when sa_cachethis is FALSE. Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [nfsd41: use cstate session in nfsd4_replay_cache_entry] [nfsd41: rename nfsd4_no_page_in_cache] [nfsd41 rename nfsd4_enc_no_page_replay] [nfsd41 nfsd4_is_solo_sequence] [nfsd41 change nfsd4_not_cached return] Signed-off-by: Andy Adamson [changed return type to bool] Signed-off-by: Benny Halevy [nfsd41 drop parens in nfsd4_is_solo_sequence call] Signed-off-by: Andy Adamson [changed "== 0" to "!"] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 38eb76a54d803e6792816623651b1a9cb85f8d01 Author: Andy Adamson Date: Fri Apr 3 08:28:32 2009 +0300 nfsd41: Add a create session replay cache Replace the nfs4_client cl_seqid field with a single struct nfs41_slot used for the create session replay cache. The CREATE_SESSION slot sets the sl_session pointer to NULL. Otherwise, the slot and it's replay cache are used just like the session slots. Fix unconfirmed create_session replay response by initializing the create_session slot sequence id to 0. A future patch will set the CREATE_SESSION cache when a SEQUENCE operation preceeds the CREATE_SESSION operation. This compound is currently only cached in the session slot table. Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [nfsd41: use bool inuse for slot state] Signed-off-by: Benny Halevy [nfsd41: revert portion of nfsd4_set_cache_entry] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit ec6b5d7b5064fde27aee798b81107ea3a830de85 Author: Andy Adamson Date: Fri Apr 3 08:28:28 2009 +0300 nfsd41: create_session operation Implement the create_session operation confoming to http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26 Look up the client id (generated by the server on exchange_id, given by the client on create_session). If neither a confirmed or unconfirmed client is found then the client id is stale If a confirmed cilent is found (i.e. we already received create_session for it) then compare the sequence id to determine if it's a replay or possibly a mis-ordered rpc. If the seqid is in order, update the confirmed client seqid and procedd with updating the session parameters. If an unconfirmed client_id is found then verify the creds and seqid. If both match move the client id to confirmed state and proceed with processing the create_session. Currently, we do not support persistent sessions, and RDMA. alloc_init_session generates a new sessionid and creates a session structure. NFSD_PAGES_PER_SLOT is used for the max response cached calculation, and for the counting of DRC pages using the hard limits set in struct srv_serv. A note on NFSD_PAGES_PER_SLOT: Other patches in this series allow for NFSD_PAGES_PER_SLOT + 1 pages to be cached in a DRC slot when the response size is less than NFSD_PAGES_PER_SLOT * PAGE_SIZE but xdr_buf pages are used. e.g. a READDIR operation will encode a small amount of data in the xdr_buf head, and then the READDIR in the xdr_buf pages. So, the hard limit calculation use of pages by a session is underestimated by the number of cached operations using the xdr_buf pages. Yet another patch caches no pages for the solo sequence operation, or any compound where cache_this is False. So the hard limit calculation use of pages by a session is overestimated by the number of these operations in the cache. TODO: improve resource pre-allocation and negotiate session parameters accordingly. Respect and possibly adjust backchannel attributes. Signed-off-by: Marc Eshel Signed-off-by: Dean Hildebrand [nfsd41: remove headerpadsz from channel attributes] Our client and server only support a headerpadsz of 0. [nfsd41: use DRC limits in fore channel init] [nfsd41: do not change CREATE_SESSION back channel attrs] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [use sessionid_lock spin lock] [nfsd41: use bool inuse for slot state] Signed-off-by: Benny Halevy [nfsd41 remove sl_session from alloc_init_session] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [simplify nfsd4_encode_create_session error handling] [nfsd41: fix comment style in init_forechannel_attrs] [nfsd41: allocate struct nfsd4_session and slot table in one piece] [nfsd41: no need to INIT_LIST_HEAD in alloc_init_session just prior to list_add] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 14778a133e3be332be77d981552a79260a61ee17 Author: Andy Adamson Date: Fri Apr 3 08:28:25 2009 +0300 nfsd41: clear DRC cache on free_session Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit da3846a2866ddf239311766ff434a82e7b4ac701 Author: Andy Adamson Date: Fri Apr 3 08:28:22 2009 +0300 nfsd41: nfsd DRC logic Replay a request in nfsd4_sequence. Add a minorversion to struct nfsd4_compound_state. Pass the current slot to nfs4svc_encode_compound res via struct nfsd4_compoundres to set an NFSv4.1 DRC entry. Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [nfsd41: use bool inuse for slot state] Signed-off-by: Benny Halevy [nfsd41: use cstate session in nfs4svc_encode_compoundres] [nfsd41 replace nfsd4_set_cache_entry] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit c3d06f9ce8544fecfe13e377d1e2c2e47fe18dbc Author: Andy Adamson Date: Fri Apr 3 08:28:18 2009 +0300 nfsd41: hard page limit for DRC Use no more than 1/128th of the number of free pages at nfsd startup for the v4.1 DRC. This is an arbitrary default which should probably end up under the control of an administrator. Signed-off-by: Andy Adamson [moved added fields in struct svc_serv under CONFIG_NFSD_V4_1] Signed-off-by: Benny Halevy [fix set_max_drc calculation of sv_drc_max_pages] [moved NFSD_DRC_SIZE_SHIFT's declaration up in header file] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 074fe897536f095309c5aaffcf912952882ab2cb Author: Andy Adamson Date: Fri Apr 3 08:28:15 2009 +0300 nfsd41: DRC save, restore, and clear functions Cache all the result pages, including the rpc header in rq_respages[0], for a request in the slot table cache entry. Cache the statp pointer from nfsd_dispatch which points into rq_respages[0] just past the rpc header. When setting a cache entry, calculate and save the length of the nfs data minus the rpc header for rq_respages[0]. When replaying a cache entry, replace the cached rpc header with the replayed request rpc result header, unless there is not enough room in the cached results first page. In that case, use the cached rpc header. The sessions fore channel maxresponse size cached is set to NFSD_PAGES_PER_SLOT * PAGE_SIZE. For compounds we are cacheing with operations such as READDIR that use the xdr_buf->pages to hold data, we choose to cache the extra page of data rather than copying data from xdr_buf->pages into the xdr_buf->head page. [nfsd41: limit cache to maxresponsesize_cached] [nfsd41: mv nfsd4_set_statp under CONFIG_NFSD_V4_1] [nfsd41: rename nfsd4_move_pages] [nfsd41: rename page_no variable] [nfsd41: rename nfsd4_set_cache_entry] [nfsd41: fix nfsd41_copy_replay_data comment] [nfsd41: add to nfsd4_set_cache_entry] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit f9bb94c4c60f6e1d1717077bfddb614f03a607d1 Author: Andy Adamson Date: Fri Apr 3 08:28:12 2009 +0300 nfsd41: enforce NFS4ERR_SEQUENCE_POS operation order rules for minorversion != 0 only. Signed-off-by: Andy Adamson [nfsd41: do not verify nfserr_sequence_pos for minorversion 0] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit b85d4c01b76f6969a085d07a767fa45225cb14be Author: Benny Halevy Date: Fri Apr 3 08:28:08 2009 +0300 nfsd41: sequence operation Implement the sequence operation conforming to http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26 Check for stale clientid (as derived from the sessionid). Enforce slotid range and exactly-once semantics using the slotid and seqid. If everything went well renew the client lease and mark the slot INPROGRESS. Add a struct nfsd4_slot pointer to struct nfsd4_compound_state. To be used for sessions DRC replay. [nfsd41: rename sequence catchthis to cachethis] Signed-off-by: Andy Adamson [pulled some code to set cstate->slot from "nfsd DRC logic"] [use sessionid_lock spin lock] [nfsd41: use bool inuse for slot state] Signed-off-by: Benny Halevy [nfsd: add a struct nfsd4_slot pointer to struct nfsd4_compound_state] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [nfsd41: add nfsd4_session pointer to nfsd4_compound_state] [nfsd41: set cstate session] [nfsd41: use cstate session in nfsd4_sequence] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [simplify nfsd4_encode_sequence error handling] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit a1bcecd29cdf1670df6908a620add4211c0abb7a Author: Andy Adamson Date: Fri Apr 3 08:28:05 2009 +0300 nfsd41: match clientid establishment method We need to distinguish between client names provided by NFSv4.0 clients SETCLIENTID and those provided by NFSv4.1 via EXCHANGE_ID when looking up the clientid by string. Signed-off-by: Benny Halevy Signed-off-by: Andy Adamson [nfsd41: use boolean values for use_exchange_id argument] Signed-off-by: Benny Halevy [nfsd41: simplify match_clientid_establishment logic] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 0733d21338747483985a5964e852af160d88e429 Author: Andy Adamson Date: Fri Apr 3 08:28:01 2009 +0300 nfsd41: exchange_id operation Implement the exchange_id operation confoming to http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-28 Based on the client provided name, hash a client id. If a confirmed one is found, compare the op's creds and verifier. If the creds match and the verifier is different then expire the old client (client re-incarnated), otherwise, if both match, assume it's a replay and ignore it. If an unconfirmed client is found, then copy the new creds and verifer if need update, otherwise assume replay. The client is moved to a confirmed state on create_session. In the nfs41 branch set the exchange_id flags to EXCHGID4_FLAG_USE_NON_PNFS | EXCHGID4_FLAG_SUPP_MOVED_REFER (pNFS is not supported, Referrals are supported, Migration is not.). Address various scenarios from section 18.35 of the spec: 1. Check for EXCHGID4_FLAG_UPD_CONFIRMED_REC_A and set EXCHGID4_FLAG_CONFIRMED_R as appropriate. 2. Return error codes per 18.35.4 scenarios. 3. Update client records or generate new client ids depending on scenario. Note: 18.35.4 case 3 probably still needs revisiting. The handling seems not quite right. Signed-off-by: Benny Halevy Signed-off-by: Andy Adamosn Signed-off-by: Benny Halevy [nfsd41: use utsname for major_id (and copy to server_scope)] [nfsd41: fix handling of various exchange id scenarios] Signed-off-by: Mike Sager Signed-off-by: Benny Halevy [nfsd41: reverse use of EXCHGID4_INVAL_FLAG_MASK_A] [simplify nfsd4_encode_exchange_id error handling] [nfsd41: embed an xdr_netobj in nfsd4_exchange_id] [nfsd41: return nfserr_serverfault for spa_how == SP4_MACH_CRED] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 069b6ad4bb20abf175ea7875e82e8002154773af Author: Andy Adamson Date: Fri Apr 3 08:27:58 2009 +0300 nfsd41: proc stubs Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 2db134eb3b39faefc7fbfb200156d175edba2f68 Author: Andy Adamson Date: Fri Apr 3 08:27:55 2009 +0300 nfsd41: xdr infrastructure Define nfsd41_dec_ops vector and add it to nfsd4_minorversion for minorversion 1. Note: nfsd4_enc_ops vector is shared for v4.0 and v4.1 since we don't need to filter out obsolete ops as this is done in the decoding phase. exchange_id, create_session, destroy_session, and sequence ops are implemented as stubs returning nfserr_opnotsupp at this stage. [was nfsd41: xdr stubs] [get rid of CONFIG_NFSD_V4_1] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 5282fd724b667b7d65f2e41e405a825e58a78813 Author: Marc Eshel Date: Fri Apr 3 08:27:52 2009 +0300 nfsd41: sessionid hashing Simple sessionid hashing using its monotonically increasing sequence number. Locking considerations: sessionid_hashtbl access is controlled by the sessionid_lock spin lock. It must be taken for insert, delete, and lookup. nfsd4_sequence looks up the session id and if the session is found, it calls nfsd4_get_session (still under the sessionid_lock). nfsd4_destroy_session calls nfsd4_put_session after unhashing it, so when the session's kref reaches zero it's going to get freed. Signed-off-by: Benny Halevy [we don't use a prime for sessionid hash table size] [use sessionid_lock spin lock] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit c4bf7868064ce8b9c75d8049d077e593c20602b3 Author: Marc Eshel Date: Fri Apr 3 08:27:49 2009 +0300 nfsd41: release_session when client is expired Signed-off-by: Benny Halevy [add CONFIG_NFSD_V4_1 to fix v4.0 regression bug] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 9fb870702d02c05f9410423bfff3f63e46e26180 Author: Marc Eshel Date: Fri Apr 3 08:27:46 2009 +0300 nfsd41: introduce nfs4_client cl_sessions list [get rid of CONFIG_NFSD_V4_1] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 7116ed6b9973021ff43edeb10f4cb834db94000f Author: Andy Adamson Date: Fri Apr 3 08:27:43 2009 +0300 nfsd41: sessions basic data types This patch provides basic data structures representing the nfs41 sessions and slots, plus helpers for keeping a reference count on the session and freeing it. Note that our server only support a headerpadsz of 0 and it ignores backchannel attributes at the moment. Signed-off-by: Benny Halevy [nfsd41: remove headerpadsz from channel attributes] [nfsd41: embed nfsd4_channel in nfsd4_session] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [nfsd41: use bool inuse for slot state] Signed-off-by: Benny Halevy [nfsd41 remove sl_session from nfsd4_slot] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 10add806c38c022d18af48f3ec28c91b4eaf7bb3 Author: Marc Eshel Date: Fri Apr 3 08:27:40 2009 +0300 nfsd41: define nfs41 error codes Define all error code present in http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-29. Signed-off-by: Benny Halevy [nfsd41: clean up error code definitions] [nfsd41: change NFSERR_REPLAY_ME] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 18df1884a872a2cc405a578cfd0d3adc8d227277 Author: Benny Halevy Date: Fri Apr 3 08:27:36 2009 +0300 nfs41: common protocol definitions Define all NFSv4.1 common operation and error code constants. Note that some of the definitions are used by both the nfs41 client and the server code. This patch is duplicated in the nfs41 and nfsd41 sessions patchset. Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [nfs41: add exchange id flags] Signed-off-by: Mike Sager Signed-off-by: Benny Halevy [removed server-only hunk changing NFSERR_REPLAY_ME] Signed-off-by: Benny Halevy [nfs41: add SEQ4_XX to nfs41-common-protocol] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [nfs41: generic error code update] [nfs41: reverse EXCHGID4_INVAL_FLAG_MASK_{A,R}] Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 2f425878b6a71571341dcd3f9e9d1a6f6355da9c Author: Andy Adamson Date: Fri Apr 3 08:27:32 2009 +0300 nfsd: don't use the deferral service, return NFS4ERR_DELAY On an NFSv4.1 server cache miss that causes an upcall, NFS4ERR_DELAY will be returned. It is up to the NFSv4.1 client to resend only the operations that have not been processed. Initialize rq_usedeferral to 1 in svc_process(). It sill be turned off in nfsd4_proc_compound() only when NFSv4.1 Sessions are used. Note: this isn't an adequate solution on its own. It's acceptable as a way to get some minimal 4.1 up and working, but we're going to have to find a way to avoid returning DELAY in all common cases before 4.1 can really be considered ready. Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy [nfsd41: reverse rq_nodeferral negative logic] Signed-off-by: Benny Halevy [sunrpc: initialize rq_usedeferral] Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 6bb597507f9839b13498781e481f5458aea33620 Merge: 09f38dc c5c67c7 Author: Linus Torvalds Date: Fri Apr 3 17:36:21 2009 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, mtrr: remove debug message x86: disable stack-protector for __restore_processor_state() x86: fix is_io_mapping_possible() build warning on i386 allnoconfig x86, setup: compile with -DDISABLE_BRANCH_PROFILING x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros x86, mm: fix misuse of debug_kmap_atomic x86: remove duplicated code with pcpu_need_numa() x86,percpu: fix inverted NUMA test in setup_pcpu_remap() x86: signal: check sas_ss_size instead of sas_ss_flags() commit 09f38dc19deba9eae1d668dde8bdd2aaed3479ed Merge: 30a39e0 bbb76b5 Author: Linus Torvalds Date: Fri Apr 3 17:35:06 2009 -0700 Merge branch 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ptrace: remove a useless goto commit 30a39e0e97f948e3ac8eeacd54d09f4bbfbab64b Merge: c7edad5 4a44bac Author: Linus Torvalds Date: Fri Apr 3 17:34:41 2009 -0700 Merge branch 'stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: symbols, stacktrace: look up init symbols after module symbols commit c7edad5fcb86c4398f9ab2ccea82ddcc067b88af Merge: b1dbb67 f69b17d Author: Linus Torvalds Date: Fri Apr 3 17:34:12 2009 -0700 Merge branch 'rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rcu: rcu_barrier VS cpu_hotplug: Ensure callbacks in dead cpu are migrated to online cpu commit b1dbb67911fecb290db3f566281bcd9ccc9dc6df Merge: 492f59f 70f4544 Author: Linus Torvalds Date: Fri Apr 3 17:33:30 2009 -0700 Merge branch 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: s390: remove arch specific smp_send_stop() panic: clean up kernel/panic.c panic, smp: provide smp_send_stop() wrapper on UP too panic: decrease oops_in_progress only after having done the panic generic-ipi: eliminate WARN_ON()s during oops/panic generic-ipi: cleanups generic-ipi: remove CSD_FLAG_WAIT generic-ipi: remove kmalloc() generic IPI: simplify barriers and locking commit 492f59f526d95e73028f57bff475b4bbe3c8cb72 Merge: f945b7a 7bee946 Author: Linus Torvalds Date: Fri Apr 3 17:29:53 2009 -0700 Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit] lockdep: remove duplicate CONFIG_DEBUG_LOCKDEP definitions lockdep: require framepointers for x86 lockdep: remove extra "irq" string lockdep: fix incorrect state name commit 786c221a37d3931189d9c9421f63dec92f4d698b Author: Suresh Siddha Date: Mon Mar 30 14:05:50 2009 -0800 ACPI: update x2apic comments Signed-off-by: Suresh Siddha Signed-off-by: Len Brown commit 7237d3de78ff89ec2e18eae5fe962d063024fef5 Author: Suresh Siddha Date: Mon Mar 30 13:55:30 2009 -0800 x86, ACPI: add support for x2apic ACPI extensions All logical processors with APIC ID values of 255 and greater will have their APIC reported through Processor X2APIC structure (type-9 entry type) and all logical processors with APIC ID less than 255 will have their APIC reported through legacy Processor Local APIC (type-0 entry type) only. This is the same case even for NMI structure reporting. The Processor X2APIC Affinity structure provides the association between the X2APIC ID of a logical processor and the proximity domain to which the logical processor belongs. For OSPM, Procssor IDs outside the 0-254 range are to be declared as Device() objects in the ACPI namespace. Signed-off-by: Suresh Siddha Signed-off-by: Len Brown commit c5c67c7cba6a652d1c62dce45b0c130e5cb2a802 Author: Ingo Molnar Date: Sat Apr 4 00:31:02 2009 +0200 x86, mtrr: remove debug message The MTRR code grew a new debug message which triggers commonly: [ 40.142276] get_mtrr: cpu0 reg00 base=0000000000 size=0000080000 write-back [ 40.142280] get_mtrr: cpu0 reg01 base=0000080000 size=0000040000 write-back [ 40.142284] get_mtrr: cpu0 reg02 base=0000100000 size=0000040000 write-back [ 40.142311] get_mtrr: cpu0 reg00 base=0000000000 size=0000080000 write-back [ 40.142314] get_mtrr: cpu0 reg01 base=0000080000 size=0000040000 write-back [ 40.142317] get_mtrr: cpu0 reg02 base=0000100000 size=0000040000 write-back Remove this annoyance. Reported-by: Linus Torvalds Signed-off-by: Ingo Molnar commit f945b7abcb6cfd3106c9855aa2aa6e4396a19d76 Merge: 04c860c fc280c9 Author: Linus Torvalds Date: Fri Apr 3 15:27:58 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: allow private mappings of "direct_io" files fuse: allow kernel to access "direct_io" files commit 04c860c188ebdcf396fd50751592fb5a9f51287a Author: Alan Cox Date: Fri Apr 3 14:50:52 2009 +0100 LANANA: Change of management and resync Bring the devices.txt back into some relationship with reality. Update the documentation a bit. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 5fba0925fd6b67d94181055b7222e3d934b4efee Merge: 811158b 621de59 Author: Linus Torvalds Date: Fri Apr 3 15:25:44 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: remove compat stuff HID: constify arrays of struct apple_key_translation HID: add support for Kye/Genius Ergo 525V HID: Support Apple mini aluminum keyboard HID: support for Kensington slimblade device HID: DragonRise game controller force feedback driver HID: add support for another version of 0e8f:0003 device in hid-pl HID: fix race between usb_register_dev() and hiddev_open() HID: bring back possibility to specify vid/pid ignore on module load HID: make HID_DEBUG defaults consistent HID: autosuspend -- fix lockup of hid on reset HID: hid_reset_resume() needs to be defined only when CONFIG_PM is set HID: fix USB HID devices after STD with autosuspend HID: do not try to compile PM code with CONFIG_PM unset HID: autosuspend support for USB HID commit 811158b147a503fbdf9773224004ffd32002d1fe Merge: 4e76c5c b26e0ed Author: Linus Torvalds Date: Fri Apr 3 15:24:35 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits) trivial: Update my email address trivial: NULL noise: drivers/mtd/tests/mtd_*test.c trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h trivial: Fix misspelling of "Celsius". trivial: remove unused variable 'path' in alloc_file() trivial: fix a pdlfush -> pdflush typo in comment trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL trivial: wusb: Storage class should be before const qualifier trivial: drivers/char/bsr.c: Storage class should be before const qualifier trivial: h8300: Storage class should be before const qualifier trivial: fix where cgroup documentation is not correctly referred to trivial: Give the right path in Documentation example trivial: MTD: remove EOL from MODULE_DESCRIPTION trivial: Fix typo in bio_split()'s documentation trivial: PWM: fix of #endif comment trivial: fix typos/grammar errors in Kconfig texts trivial: Fix misspelling of firmware trivial: cgroups: documentation typo and spelling corrections trivial: Update contact info for Jochen Hein trivial: fix typo "resgister" -> "register" ... commit 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd Merge: b983471 65127d2 Author: Linus Torvalds Date: Fri Apr 3 15:15:25 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6: (21 commits) xtensa: we don't need to include asm/io.h xtensa: only build platform or variant if they contain a Makefile xtensa: make startup code discardable xtensa: ccount clocksource xtensa: remove platform rtc hooks xtensa: use generic sched_clock() xtensa: platform: s6105 xtensa: let platform override KERNELOFFSET xtensa: s6000 variant xtensa: s6000 variant core definitions xtensa: variant irq set callbacks xtensa: variant-specific code xtensa: nommu support xtensa: add flat support xtensa: enforce slab alignment to maximum register width xtensa: cope with ram beginning at higher addresses xtensa: don't make bootmem bitmap larger than required xtensa: fix init_bootmem_node() argument order xtensa: use correct stack pointer for stack traces xtensa: beat Kconfig into shape ... commit b983471794e568fd71fa767da77a62ba517c3e63 Merge: 5a3ae27 c293498 Author: Linus Torvalds Date: Fri Apr 3 15:14:44 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: BUG to BUG_ON changes Btrfs: remove dead code Btrfs: remove dead code Btrfs: fix typos in comments Btrfs: remove unused ftrace include Btrfs: fix __ucmpdi2 compile bug on 32 bit builds Btrfs: free inode struct when btrfs_new_inode fails Btrfs: fix race in worker_loop Btrfs: add flushoncommit mount option Btrfs: notreelog mount option Btrfs: introduce btrfs_show_options Btrfs: rework allocation clustering Btrfs: Optimize locking in btrfs_next_leaf() Btrfs: break up btrfs_search_slot into smaller pieces Btrfs: kill the pinned_mutex Btrfs: kill the block group alloc mutex Btrfs: clean up find_free_extent Btrfs: free space cache cleanups Btrfs: unplug in the async bio submission threads Btrfs: keep processing bios for a given bdev if our proc is batching commit ba0e1ebb7ea0616eebc29d2077355bacea62a9d8 Author: Mithlesh Thukral Date: Wed Mar 25 15:52:54 2009 +0530 Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers Specify a license for the Alacritech Sahara (10Gbe) and SLICOSS (1GBE) firmware files. Signed-off-by: Christopher Harrer Signed-off-by: Mithlesh Thukral Signed-off-by: Greg Kroah-Hartman commit 19be358212af35bd64d449da82279874099a1a85 Author: Greg Kroah-Hartman Date: Fri Apr 3 13:55:23 2009 -0700 Staging: serqt_usb: fix build due to proc tty changes Just delete the proc tty usage in the driver as it's not needed and will go away when it switches over to a usb-serial driver. This fixes the build error in the driver. Signed-off-by: Greg Kroah-Hartman commit c23ee6c30e951521cc1371094d8cf472610b7026 Author: Greg Kroah-Hartman Date: Tue Mar 24 09:39:28 2009 -0700 Staging: serqt_usb: fix checkpatch errors Clean up the code so it's at least readable now, fixing the checkpatch errors. Signed-off-by: Greg Kroah-Hartman commit 68bf9916d5ba55c81edee7cc9dfb1ab63792cb4f Author: Greg Kroah-Hartman Date: Mon Mar 23 17:09:40 2009 -0700 Staging: serqt_usb: add TODO file Adds a TODO file Signed-off-by: Greg Kroah-Hartman commit a9ea226670ffe24dd9b2f8ccc0909dfb14e35dd1 Author: Greg Kroah-Hartman Date: Mon Mar 23 17:07:37 2009 -0700 Staging: serqt_usb: Lindent the code Run Lindent on the code to give us someplace to work from Signed-off-by: Greg Kroah-Hartman commit 5ca0121ff24d2efba208a0f6df2cb6e372170d1d Author: Greg Kroah-Hartman Date: Mon Mar 23 16:43:59 2009 -0700 Staging: add USB serial Quatech driver Add support for all Quatech usb to serial devices. Based on an original driver from Quatech. Cleaned up and forward ported by me. It's a mess, uses it's own tty layer interface, and the coding style is horrible. Cc: Tim Gobeli Signed-off-by: Greg Kroah-Hartman commit 4e9bf410dc6006e95aba512272747bc8f30e7a20 Author: Greg Kroah-Hartman Date: Sun Mar 22 21:44:31 2009 +0100 staging: document that the wifi staging drivers a bit better The Linux wireless developers don't want to hear anything about the staging wireless drivers, for a wide range of miopic reasons. The following patch, based on a patch from Johannes Berg, tries to document this issue a bit better. Cc: Johannes Berg Signed-off-by: Greg Kroah-Hartman commit dc57a3ea80a85a74094b873a693c3e07b2cb5da4 Author: Alexander Beregalov Date: Thu Mar 12 03:32:45 2009 +0300 Staging: echo cleanup before: errors lines of code errors/KLOC drivers/staging/echo/ 213 1701 125.2 after: errors lines of code errors/KLOC drivers/staging/echo/ 8 1685 4.7 Compile tested. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 2961f24f78f456a0a2d0dada56ee795232fe21b3 Author: Stoyan Gaydarov Date: Tue Mar 10 00:10:27 2009 -0500 Staging: BUG to BUG_ON changes Signed-off-by: Stoyan Gaydarov Signed-off-by: Greg Kroah-Hartman commit 0773a5c07641ddef7f94636292921e12f2efab02 Author: Wei Yongjun Date: Wed Feb 25 18:26:33 2009 +0800 Staging: remove some pointless conditionals before kfree_skb() Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun Signed-off-by: Greg Kroah-Hartman commit bbe364ddedd84ee5a4bec65fa0ca56caf09d6802 Author: Randy Dunlap Date: Wed Mar 18 10:00:16 2009 -0700 Staging: line6: fix build error, select SND_RAWMIDI line6 needs to select SND_RAWMIDI, like many other drivers do. ERROR: "snd_rawmidi_set_ops" [drivers/staging/line6/line6usb.ko] undefined! ERROR: "snd_rawmidi_new" [drivers/staging/line6/line6usb.ko] undefined! ERROR: "snd_rawmidi_transmit_peek" [drivers/staging/line6/line6usb.ko] undefined! ERROR: "snd_rawmidi_transmit_ack" [drivers/staging/line6/line6usb.ko] undefined! ERROR: "snd_rawmidi_receive" [drivers/staging/line6/line6usb.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 9cd57f777724b941cd2e22a7124be7c09bb3132b Author: Greg Kroah-Hartman Date: Fri Feb 27 22:43:57 2009 -0800 Staging: line6: fix checkpatch errors in variax.c Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 6353773b5230514d4f1d3dc98a84a72e3a954e87 Author: Greg Kroah-Hartman Date: Fri Feb 27 22:43:45 2009 -0800 Staging: line6: fix checkpatch errors in toneport.c Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 68dc3dde0213c0560b6117998088f3e992934d37 Author: Greg Kroah-Hartman Date: Fri Feb 27 22:43:30 2009 -0800 Staging: line6: fix checkpatch errors in pcm.c Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit ce9b490cbf1cffa988fce64e6ff824bdd241d87e Author: Greg Kroah-Hartman Date: Fri Feb 27 22:43:11 2009 -0800 Staging: line6: fix checkpatch errors in midibuf.c Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit d7e3733619a612ffabced37c878b9d30f060ff69 Author: Greg Kroah-Hartman Date: Fri Feb 27 22:42:55 2009 -0800 Staging: line6: fix checkpatch errors in midi.c Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 766f9d20a1b1fcf5c84b3eb1d96f35a4d882cdeb Author: Greg Kroah-Hartman Date: Fri Feb 27 22:42:34 2009 -0800 Staging: line6: fix checkpatch errors in dumprequest.c Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 36445bc118848df0eed1e2da400b2b66041a2c9c Author: Greg Kroah-Hartman Date: Fri Feb 27 22:42:18 2009 -0800 Staging: line6: fix checkpatch errors in driver.c Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit dfc70567d76b9d506855fd5b334a4dd0ebdf1aa7 Author: Greg Kroah-Hartman Date: Fri Feb 27 22:41:54 2009 -0800 Staging: line6: fix checkpatch errors in audio.c Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 0fdef36aca8a2900d3a5c113f6973d84cf38d7b7 Author: Greg Kroah-Hartman Date: Fri Feb 27 22:41:29 2009 -0800 Staging: line6: fix checkpatch errors in pod.c 2 errors left, but they are minor. Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 010f378e8c839a03f7741c95791a7b9980a9cdc2 Author: Greg Kroah-Hartman Date: Fri Feb 27 22:41:12 2009 -0800 Staging: line6: fix checkpatch errors in playback.c 2 errors left, but they are minor. Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 9a92fadcc6731de03d6bdcf8fbfce08533d13523 Author: Greg Kroah-Hartman Date: Fri Feb 27 22:40:27 2009 -0800 Staging: line6: fix checkpatch errors in control.c 1 error left, but it's minor. Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 6efc5667ef588df7156e1c481383f8dbff4fa409 Author: Greg Kroah-Hartman Date: Fri Feb 27 22:39:22 2009 -0800 Staging: line6: fix checkpatch errors in capture.c 2 errors left, but they are minor. Lots of warnings also fixed up. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit a49e483835823ab97028f396531d83b6668734cf Author: Greg Kroah-Hartman Date: Fri Feb 27 21:09:55 2009 -0800 Staging: line6: coding style cleanups for .h files. Mostly all line length issues. Skipped the control.h file as it makes sense to leave it alone. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 536165d8ef6933131bf7166338eafa77b75f8bb7 Author: Greg Kroah-Hartman Date: Fri Feb 27 20:49:46 2009 -0800 Staging: line6: fix up NULL assignment mistakes Should use NULL for a pointer, not 0, otherwise sparse complains. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit b702ed253d33d056987e92299687d8ed85195896 Author: Greg Kroah-Hartman Date: Fri Feb 27 20:45:03 2009 -0800 Staging: line6: static function cleanups This fixes all of the static function warnings that sparse complains about. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 4cb8f302738bd4d1fb5e2b909b735e8826558fbf Author: Greg Kroah-Hartman Date: Fri Feb 27 20:32:10 2009 -0800 Staging: line6: remove KERNEL_VERSION checks As the code is in the kernel tree, it's no longer needed. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 0c7ab1580f82d882478db61467005693b4b4c063 Author: Greg Kroah-Hartman Date: Fri Feb 27 20:28:04 2009 -0800 Staging: line6: remove PT_REGS As the code is in the kernel tree, it's no longer needed. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 77491e524ccb78adfad9cdc1b0b175c4e9fd0368 Author: Greg Kroah-Hartman Date: Fri Feb 27 20:25:43 2009 -0800 Staging: line6: remove DEVICE_ATTRIBUTE As the code is in the kernel tree, it's no longer needed. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 7e60fcb54f32e30f065a77b30f03370a287fda99 Author: Randy Dunlap Date: Mon Mar 2 09:54:57 2009 -0800 Staging: line6: depends on SND line6 code has lots of dependencies on ALSA (and build errors), so express that in Kconfig. Signed-off-by: Randy Dunlap Cc: Markus Grabner Signed-off-by: Greg Kroah-Hartman commit 4b5e781dc8d981e9c58926464fc1fff16a8804ff Author: Greg Kroah-Hartman Date: Fri Feb 27 19:50:03 2009 -0800 Staging: line6: add to the build This adds the line6 driver to the build system. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 4717b03b56fedd1c44fe6a0701cd4e36e97efbab Author: Greg Kroah-Hartman Date: Fri Feb 27 19:49:00 2009 -0800 Staging: line6: fix bus_id usage bus_id is now gone in the linux-next tree, so replace it with dev_name() so the code works properly. Cc: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit 705ececd1c60d0f5d6ef2a719008847883516970 Author: Markus Grabner Date: Fri Feb 27 19:43:04 2009 -0800 Staging: add line6 usb driver This is an experimental Linux driver for the guitar amp, cab, and effects modeller PODxt Pro by Line6 (and similar devices), supporting the following features: - Reading/writing individual parameters - Reading/writing complete channel, effects setup, and amp setup data - Channel switching - Virtual MIDI interface - Tuner access - Playback/capture/mixer device for any ALSA-compatible PCM audio application - Signal routing (record clean/processed guitar signal, re-amping) Moreover, preliminary support for the Variax Workbench is included. From: Markus Grabner Cc: Mariusz Kozlowski Signed-off-by: Greg Kroah-Hartman commit e642f09951f7cbb69983781b07bb9cd881546ac4 Author: Greg Kroah-Hartman Date: Wed Feb 25 16:14:55 2009 -0800 Staging: add rt3070 wireless driver This is the Ralink RT3070 driver from the company that does horrible things like reading a config file from /etc. However, the driver that is currently under development from the wireless development community is not working at all yet, so distros and users are using this version instead (quite common hardware on a lot of netbook machines). So here is this driver, for now, until the wireless developers get a "clean" version into the main tree, or until this version is cleaned up sufficiently to move out of the staging tree. Ported to the Linux build system, fixed lots of build issues, forward ported to the current kernel version, and other minor cleanups were all done by me. Cc: Linux wireless Signed-off-by: Greg Kroah-Hartman commit 21a6a6e9f81fb26fbcecbb1304018d34dcd1794f Author: Greg Kroah-Hartman Date: Wed Feb 25 13:11:52 2009 -0800 Staging: heci: add TODO file List some of the remaining issues in the code. Cc: Anas Nashif Cc: Marcin Obara Signed-off-by: Greg Kroah-Hartman commit c4739ea63c56928103bc1748c6d9b1df5d815a02 Author: Greg Kroah-Hartman Date: Wed Feb 25 13:06:49 2009 -0800 Staging: heci: fix some sparse warnings This resolves a lot of the more obvious sparse warnings in the code. There still are some major problems in the ioctl handlers dealing with user and kernel pointers that this patch does not resolve, that needs to be addressed still. Also, the locking seems to be a bit strange in places, which sparse points out, that too need to be resolved. Cc: Anas Nashif Cc: Marcin Obara Signed-off-by: Greg Kroah-Hartman commit bc154a3862260ef8d83ff750daa1b6cfbfa129cc Author: Greg Kroah-Hartman Date: Wed Feb 25 12:41:16 2009 -0800 Staging: heci: fix checkpatch warnings This resolves the outstanding scripts/checkpatch.pl warnings Cc: Anas Nashif Cc: Marcin Obara Signed-off-by: Greg Kroah-Hartman commit 441926795d77a3da1be99dca1720130cf46c728b Author: Greg Kroah-Hartman Date: Wed Feb 25 12:36:14 2009 -0800 Staging: heci: remove kcompat.h It's not needed now that we are now in the main kernel tree. Cc: Anas Nashif Cc: Marcin Obara Signed-off-by: Greg Kroah-Hartman commit d52b3d9c720a88d9268c92060740ed0cf87795d5 Author: Marcin Obara Date: Wed Feb 25 12:29:24 2009 -0800 Staging: add heci driver The Intel Management Engine Interface (aka HECI: Host Embedded Controller Interface ) enables communication between the host OS and the Management Engine firmware. MEI is bi-directional, and either the host or Intel AMT firmware can initiate transactions. The core hardware architecture of Intel Active Management Technology (Intel AMT) is resident in firmware. The micro-controller within the chipset's graphics and memory controller (GMCH) hub houses the Management Engine (ME) firmware, which implements various services on behalf of management applications. Some of the ME subsystems that can be access via MEI driver: - Intel(R) Quiet System Technology (QST) is implemented as a firmware subsystem that runs in the ME. Programs that wish to expose the health monitoring and fan speed control capabilities of Intel(R) QST will need to use the MEI driver to communicate with the ME sub-system. - ASF is the "Alert Standard Format" which is an DMTF manageability standard. It is implemented in the PC's hardware and firmware, and is managed from a remote console. Most recent Intel desktop chipsets have one or more of the above ME services. The MEI driver will make it possible to support the above features on Linux and provides applications access to the ME and it's features. Signed-off-by: Anas Nashif Signed-off-by: Marcin Obara Signed-off-by: Greg Kroah-Hartman commit 2418a628ff9d1cfc4fecd9899f915326ff6e7b96 Author: Greg Kroah-Hartman Date: Tue Feb 24 20:37:55 2009 -0800 Staging: p9auth: clean up #includes Not all of these files needed to be included, clean up the list. Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit 6d0d63bd7a9c0a6373c7759cb55580b806269dae Author: Greg Kroah-Hartman Date: Tue Feb 24 20:31:39 2009 -0800 Staging: p9auth: use kzalloc It's nicer than doing kmalloc/memset. Also check the return value of all allocations, one was previously not being checked properly. Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit 0f386e2b4c6109164e82277513a9570fc9ec644c Author: Greg Kroah-Hartman Date: Tue Feb 24 20:25:02 2009 -0800 Staging: p9auth: fix up sparse warnings Everything needs to be static, as sparse complains and you don't want to polute the global kernel symbol namespace. So mark everything as such and move one function around to prevent a forward declaration from being needed. Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit 77dc1139f4a125d46e03fdbb3ac8ab8737ab67d6 Author: Greg Kroah-Hartman Date: Tue Feb 24 20:21:55 2009 -0800 Staging: p9auth: fix up codingstyle issues This fixes up a number of scripts/codingstyle.pl warnings and errors Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit 4bf0438332d5173836fdc2d6471fec526d0a14a8 Author: Greg Kroah-Hartman Date: Tue Feb 24 20:11:39 2009 -0800 Staging: p9auth: remove unneeded header file The p9auth.h file is not needed, move the stuff into p9auth.c file and delete it. Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit 9752ef46c6d32b7ccf10b874f00e433844db2b1a Author: Randy Dunlap Date: Tue Mar 10 11:59:36 2009 -0700 Staging: p9auth: fix dependency/build error Fix p9auth dependency/build failure. It needs to depend on CRYPTO. p9auth.c:(.text+0x107297): undefined reference to `crypto_alloc_base' p9auth.c:(.text+0x1073d4): undefined reference to `crypto_destroy_tfm' Signed-off-by: Randy Dunlap Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit 00db8a8ecc91abeb46d1128a788a194018c51e77 Author: Greg Kroah-Hartman Date: Tue Feb 24 20:08:20 2009 -0800 Staging: p9auth: add to the kernel build This adds the p9auth code to the kernel build Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit 5dba0826999683fe39aa8b49480b0e953afd117a Author: Greg Kroah-Hartman Date: Tue Feb 24 20:06:34 2009 -0800 Staging: p9auth: fix credential logic current->uid is no longer allowed in the 2.6.29 kernel, so use the proper credential api to be able to alter the uid and euid values. Note, this now builds properly, hopefully still works properly, would be good for someone to test it out... Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit 55643171de7ba429fbf2cb72fb1f2c6f2df0dcf3 Author: Ashwin Ganti Date: Tue Feb 24 19:48:44 2009 -0800 Staging: add p9auth driver This is a driver that adds Plan 9 style capability device implementation. From: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit bea3e747f3ff1abe8d7f730bbf7d195f0e14d6ad Author: Greg Kroah-Hartman Date: Mon Mar 23 13:42:58 2009 -0700 Staging: epl: remove pointless highres timer check The code only gets built if this option is enabled, so don't check for it in the code again. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 7c14e54458b7f419fbaa802657c2535b2fdf217e Author: Greg Kroah-Hartman Date: Mon Mar 23 13:41:23 2009 -0700 Staging: epl: don't check for devfs devfs is long dead and burried, don't check for it, as it doesn't make any sense to do so. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 70e2db22bd520018b39ea7d50ebbcec5042efd9f Author: Greg Kroah-Hartman Date: Mon Mar 23 13:39:35 2009 -0700 Staging: epl: fix up epl/kernel/*.h files Only include a file if it's needed. Also remove some unused comments from the boilerplate text. And delete some empty .h files Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 046f45fa714046ac400e22f48ec8ac77e7faf5cc Author: Greg Kroah-Hartman Date: Mon Mar 23 13:38:43 2009 -0700 Staging: epl: fix up epl/user/*.h files Only include a file if it's needed. Also remove some unused comments from the boilerplate text. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit d9068d622f6e8aeaba4049b6d4953cebc2b90938 Author: Greg Kroah-Hartman Date: Mon Mar 23 13:26:29 2009 -0700 Staging: epl: remove EPLDLLEXPORT This isn't a DLL, so we don't need this :) Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit e05ab09aeb36c55f0f3fe3146f9a87ddad9497bf Author: Greg Kroah-Hartman Date: Mon Mar 23 13:12:00 2009 -0700 Staging: epl: fix sparse warning in proc_fs.c proc_fs.c needs to include proc_fs.h Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit b3491294994bf9d2b86d400132416ac95ef6b33a Author: Greg Kroah-Hartman Date: Mon Mar 23 13:07:51 2009 -0700 Staging: epl: remove kernel version checks They are no longer needed now that we are in the kernel. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 01f5e0322d5e04049f0b1fb5d747d088dec45241 Author: Greg Kroah-Hartman Date: Mon Mar 23 13:05:08 2009 -0700 Staging: epl: clean up demo_main.c Fix some static symbols and drop the kernel version checks. Also comment out the init and exit functions, as they don't get used anymore. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 85df0b85205a716feeaea7caecbb274d422d3b7b Author: Greg Kroah-Hartman Date: Mon Mar 23 13:01:08 2009 -0700 Staging: epl: fix up some non-ANSI functions () isn't valid, you need to put (void). Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit dcf5371cdea03b09b6cc506d2cd538138bd643a8 Author: Greg Kroah-Hartman Date: Mon Mar 23 12:57:39 2009 -0700 Staging: epl: remove WORD It's u16 in kernelspace, not WORD. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit d539cfb03ad31e4ba5d6b18ea65954da9a785fe6 Author: Greg Kroah-Hartman Date: Mon Mar 23 12:51:37 2009 -0700 Staging: epl: remove DWORD It's u32 in kernelspace, not DWORD. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit a5c30d94b226ca473b1001b382e9e465921f8301 Author: Greg Kroah-Hartman Date: Mon Mar 23 12:43:05 2009 -0700 Staging: epl: remove QWORD It's u64 in kernelspace, not QWORD. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 2ed53cf8a523d3e2fc133d892f8d040c3fc9656d Author: Greg Kroah-Hartman Date: Mon Mar 23 12:36:38 2009 -0700 Staging: epl: remove BYTE It's u8 in kernelspace, not BYTE. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 48c13450c82817f6ce2d33fdb3692a759817c00b Author: Greg Kroah-Hartman Date: Mon Mar 23 12:30:36 2009 -0700 Staging: epl: delete EdrvFec5282.h No one is using it. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 5d9d5eb2bf0f31e41851c4cee01f7ba51dd11bf2 Author: Greg Kroah-Hartman Date: Mon Mar 23 12:24:46 2009 -0700 Staging: epl: remove CONST Just make it const Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit e6cc5eac8a823fb9674f46cd5050d607009b4a72 Author: Greg Kroah-Hartman Date: Mon Mar 23 12:21:08 2009 -0700 Staging: epl: remove some unused types SHORT, USHORT, INT, UINT, LONG, and ULONG aren't used, so delete them. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit c7c38309e4709b4cce4b9c6373e7f1dd7d2d8c8c Author: Greg Kroah-Hartman Date: Mon Mar 23 12:12:46 2009 -0700 Staging: epl: remove compiler warning from SharedBuff.c Yeah, it's a buffer, but this sure can't hurt as it's not easy to unwind where it's coming from. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit b852ba7d38a210b2d23c514f191582033b371e89 Author: Greg Kroah-Hartman Date: Mon Mar 23 12:10:47 2009 -0700 Staging: epl: remove REENTRANT It's not used and is not needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 5e9f6bc67d44c7b73208d4038b8a637ff942ca52 Author: Greg Kroah-Hartman Date: Mon Mar 23 12:09:26 2009 -0700 Staging: epl: remove MEM It's not used and is not needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 5318487c34b99de4f9978ae1a8f963d25d767734 Author: Greg Kroah-Hartman Date: Mon Mar 23 11:48:19 2009 -0700 Staging: epl: remove ROM It's not used and is not needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit f15a88fae1b75bfcf19d25e557d7ef5301562ec6 Author: Greg Kroah-Hartman Date: Mon Mar 23 11:44:31 2009 -0700 Staging: epl: remove FAR It's not used and is not needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 44b71174dfe579690c8f91d51763e05ca72169e2 Author: Greg Kroah-Hartman Date: Mon Mar 23 11:39:15 2009 -0700 Staging: epl: remove NEAR It wasn't used and isn't needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit bd3966d5dc109a7f5cfcd7e14a851acc18d69324 Author: Greg Kroah-Hartman Date: Mon Mar 23 11:37:22 2009 -0700 Staging: epl: remove GENERIC It wasn't used and isn't needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 9c91f7b4aaa0c37af0f1dd9085c0eabf7cb880a8 Author: Greg Kroah-Hartman Date: Mon Mar 23 11:34:49 2009 -0700 Staging: epl: remove EplObjDef.h No one was using it, so delete it. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 197105a5349d69fff902149cbe7fe7475561d69a Author: Greg Kroah-Hartman Date: Mon Mar 23 11:33:12 2009 -0700 Staging: epl: unwind rest of _LINUX_ #ifdefs All the non-Linux #defines are now resolved, so remove the board/system type defines as they are not needed anymore. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 541a8bde90068471e9fc26cfe4c5fcb11dcd751b Author: Greg Kroah-Hartman Date: Mon Mar 23 11:19:28 2009 -0700 Staging: epl: remove __KERNEL__ checks We are in the kernel, so these checks are pointless. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 563b125de36c91722f038f11da374d49de168917 Author: Greg Kroah-Hartman Date: Mon Mar 23 11:14:48 2009 -0700 Staging: epl: remove INLINE mess extern inline isn't the nicest and it doesn't really make sense. So unwind all the INLINE defines and includes, if speed is _really_ an issue later stuff can be put back in a sane manner. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 54e49dddd0983a1f4612e1843a2b193940a4e985 Author: Greg Kroah-Hartman Date: Mon Mar 23 10:54:14 2009 -0700 Staging: epl: remove _WIN_32_ and _NO_OS_ defines They are not used. Also remove the code that was looking for them. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit d10f46992fb59de804550999806e1e0c0aa335a8 Author: Greg Kroah-Hartman Date: Mon Mar 23 10:45:12 2009 -0700 Staging: epl: remove PUBLIC definition It doesn't make sense here, so delete it. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 335914e315103100dd27a648744fd2440d31075d Author: Greg Kroah-Hartman Date: Mon Mar 23 09:33:20 2009 -0700 Staging: epl: remove NULL from global.h Don't define something that is already defined in the kernel. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit b4a4d56898aac07ac98488c1bc3193fe4f2e126d Author: Greg Kroah-Hartman Date: Mon Mar 23 09:31:01 2009 -0700 Staging: epl: remove complier macros from global.h As we are only building within the Linux kernel, remove all of the different system types from global.h, they are not needed at all. First step of many to clean up the code to match the kernel coding style rules. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 06c86229b04ca6909d2815da9db0ae2ae5ecee1e Author: Greg Kroah-Hartman Date: Mon Mar 23 09:12:08 2009 -0700 Staging: epl: remove unneeded files There were 3 .c files that was not used in the drivers/staging/epl/ directory. This patch removes these unused files. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman commit 0191492309432aab9c1e224691dcb05a3563726a Author: Greg Kroah-Hartman Date: Fri Mar 20 21:34:38 2009 -0700 Staging: comedi: fix 64bit build errors This patch fixes the 64bit build errors in the comedi code. Reported-by: Randy Dunlap Cc: Alessio Igor Bogani Signed-off-by: Greg Kroah-Hartman commit 180027136b30d25f3824573e77c080056dc3e6d4 Author: Bill Pemberton Date: Thu Mar 19 18:00:52 2009 -0400 Staging: comedi: Remove CHAR, *PCHAR, and *PCSTR typedefs in addi-data Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 3019b4106bf8c2658343a84361f4f1abb6280633 Author: Bill Pemberton Date: Thu Mar 19 18:00:47 2009 -0400 Staging: comedi: Remove use of VOID typedef in addi-data Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 63aa142aca0e4b63347e91b8c6909fbad7e7c7ac Author: Bill Pemberton Date: Thu Mar 19 18:00:42 2009 -0400 Staging: comedi: Remove me4000_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 126974dc8c432535f9eef36956056b88a153bfb3 Author: Bill Pemberton Date: Thu Mar 19 18:00:37 2009 -0400 Staging: comedi: Remove me4000_cnt_context_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit ff585603bdca766398e24037e9375b76507e2e60 Author: Bill Pemberton Date: Thu Mar 19 18:00:31 2009 -0400 Staging: comedi: Remove me4000_dio_context_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 8b95a0e17f416e1db80c26ecd8f3e894ad271d0b Author: Bill Pemberton Date: Thu Mar 19 18:00:26 2009 -0400 Staging: comedi: Remove me4000_ai_context_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 21921108bef40b75495301f5dd3d992ed66a7ba8 Author: Bill Pemberton Date: Thu Mar 19 18:00:21 2009 -0400 Staging: comedi: Remove me4000_ao_context_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 27f4caaa3b27badb3e245a50b09ba35f040f3a77 Author: Bill Pemberton Date: Thu Mar 19 18:00:16 2009 -0400 Staging: comedi: Remove me4000_board_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 79dcd042246ea49879bc9c15ed6592848f2f3828 Author: Bill Pemberton Date: Thu Mar 19 18:00:10 2009 -0400 Staging: comedi: Remove me4000_cnt_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit e81d65b30ccc3f663f7bb3158567c247c3084ece Author: Bill Pemberton Date: Thu Mar 19 18:00:05 2009 -0400 Staging: comedi: Remove me4000_dio_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0c18e8c046b5ec21e9e0b458807db260309a8f5d Author: Bill Pemberton Date: Thu Mar 19 18:00:00 2009 -0400 Staging: comedi: Remove me4000_ai_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 8d95123295fde18ac22cfeb8eaa0dcc05898b35b Author: Bill Pemberton Date: Thu Mar 19 17:59:55 2009 -0400 Staging: comedi: Remove me4000_ao_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 05d21f4af416d9c7e1c8458a00efd69e44c3dc8c Author: Bill Pemberton Date: Thu Mar 19 17:59:49 2009 -0400 Staging: comedi: Remove das08_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 2e93aa5b5b8050090a22e162f9af6b18ca3ec47a Author: Bill Pemberton Date: Thu Mar 19 17:59:44 2009 -0400 Staging: comedi: Remove nidio96_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 30570f0dee2b0e3ede09e08eb5dfd514317a7587 Author: Bill Pemberton Date: Thu Mar 19 17:59:39 2009 -0400 Staging: comedi: ni_daq_700.c: Remove local_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4cab3740734fb8582fa68f899105790c05935b55 Author: Bill Pemberton Date: Thu Mar 19 17:59:34 2009 -0400 Staging: comedi: Remove dio700_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 8c8a28852be4e876afdac208a41ab001dc817f99 Author: Bill Pemberton Date: Thu Mar 19 17:59:28 2009 -0400 Staging: comedi: Remove atmio16d_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 01983c39f023efa7204eb6b61480d5c495124240 Author: Bill Pemberton Date: Thu Mar 19 17:59:23 2009 -0400 Staging: comedi: Remove atao_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 92b635c5bea18d7eb3c46bfdcc930d9d86d3d177 Author: Bill Pemberton Date: Thu Mar 19 17:59:18 2009 -0400 Staging: comedi: Remove a2150_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 43313b07343b81463c8edd99a8c315c6dc2d5c7d Author: Bill Pemberton Date: Thu Mar 19 17:59:12 2009 -0400 Staging: comedi: Remove ni_670x_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit b3be94eade6d07270e2a89599f99d42bbcfd6e84 Author: Bill Pemberton Date: Thu Mar 19 17:59:07 2009 -0400 Staging: comedi: Remove ni_660x_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 50792813130b94a64e34b89cd2cbfddeb85b7518 Author: Bill Pemberton Date: Thu Mar 19 17:59:02 2009 -0400 Staging: comedi: Remove ni_660x_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 251411cf05f3e7630f600a89f51fe9a82da967f8 Author: Bill Pemberton Date: Thu Mar 19 17:58:57 2009 -0400 Staging: comedi: Remove NI_660x_Register typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 6179e3e9bbec5df830ccca3970df80967347b410 Author: Bill Pemberton Date: Thu Mar 19 17:58:51 2009 -0400 Staging: comedi: Remove ni_65xx_subdevice_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 47c30a2cc336d493d624d8437f41c19a270bb672 Author: Bill Pemberton Date: Thu Mar 19 17:58:46 2009 -0400 Staging: comedi: Remove ni_65xx_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit f4c6b31958afecc08c8e83f3bc25161ce4442542 Author: Bill Pemberton Date: Thu Mar 19 17:58:41 2009 -0400 Staging: comedi: Remove ni6527_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 97070b32a886d53b7343bcb28ed38d906fa95f50 Author: Bill Pemberton Date: Thu Mar 19 17:58:25 2009 -0400 Staging: comedi: comedi: remove C99 comments in skel.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 450032a318ebfc95121fc548442217592803f4a7 Author: Bill Pemberton Date: Thu Mar 19 17:57:22 2009 -0400 Staging: comedi: Remove pcidas64_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 222ab1bc78dd8a48576e904da37fd6f71cb41a7e Author: Bill Pemberton Date: Thu Mar 19 17:57:11 2009 -0400 Staging: comedi: Remove pcidas64_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 675935dd95cf24e81982e57021d03d5bf8bdac60 Author: Bill Pemberton Date: Thu Mar 19 17:57:06 2009 -0400 Staging: comedi: Remove hw_fifo_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4a5a33b622ca46acd0a7c593a804964353d54a7b Author: Bill Pemberton Date: Thu Mar 19 14:22:44 2009 -0400 Staging: comedi: Remove 2.4 irqreturn_t compatibility in comedi/interrupt.h This allows the comedi driver to build after commit bedd3..058bb is applied. Signed-off-by: Bill Pemberton Reported-by: Sachin Sant Reported-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit ab64f663412716193ccafefd7e6cc27dcf691ac8 Author: Bill Pemberton Date: Mon Mar 16 22:19:53 2009 -0400 Staging: comedi: quatech_daqp_cs: Remove local_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit e21ffa44f55ebf7f6f7d1e60a49463ca579c056a Author: Bill Pemberton Date: Mon Mar 16 22:18:54 2009 -0400 Staging: comedi: serial2002: Remove serial2002_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 404d108d8f5968f47ba72417a3532f213e020914 Author: Bill Pemberton Date: Mon Mar 16 22:17:49 2009 -0400 Staging: comedi: skel.c: Remove skel_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 1de6a6fd5b672f3a2d8aa6ebe4c85552f091277b Author: Bill Pemberton Date: Mon Mar 16 22:17:33 2009 -0400 Staging: comedi: rti800: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 180089a8966e712cb8cb9af1d7401c3e12453d74 Author: Bill Pemberton Date: Mon Mar 16 22:17:22 2009 -0400 Staging: comedi: pcm3724: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 1c7f40d91b99e73ae11056708225058afd0278d7 Author: Bill Pemberton Date: Mon Mar 16 22:17:11 2009 -0400 Staging: comedi: pcl816: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit fb1314de41d8fbd14e7aeb735d7849be8a852dbc Author: Bill Pemberton Date: Mon Mar 16 22:17:06 2009 -0400 Staging: comedi: pcl812: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 292090dcc85a6e8a4132a6551d73bc467b270693 Author: Bill Pemberton Date: Mon Mar 16 22:17:01 2009 -0400 Staging: comedi: pcl730: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 747887a6210a6dc3dcfd40bdcc88ea65c85fcea3 Author: Bill Pemberton Date: Mon Mar 16 22:16:55 2009 -0400 Staging: comedi: pcl726: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 01820e023e5cd162ce629bd5961aabf6dd999e7a Author: Bill Pemberton Date: Mon Mar 16 22:16:50 2009 -0400 Staging: comedi: pcl724: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 6445296e9857ff4a3992454eda7ebb63f90cdca9 Author: Bill Pemberton Date: Mon Mar 16 22:16:45 2009 -0400 Staging: comedi: pcl711: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 42f1884d0683d0d0d4b0895aaed02dbed5d8b921 Author: Bill Pemberton Date: Mon Mar 16 22:14:46 2009 -0400 Staging: comedi: dt2811: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 938f185d4eea489ad802554e2faef9c99e377aa5 Author: Bill Pemberton Date: Mon Mar 16 22:13:47 2009 -0400 Staging: comedi: das800: Remove das800_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit b90c76fd78a101835eb1cc17271d008ed51688d3 Author: Bill Pemberton Date: Mon Mar 16 22:11:27 2009 -0400 Staging: comedi: cb_pcimdas: Remove timer_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 502dd07999b48994dc3c86a0c44f1a684299d44f Author: Bill Pemberton Date: Mon Mar 16 22:06:53 2009 -0400 Staging: comedi: acl7225b: Remove boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit fe0ff175329a83de8f9aac7c0b759cde15cb2247 Author: Bill Pemberton Date: Mon Mar 16 22:18:43 2009 -0400 Staging: comedi: Remove pcl816_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 8e7b864b3c8357dd8318ade3970cd3b5fe0571e0 Author: Bill Pemberton Date: Mon Mar 16 22:18:48 2009 -0400 Staging: comedi: Remove priv_pcm3724 typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 050509fa558306399f2a987956514a8f849846ef Author: Bill Pemberton Date: Mon Mar 16 22:20:57 2009 -0400 Staging: comedi: Remove six_axis_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c611ad3313831f1f79b063b282deb4248e283f39 Author: Bill Pemberton Date: Mon Mar 16 22:20:52 2009 -0400 Staging: comedi: Remove s526_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 6ae9488bafce561c087310c051f92bbd0a27b891 Author: Bill Pemberton Date: Mon Mar 16 22:20:47 2009 -0400 Staging: comedi: Remove transform_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 39f7666080909466c0ed6d5fa48cce3403033ced Author: Bill Pemberton Date: Mon Mar 16 22:20:41 2009 -0400 Staging: comedi: Remove s526_gpct_config_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 055f6636d9eb27bc13236e07739e019496c21221 Author: Bill Pemberton Date: Mon Mar 16 22:20:36 2009 -0400 Staging: comedi: Remove pcmuio_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit e56ab7156f5f4918eb89a19b3061de1a7fe69354 Author: Bill Pemberton Date: Mon Mar 16 22:20:30 2009 -0400 Staging: comedi: Remove pcmmio_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c6a3b7b657fb91500bd6946117056284bb0a20c1 Author: Bill Pemberton Date: Mon Mar 16 22:20:25 2009 -0400 Staging: comedi: Remove jr3_pci_subdev_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 33a4640f312c4ee583470e7d4b1aaed5026438f6 Author: Bill Pemberton Date: Mon Mar 16 22:20:20 2009 -0400 Staging: comedi: Remove unioxx5_subd_priv typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c0d1482252b9b87c62b8d0ddb7ceecc369c6e34e Author: Bill Pemberton Date: Mon Mar 16 22:20:14 2009 -0400 Staging: comedi: Remove dnp_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c1dd2fa6a12bfba92d3522fa43173480f52dbaed Author: Bill Pemberton Date: Mon Mar 16 22:20:09 2009 -0400 Staging: comedi: Remove skel_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit ca9ed0f295a5e85861c63713406d86643e570580 Author: Bill Pemberton Date: Mon Mar 16 22:20:03 2009 -0400 Staging: comedi: Remove serial2002_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit dfb0503e2baf2292da93faae78db4bb98d9f095e Author: Bill Pemberton Date: Mon Mar 16 22:19:58 2009 -0400 Staging: comedi: Remove S526_GPCT_APP_CLASS typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 387c136adc72da7f06f37274822ad9c38f529156 Author: Bill Pemberton Date: Mon Mar 16 22:19:47 2009 -0400 Staging: comedi: Remove pcmda12_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit e15849e54405152087cd343437747db8d931fcd7 Author: Bill Pemberton Date: Mon Mar 16 22:19:42 2009 -0400 Staging: comedi: Remove pcmuio_subdev_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4467df9406bc40fdbc9cf64cfb2e95cba8f77e1e Author: Bill Pemberton Date: Mon Mar 16 22:19:37 2009 -0400 Staging: comedi: Remove pcmmio_subdev_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 97baaedfa440fb988d8725cc9a3b16bcc12ff611 Author: Bill Pemberton Date: Mon Mar 16 22:19:31 2009 -0400 Staging: comedi: Remove pci20xxx_subdev_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit e2b523aab1b04e7edc092588abbafa67f560deb4 Author: Bill Pemberton Date: Mon Mar 16 22:19:26 2009 -0400 Staging: comedi: Remove config_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 201007e8bc7b3e94be823eda5a684199152410d1 Author: Bill Pemberton Date: Mon Mar 16 22:19:20 2009 -0400 Staging: comedi: Remove rti802_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 9335f2613b6beca0f3f3e20ce5a550d1ffe66aa2 Author: Bill Pemberton Date: Mon Mar 16 22:19:15 2009 -0400 Staging: comedi: Remove rti800_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 70a6001aeffeaa12f2a1c21470e8f3bdfb6ef8e7 Author: Bill Pemberton Date: Mon Mar 16 22:19:10 2009 -0400 Staging: comedi: Remove pcmuio_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 657f81ec27758ddb859ea9c74929996bea607194 Author: Bill Pemberton Date: Mon Mar 16 22:19:04 2009 -0400 Staging: comedi: Remove pcmmio_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit d89da61754236aee5ab8faf0cab7f5449a2fdd34 Author: Bill Pemberton Date: Mon Mar 16 22:18:59 2009 -0400 Staging: comedi: Remove dt2811_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 51091b5420c564093d721d2dad99a55bbb22d0d0 Author: Bill Pemberton Date: Mon Mar 16 22:18:37 2009 -0400 Staging: comedi: Remove pcl812_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit bf7f0610c6c215fb8a8cd26b697902810ee5b9e9 Author: Bill Pemberton Date: Mon Mar 16 22:18:32 2009 -0400 Staging: comedi: Remove pcl726_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit e1c8638f3fb47c25b8dba170aadc8e29619fcd67 Author: Bill Pemberton Date: Mon Mar 16 22:18:27 2009 -0400 Staging: comedi: Remove pcl711_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 2e2269f90f2bb4e9438849f0690daba5cba29fc5 Author: Bill Pemberton Date: Mon Mar 16 22:18:21 2009 -0400 Staging: comedi: Remove cnt_device_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 83101a1770982817ecbcb7679439352795bc7a47 Author: Bill Pemberton Date: Mon Mar 16 22:18:16 2009 -0400 Staging: comedi: Remove poll_delay_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 352dec620aea9529180034fa461d290026ff57e9 Author: Bill Pemberton Date: Mon Mar 16 22:18:10 2009 -0400 Staging: comedi: Remove hpdi_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit b81c8035ff531ae47b45f132cc0305d8c5c412c6 Author: Bill Pemberton Date: Mon Mar 16 22:18:05 2009 -0400 Staging: comedi: Remove dt3k_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 60efa611c788c4f5b9fdc206aeb9e7c91e0c3ffb Author: Bill Pemberton Date: Mon Mar 16 22:18:00 2009 -0400 Staging: comedi: Remove comment mentioning typedefs There are no typedefs left in this file, so no need for a comment pointing out the typedefs. Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 8532530040c05ab60e7d83c705713ef2629cd3bb Author: Bill Pemberton Date: Mon Mar 16 22:17:54 2009 -0400 Staging: comedi: Remove dnp_private_data typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit b3fb588d463c575706fe80e9c30bf4b1c7702034 Author: Bill Pemberton Date: Mon Mar 16 22:17:44 2009 -0400 Staging: comedi: Remove serial2002_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 6dc1ece008ab4e2bdddec3eca6d326a16b4f9849 Author: Bill Pemberton Date: Mon Mar 16 22:17:38 2009 -0400 Staging: comedi: Remove s526_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 39eb312d648b530afd147a7c8198f7536f441a94 Author: Bill Pemberton Date: Mon Mar 16 22:17:28 2009 -0400 Staging: comedi: Remove pcmda12_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 087ea31bdabb0395f83223c153a0557136461a85 Author: Bill Pemberton Date: Mon Mar 16 22:17:17 2009 -0400 Staging: comedi: Remove pcl818_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit a7195f3d92f5fc560e597598a56d9c394b65ee81 Author: Bill Pemberton Date: Mon Mar 16 22:16:39 2009 -0400 Staging: comedi: Remove nidio_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c7ef22985517e35d3b5cf5cffa962a4b8ed8899b Author: Bill Pemberton Date: Mon Mar 16 22:16:34 2009 -0400 Staging: comedi: Remove ni_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 344d23e931fdb982489753e5189d9c60ffbdfd67 Author: Bill Pemberton Date: Mon Mar 16 22:16:28 2009 -0400 Staging: comedi: Remove dio24_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit adf328432473a9baf2b7b0a50864d9736890fa8a Author: Bill Pemberton Date: Mon Mar 16 22:16:23 2009 -0400 Staging: comedi: Remove dio700_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 9f30c243c86483f24dc2687a8708985d147d63e0 Author: Bill Pemberton Date: Mon Mar 16 22:16:18 2009 -0400 Staging: comedi: Remove atmio16_board_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 75b807393272fcfcf54d1188c667dc0fccd1fb69 Author: Bill Pemberton Date: Mon Mar 16 22:16:12 2009 -0400 Staging: comedi: Remove atao_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 3cc3872bbd097a2bcbe740b7041b3d35cc8f0d3e Author: Bill Pemberton Date: Mon Mar 16 22:16:07 2009 -0400 Staging: comedi: Remove a2150_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 8ce8a1fff26a88498cfa435cf964bcba87682daf Author: Bill Pemberton Date: Mon Mar 16 22:16:01 2009 -0400 Staging: comedi: Remove ni_670x_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0cb5e8ff4502d60967177038e2d740dae759e4b2 Author: Bill Pemberton Date: Mon Mar 16 22:15:56 2009 -0400 Staging: comedi: Remove NI_660xRegisterData typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 125edf55eb4c722afa76b43da40f24a6fd2421ef Author: Bill Pemberton Date: Mon Mar 16 22:15:51 2009 -0400 Staging: comedi: Remove ni_65xx_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 16d38ca3514bfcfad78f97dc136c955616303bf4 Author: Bill Pemberton Date: Mon Mar 16 22:15:45 2009 -0400 Staging: comedi: Remove ni6527_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 6555be0a1c25576be6270bb43f1bd444df7d86f8 Author: Bill Pemberton Date: Mon Mar 16 22:15:40 2009 -0400 Staging: comedi: Remove mpc8260cpm_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 16450130a9f7006c91c9f49d725b9029fe711240 Author: Bill Pemberton Date: Mon Mar 16 22:15:34 2009 -0400 Staging: comedi: Remove skel_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 9beff277bb14a844b5cb437fcdca9db7534ee44a Author: Bill Pemberton Date: Mon Mar 16 22:15:29 2009 -0400 Staging: comedi: Remove cnt_board_struct typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 217fbbbc74f136f35530cf9acb06d7231fbdc1f3 Author: Bill Pemberton Date: Mon Mar 16 22:15:24 2009 -0400 Staging: comedi: Remove jr3_pci_dev_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0e99a2b9a2367e47bebf8bdbb5aa0ce14d586968 Author: Bill Pemberton Date: Mon Mar 16 22:15:18 2009 -0400 Staging: comedi: Remove pci20xxx_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 52b3e3483d12f03ad6c1fa051a5db0b5656596c9 Author: Bill Pemberton Date: Mon Mar 16 22:15:13 2009 -0400 Staging: comedi: Remove hpdi_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit fa11f7a978b9b93f46408ead81dba035828c1ff9 Author: Bill Pemberton Date: Mon Mar 16 22:15:08 2009 -0400 Staging: comedi: Remove fl512_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c14e9208359c615f2e565277a607237635a1e413 Author: Bill Pemberton Date: Mon Mar 16 22:15:02 2009 -0400 Staging: comedi: Remove dt3k_boardtype typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0b011a6f40dfdda0e33cf5b38ce9ffb6fd7a825b Author: Bill Pemberton Date: Mon Mar 16 22:14:57 2009 -0400 Staging: comedi: Remove dt2815_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit ca6f10ca8630d709e0d291fb9601f8c8d81c19a0 Author: Bill Pemberton Date: Mon Mar 16 22:14:52 2009 -0400 Staging: comedi: Remove dt2814_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 7f435c068c488527842461b9872c0484a3c9ae61 Author: Bill Pemberton Date: Mon Mar 16 22:14:41 2009 -0400 Staging: comedi: Remove dt2801_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4634b8154e23ced2f70a00ab3a22e6b1987fc348 Author: Bill Pemberton Date: Mon Mar 16 22:14:35 2009 -0400 Staging: comedi: Remove boardtype typedef in pcl818.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit d438a1795754030b9b389d7a64981907a1869dc7 Author: Bill Pemberton Date: Mon Mar 16 22:14:30 2009 -0400 Staging: comedi: Remove boardtype_t typedef in dt2801.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 68b08cdad78c79fc87df52f8c8d4adf60ec5d7fc Author: Bill Pemberton Date: Mon Mar 16 22:14:25 2009 -0400 Staging: comedi: Remove dt282x_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 98484c1ae621eb784c4b2a7dd6c76a069bad6214 Author: Bill Pemberton Date: Mon Mar 16 22:14:19 2009 -0400 Staging: comedi: Remove boardtype_t typedef in dt282x.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 39d31e09a0cc299e01b8acb66b60fbcc453b9c8b Author: Bill Pemberton Date: Mon Mar 16 22:14:14 2009 -0400 Staging: comedi: Remove dmm32at_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 38baea3abba76b48ff599e1c5b7eccc80b2a7e3d Author: Bill Pemberton Date: Mon Mar 16 22:14:09 2009 -0400 Staging: comedi: Remove dmm32at_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c7b8bb98a46e475ae848642cf60160fc7135cd52 Author: Bill Pemberton Date: Mon Mar 16 22:14:03 2009 -0400 Staging: comedi: Remove das6402_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0c5a144d730a68967dfb3f8163260a142e3282e3 Author: Bill Pemberton Date: Mon Mar 16 22:13:58 2009 -0400 Staging: comedi: Remove das1800_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit ce422cf3569444116d7d826b274bd59cc34d3b28 Author: Bill Pemberton Date: Mon Mar 16 22:13:53 2009 -0400 Staging: comedi: Remove das1800_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit febc2ed696fe88e3e438554f94dc0d2901a37c1f Author: Bill Pemberton Date: Mon Mar 16 22:13:42 2009 -0400 Staging: comedi: Remove das800_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 65a457a1496f660a5469e4bb7edbe0195b9d887c Author: Bill Pemberton Date: Mon Mar 16 22:13:36 2009 -0400 Staging: comedi: Remove das16m1_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 67080790a44f6633acc250db915a4f6481e81ba1 Author: Bill Pemberton Date: Mon Mar 16 22:13:31 2009 -0400 Staging: comedi: Remove jr3_channel_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 1c31ddaf9b46bec3df20b3a3b95049f45f43bf84 Author: Bill Pemberton Date: Mon Mar 16 22:13:26 2009 -0400 Staging: comedi: Remove intern_transform_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4e1ccd9717df80a6207fe89eb0761415cbe5b2e7 Author: Bill Pemberton Date: Mon Mar 16 22:13:20 2009 -0400 Staging: comedi: Remove link_types typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit b2e1b3c2bd6245c6d3d79f69fa94813b7db9a61e Author: Bill Pemberton Date: Mon Mar 16 22:13:15 2009 -0400 Staging: comedi: Remove jr3_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0306b0cb8e13d51c16adf9bc3285de80f6dc93b3 Author: Bill Pemberton Date: Mon Mar 16 22:13:09 2009 -0400 Staging: comedi: Remove le_struct_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 38443673506e19ad9af9785c5e5ebead81b6be39 Author: Bill Pemberton Date: Mon Mar 16 22:13:04 2009 -0400 Staging: comedi: Remove thresh_struct typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit f3fd0937adacadd368126d1999d1060390497915 Author: Bill Pemberton Date: Mon Mar 16 22:12:59 2009 -0400 Staging: comedi: Remove vect_bits_t, warning_bits_t, and error_bits_t typedefs These are enums that are not used anywhere at this time. This removes the typedef, but leaves the enum in place. Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 5671c0c2d85203472b02100a517ce5c565e5c1e0 Author: Bill Pemberton Date: Mon Mar 16 22:12:53 2009 -0400 Staging: comedi: Remove six_axis_array_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit cdc14cd0ea064b4838f63073ebf5cd2fdf13f309 Author: Bill Pemberton Date: Mon Mar 16 22:12:48 2009 -0400 Staging: comedi: Remove force_array_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 2deee55e66d0de60ca28703da5aba8bdaf27b4ba Author: Bill Pemberton Date: Mon Mar 16 22:12:43 2009 -0400 Staging: comedi: Remove raw_channel typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0642feb3e1ffe896ff0fd67cad5fc33a51fe4651 Author: Bill Pemberton Date: Mon Mar 16 22:12:37 2009 -0400 Staging: comedi: Remove s_val_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 54298a8d0696046874a644c9a2be71a1e582f688 Author: Bill Pemberton Date: Mon Mar 16 22:12:32 2009 -0400 Staging: comedi: Remove u_val_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit b2be969bf9092cdd091e450a614798cfd42ad1f6 Author: Bill Pemberton Date: Mon Mar 16 22:12:26 2009 -0400 Staging: comedi: Replace C99 comments in jr3_pci.h Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 947a33fd2196209a1aa8f00de4068e8a09a19cd9 Author: Bill Pemberton Date: Mon Mar 16 22:12:21 2009 -0400 Staging: comedi: Remove das16_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit d8961467e60d42c1997fdf783fee4802c9fea8cc Author: Bill Pemberton Date: Mon Mar 16 22:12:16 2009 -0400 Staging: comedi: Remove local_info_t typedef in das08_cs.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit b36536816e1f34b2be1da9edb78e8b55bc414081 Author: Bill Pemberton Date: Mon Mar 16 22:12:10 2009 -0400 Staging: comedi: Remove daqboard2000_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 9da18ff8c352c8827abee8ebd8570d8bf2767ebb Author: Bill Pemberton Date: Mon Mar 16 22:12:05 2009 -0400 Staging: comedi: Remove boardtype typedef in daqboard2000.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 79c7b392b32fc3154911fe3d8c65274cda5d5728 Author: Bill Pemberton Date: Mon Mar 16 22:12:00 2009 -0400 Staging: comedi: Remove daqboard2000_hw typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 216ed755f720eb4df79a184fbb13798831976adb Author: Bill Pemberton Date: Mon Mar 16 22:11:54 2009 -0400 Staging: comedi: Remove contec_model typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4f4123ba6dba07ae20c7b6eb9ca5532c0cee8614 Author: Bill Pemberton Date: Mon Mar 16 22:11:49 2009 -0400 Staging: comedi: Remove contec_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 72e7b74d505f901450e92d873dd3605a57435c1a Author: Bill Pemberton Date: Mon Mar 16 22:11:43 2009 -0400 Staging: comedi: Remove contec_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0ff297c4ebf5f7119e928d74a9d952158d329aca Author: Bill Pemberton Date: Mon Mar 16 22:11:38 2009 -0400 Staging: comedi: Remove typedef private in cb_pcimdda.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 324da11efaea562c8270834ac03c7c3df03aa79b Author: Bill Pemberton Date: Mon Mar 16 22:11:33 2009 -0400 Staging: comedi: Remove board_struct typedef A more descriptive structure name is probably in order here. Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit ecce6332ef5f88ba0ac8e9e7511538431952dda7 Author: Bill Pemberton Date: Mon Mar 16 22:11:22 2009 -0400 Staging: comedi: Remove timer_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit cfee7b998b2407f5ee53d76bae9e2805baf6dbb4 Author: Bill Pemberton Date: Mon Mar 16 22:11:17 2009 -0400 Staging: comedi: Remove cb_pcimdas_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit fe7858af4f04d6ea5d18a513433846c63c70d0ec Author: Bill Pemberton Date: Mon Mar 16 22:11:11 2009 -0400 Staging: comedi: Remove pcidio_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c98d3debeb1101858f7bd720116d00e15ae9124d Author: Bill Pemberton Date: Mon Mar 16 22:11:06 2009 -0400 Staging: comedi: Remove pcidio_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit cc7bb61e00a2e9e4e0d742b9917cb37406080922 Author: Bill Pemberton Date: Mon Mar 16 22:11:00 2009 -0400 Staging: comedi: Remove cb_pcidda_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 1657e325042ffc723182377a47d38ccc7319078f Author: Bill Pemberton Date: Mon Mar 16 22:10:55 2009 -0400 Staging: comedi: Remove cb_pcidda_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c77e25898523395b56e1d120195e1ad2e3efa14d Author: Bill Pemberton Date: Mon Mar 16 22:10:50 2009 -0400 Staging: comedi: Remove cb_pcidas_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 5c2670cba2a5fd1a27f938ae11b3a24518d999db Author: Bill Pemberton Date: Mon Mar 16 22:10:44 2009 -0400 Staging: comedi: Remove cb_pcidas_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit d2755d518620bfa3ab6d25aed4048a2d35868e3d Author: Bill Pemberton Date: Mon Mar 16 22:10:39 2009 -0400 Staging: comedi: Remove local_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit bfae362ab6a9737e67a07ff82632a16181bb2d3c Author: Bill Pemberton Date: Mon Mar 16 22:10:34 2009 -0400 Staging: comedi: Remove das16cs_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 3281a63d0b1eecbb21848c3e123c2fc0cd1d4a80 Author: Bill Pemberton Date: Mon Mar 16 22:10:28 2009 -0400 Staging: comedi: Remove das16cs_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit b3e8fa97c454246be2bc6f4ddf20951c5b74bc22 Author: Bill Pemberton Date: Mon Mar 16 22:10:23 2009 -0400 Staging: comedi: Remove pci230_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit a27872bf7b3fc4ac7ddb561662cf7eb06e8b3895 Author: Bill Pemberton Date: Mon Mar 16 22:10:17 2009 -0400 Staging: comedi: Remove pci224_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 5a676a21f496b68506d6ebc94bc137b7acecdbd3 Author: Bill Pemberton Date: Mon Mar 16 22:10:12 2009 -0400 Staging: comedi: Remove pci224_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit cd60d1ec0ca6c3be3df1a2edb548613e9d175cee Author: Bill Pemberton Date: Mon Mar 16 22:10:06 2009 -0400 Staging: comedi: Remove pc263_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4beb86c25085f875935480aa0422e0a983a917f3 Author: Bill Pemberton Date: Mon Mar 16 22:10:01 2009 -0400 Staging: comedi: Remove pc263_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit f1ee810a1383b623ec523edd521467a7b620a09a Author: Bill Pemberton Date: Mon Mar 16 22:09:56 2009 -0400 Staging: comedi: Remove pc236_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 57ad869651d1d2f163a1c5ccb577ee794847fd77 Author: Bill Pemberton Date: Mon Mar 16 22:09:50 2009 -0400 Staging: comedi: Remove pc236_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit d9752ee071117f32495da04d3cc9cb4453b5a46e Author: Bill Pemberton Date: Mon Mar 16 22:09:45 2009 -0400 Staging: comedi: Remove dio200_subdev_intr typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 93ba42e9093718729291dd6332d92a99f041eb78 Author: Bill Pemberton Date: Mon Mar 16 22:09:39 2009 -0400 Staging: comedi: Remove dio200_subdev_8254 typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 692560db4187c5c5e906f95c287d75e1b96e4846 Author: Bill Pemberton Date: Mon Mar 16 22:09:34 2009 -0400 Staging: comedi: Remove dio200_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit af105ad3f57421a36dd60c8f54edcebc7a09256b Author: Bill Pemberton Date: Mon Mar 16 22:09:29 2009 -0400 Staging: comedi: Remove dio200_layout typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 3d7a42ef60e93352b49c5da7cba00f20ce255afc Author: Bill Pemberton Date: Mon Mar 16 22:09:23 2009 -0400 Staging: comedi: Remove dio200_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 55d996391fa73df06e33609f0d6f82de775d1045 Author: Bill Pemberton Date: Mon Mar 16 22:09:18 2009 -0400 Staging: comedi: Remove aio_iiro_16_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 28fa7754e5a3fe9f696643808862d37b5ffc3083 Author: Bill Pemberton Date: Mon Mar 16 22:09:13 2009 -0400 Staging: comedi: Remove aio_iiro_16_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4b1d53f061bd3e622ba44c106e083a30a92eb223 Author: Bill Pemberton Date: Mon Mar 16 22:09:07 2009 -0400 Staging: comedi: Remove counter_mode_register_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4651db97324b77972309fa22bc441dfbebb5b825 Author: Bill Pemberton Date: Mon Mar 16 22:09:02 2009 -0400 Staging: comedi: Remove aio12_8_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 747537121d060557132ac82e7e37cae393e16dcc Author: Bill Pemberton Date: Mon Mar 16 22:08:56 2009 -0400 Staging: comedi: Remove board_type typedef in aio_aio12_8.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4cb133565aaf9b04f4fb6af5e5200982258b107c Author: Bill Pemberton Date: Mon Mar 16 22:08:51 2009 -0400 Staging: comedi: Remove pci_dio_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit ba23095c03a8b5efa3427b63b988b396bea2e485 Author: Bill Pemberton Date: Mon Mar 16 22:08:46 2009 -0400 Staging: comedi: Remove C99 style comments in adv_pci_dio.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit dea1776abaaf9652f1f8e9d69ef7b70ec4cc381a Author: Bill Pemberton Date: Mon Mar 16 22:08:40 2009 -0400 Staging: comedi: Remove boardtype typedef in adv_pci_dio.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 673bc56adb5df0e041231493eb75de146c63ac74 Author: Bill Pemberton Date: Mon Mar 16 22:08:35 2009 -0400 Staging: comedi: Remove diosubd_data typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit a8f1152e2027ce4987350a6d1d06b3159af80082 Author: Bill Pemberton Date: Mon Mar 16 22:08:29 2009 -0400 Staging: comedi: Remove hw_cards_id and hw_io_access typedefs in adv_pci_dio.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 006449f0fe747774438d714dcc4c6193d3a801ea Author: Bill Pemberton Date: Mon Mar 16 22:08:24 2009 -0400 Staging: comedi: Remove boardtype and pci1723_private typedefs in adv_pci1723.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 6e8131a86d6c1a9896282f572d17c447a85262ad Author: Bill Pemberton Date: Mon Mar 16 22:08:19 2009 -0400 Staging: comedi: Remove pci1710_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 7875a00b702e62ebafe68cd2abf96570e2d747e5 Author: Bill Pemberton Date: Mon Mar 16 22:08:13 2009 -0400 Staging: comedi: Remove boardtype typedef in adv_pci1710.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 1ade3157f4ea4e4a090097e2b2b816a627c32a32 Author: Bill Pemberton Date: Mon Mar 16 22:08:08 2009 -0400 Staging: comedi: Remove adq12b_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 47c6e95869228a8b464174ee0e85904a92b7baf4 Author: Bill Pemberton Date: Mon Mar 16 22:08:03 2009 -0400 Staging: comedi: Remove adq12b_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 5b5fc21b060cc7a2a68ea3f3e145442f589000b6 Author: Bill Pemberton Date: Mon Mar 16 22:07:57 2009 -0400 Staging: comedi: Remove pci9118_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 193a21e402f023c786490dacd864b642898976d0 Author: Bill Pemberton Date: Mon Mar 16 22:07:52 2009 -0400 Staging: comedi: Remove boardtype typedef in adl_pci9118.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 52f8ac983079ad6bba3c055152a39ccc5e76350a Author: Bill Pemberton Date: Mon Mar 16 22:07:46 2009 -0400 Staging: comedi: Remove C99 style comments in adl_pci9111.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 3ba97b3c6258cb67450e0873584489f97d0debc5 Author: Bill Pemberton Date: Mon Mar 16 22:07:41 2009 -0400 Staging: comedi: Remove pci9111_ISC0_sources typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 655f78f6aaa059ad262bc55e1c3575724c14867b Author: Bill Pemberton Date: Mon Mar 16 22:07:36 2009 -0400 Staging: comedi: Remove pci9111_trigger_sources typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c350fa1944f4ec1fe392ce0f3fc879f3899bb15d Author: Bill Pemberton Date: Mon Mar 16 22:07:30 2009 -0400 Staging: comedi: Remove pci9111_private_data typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 940579fbae1a3a8967fe619562c8e78080dd873d Author: Bill Pemberton Date: Mon Mar 16 22:07:25 2009 -0400 Staging: comedi: Remove pci9111_board_struct typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 07b666b72b122958ec125715bd4b07557c6cb889 Author: Bill Pemberton Date: Mon Mar 16 22:07:19 2009 -0400 Staging: comedi: Remove adl_pci8164_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit ddc3dbf4dfd38b309c4c26b2fa91e3784457a0f8 Author: Bill Pemberton Date: Mon Mar 16 22:07:14 2009 -0400 Staging: comedi: Remove adl_pci7432_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 8dca707e148ed7c25a5d9fc37a831e5fc56776fa Author: Bill Pemberton Date: Mon Mar 16 22:07:09 2009 -0400 Staging: comedi: Remove adl_pci7296_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 3d393c865b745a37a53081203b49278476a47a56 Author: Bill Pemberton Date: Mon Mar 16 22:07:03 2009 -0400 Staging: comedi: Remove pci6208_private typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit c1b31c44a38e2b5153193680e4bee4856b3307e1 Author: Bill Pemberton Date: Mon Mar 16 22:06:58 2009 -0400 Staging: comedi: Remove pci6208_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 4753d235e76b14c9f4585d569795a4ccb51485f8 Author: Bill Pemberton Date: Mon Mar 16 22:06:47 2009 -0400 Staging: comedi: Remove DMABUF typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 9aa5339ac1eba5268df69bbcdf1abb9fae5afeca Author: Bill Pemberton Date: Mon Mar 16 22:06:42 2009 -0400 Staging: comedi: Remove comedi_bufinfo typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit be6aba4a423629126f318d351b2d0eb00abb9dd5 Author: Bill Pemberton Date: Mon Mar 16 22:06:37 2009 -0400 Staging: comedi: Remove comedi_bufconfig typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 1f6325d629ce03501e8927480495685828561f26 Author: Bill Pemberton Date: Mon Mar 16 22:06:31 2009 -0400 Staging: comedi: Remove comedi_krange typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit d0a353f637593ce8b0e08848cc7c871b766cb4ee Author: Bill Pemberton Date: Mon Mar 16 22:06:26 2009 -0400 Staging: comedi: Remove comedi_rangeinfo typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 0707bb04be89b18ee83b5a997e36cc585f0b988d Author: Bill Pemberton Date: Mon Mar 16 22:06:20 2009 -0400 Staging: comedi: Remove comedi_devconfig typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 063db04b8901c5cf84c552a5053748d183d34e61 Author: Bill Pemberton Date: Mon Mar 16 22:06:15 2009 -0400 Staging: comedi: Remove comedi_devinfo typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit bd52efbbcc9f5d70c736b9b73c82aee149da1fe5 Author: Bill Pemberton Date: Mon Mar 16 22:06:09 2009 -0400 Staging: comedi: Remove comedi_subdinfo typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit a18b416dc11ff9596ebf2012b1d15f485b951b28 Author: Bill Pemberton Date: Mon Mar 16 22:06:04 2009 -0400 Staging: comedi: Remove comedi_chaninfo typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit da613f4fabb43b8bc551bb874792e1f22a698696 Author: Bill Pemberton Date: Mon Mar 16 22:05:59 2009 -0400 Staging: comedi: Remove comedi_insnlist typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 90035c0886b256d75bced13b3b3cea5234aff136 Author: Bill Pemberton Date: Mon Mar 16 22:05:53 2009 -0400 Staging: comedi: Remove comedi_insn typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit ea6d0d4cab4f4f2d6a88f3bce4707fe92696fd3f Author: Bill Pemberton Date: Mon Mar 16 22:05:47 2009 -0400 Staging: comedi: Remove comedi_cmd typedef