commit 0c8454f56623505a99463405fd7d5664adfbb094 Author: Rafael J. Wysocki Date: Sat Apr 25 00:16:06 2009 +0200 PM/Hibernate: Fix waiting for image device to appear on resume Commit c751085943362143f84346d274e0011419c84202 ("PM/Hibernate: Wait for SCSI devices scan to complete during resume") added a call to scsi_complete_async_scans() to software_resume(), so that it waited for the SCSI scanning to complete, but the call was added at a wrong place. Namely, it should have been added after wait_for_device_probe(), which is called only if the image partition hasn't been specified yet. Also, it's reasonable to check if the image partition is present and only wait for the device probing and SCSI scanning to complete if it is not the case. Additionally, since noresume is checked right at the beginning of software_resume() and the function returns immediately if it's set, it doesn't make sense to check it once again later. Signed-off-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit 4b2b0b9753194cad44d7295c32044b89710efd70 Author: David Howells Date: Thu Apr 23 16:41:18 2009 +0100 ROMFS: Advance destination buffer pointer when reading from a blockdev RomFS should advance the destination buffer pointer when reading data from a blockdev source (the data may be split over multiple blocks, each requiring its own sb_read() call). Without this, all the data is copied to the beginning of the output buffer. Signed-off-by: David Howells Tested-by: Michal Simek Signed-off-by: Linus Torvalds commit 84baf74bf23bbe9f3deafb5d2f27e2b5dc0bc052 Author: David Howells Date: Thu Apr 23 16:41:13 2009 +0100 ROMFS: romfs_lookup() shouldn't be doing a partial name comparison romfs_lookup() should be using a routine akin to strcmp() on the backing store, rather than one akin to strncmp(). If it uses the latter, it's liable to match /bin/shutdown when looking up /bin/sh. Signed-off-by: David Howells Tested-by: Michal Simek Signed-off-by: Linus Torvalds commit a5422a5111811401f7756345e4c237ff06cf6d1e Author: Fred Isaman Date: Thu Apr 23 16:40:32 2009 +0300 lib: find_last_bit.o needed by a module only, move it from lib to obj Currently, although find_last_bit is EXPORTed, it is statically linked with the kernel and is referenced only under CONFIG_SMP. When CONFIG_SMP is undefined and find_last_bit is referenced only by modules, linking fails with: ERROR: "find_last_bit" [fs/nfs/nfs.ko] undefined! Cc: Rusty Russell Cc: Trond Myklebust Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy Signed-off-by: Linus Torvalds commit 91ac033d8377552d3654501a105ab55bf546940e Author: Marc Dionne Date: Thu Apr 23 11:21:55 2009 +0100 CacheFiles: Fix the documentation to use the correct credential pointer names Adjust the CacheFiles documentation to use the correct names of the credential pointers in task_struct. The documentation was using names from the old versions of the credentials patches. Signed-off-by: Marc Dionne Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit e5b89542ea18020961882228c26db3ba87f6e608 Author: Christian Borntraeger Date: Thu Apr 23 16:42:59 2009 +0930 virtio-rng: Remove false BUG for spurious callbacks The virtio-rng drivers checks for spurious callbacks. Since callbacks can be implemented via shared interrupts (e.g. PCI) this could lead to guest kernel oopses with lots of virtio devices. Signed-off-by: Christian Borntraeger Cc: Rusty Russell Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 9f5a691253924fd033a58c6b1fed57bb0a4eccf4 Merge: ef54b1b... f57f2fe... Author: Linus Torvalds Date: Fri Apr 24 08:54:30 2009 -0700 Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: add parameter to microblaze_read() microblaze: Use CFLAGS_KERNEL instead of CFLAGS microblaze: Add STATE_SAVE_ARG_SPACE for noMMU kernel too microblaze: Do not check use_dcache microblaze: Do not use PVR configuration for broken MB version microblaze: Fix USR1/2 pvr printing message microblaze: iowrite upon timeout microblaze: Correspond CONFIG...PCMP in Makefile/Kconfig microblaze: Remove redundant variable microblaze: Move start_thread to process.c microblaze: Add missing preadv and pwritev syscalls microblaze: Add missing declaration for die and _exception func microblaze: Remove sparse error in traps.c microblaze: Move task_pt_regs up microblaze: Rename kernel_mode to pt_mode in pt_regs microblaze: Remove uncache shadow condition microblaze: Remove while(1) loop from show_regs function microblaze: Remove unneded per cpu SYSCALL_SAVE variable commit ef54b1bb2e4de212a89a2692a7b2efd70b5fb559 Merge: 9fe9293... 1162cf6... Author: Linus Torvalds Date: Fri Apr 24 08:48:17 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: (34 commits) ACPI, i915: Register ACPI video even when not modesetting Revert "ACPICA: delete check for AML access to port 0x81-83" I/O port protection: update for windows compatibility. sony-laptop: always try to unblock rfkill on load sony-laptop: fix bogus error message display on resume ACPI: EC: Fix ACPI EC resume non-query interrupt message sony-laptop: SNC input event 38 fix sony-laptop: SNC 127 Initialization Fix sony-laptop: Duplicate SNC 127 Event Fix ACPI: prevent processor.max_cstate=0 boot crash ACPI/hpet: prevent boot hang when hpet=force used on ICH-4M ACPI: delete obsolete "bus master activity" proc field ACPI: idle: mark_tsc_unstable() at init-time, not run-time ACPI: add /sys/firmware/acpi/interrupts/sci_not counter ACPI video: fix an error when the brightness levels on AC and on Battery are same acpi-cpufreq: Do not let get_measured perf depend on internal variable acpi-cpufreq: style-only: add parens to math expression acpi-cpufreq: Cleanup: Use printk_once x86, acpi_cpufreq: Fix the NULL pointer dereference in get_measured_perf thinkpad-acpi: bump up version to 0.23 ... commit 9fe9293d14e8418f29136216f0180f47270a916a Merge: a4277bf... 64f6841... Author: Linus Torvalds Date: Fri Apr 24 08:45:53 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: update the default config for the ColdFire 5407C3 board m68knommu: update the default config for the ColdFire 5307C3 board m68knommu: update the default config for the ColdFire 5257EVB board m68knommu: update the default config for the ColdFire 5249EVB. m68knommu: add a defconfig for the ColdFire M5272C3 board m68knommu: update the defconfig for the ColdFire 5208evb board m68knommu: fix DMA support for ColdFire m68knommu: remove unused kernel stats offsets m68knommu: fix missing .data.cacheline_aligned section m68knommu: Fixed GPIO pin initialization for CONFIG_M5271 FEC. commit a4277bf122e907e4fec509fc0bd9bf5fde30b14e Merge: 6ae85d6... b5451f7... Author: Linus Torvalds Date: Fri Apr 24 08:37:40 2009 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: Fix potential inode allocation soft lockup in Orlov allocator ext4: Make the extent validity check more paranoid jbd: use SWRITE_SYNC_PLUG when writing synchronous revoke records jbd2: use SWRITE_SYNC_PLUG when writing synchronous revoke records ext4: really print the find_group_flex fallback warning only once commit 6ae85d6db4871d8dbcb5cc0e9056f97f1ca07061 Merge: d72cd3a... fdd8b07... Author: Linus Torvalds Date: Fri Apr 24 08:36:41 2009 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5460/1: Orion: reduce namespace pollution [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config [ARM] 5457/1: mach-imx gpio buildfix [ARM] 5456/1: add sys_preadv and sys_pwritev [ARM] pxa/pcm990: start external GPIOs immediately after built-in ones [ARM] pxa/palm27x: General fix for Palm27x aSoC driver [ARM] pxa/mioa701: use GPIO95 as AC97 reset line [ARM] pxa: merge AC97 platform data structures [ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h commit d72cd3a90e4d6725b62919139e2ab7bd926fa16d Merge: ff91fad... 6b35ca0... Author: Linus Torvalds Date: Fri Apr 24 08:36:06 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: pwc : do not pass stack allocated buffers to USB core. USB: otg: Fix bug on remove path without transceiver USB: correct error handling in cdc-wdm USB: removal of tty->low_latency hack dating back to the old serial code USB: serial: sierra driver bug fix for composite interface USB: gadget: omap_udc uses platform_driver_probe() USB: ci13xxx_udc: fix build error USB: musb: Prevent multiple includes of musb.h USB: pass mem_flags to dma_alloc_coherent USB: g_file_storage: fix use-after-free bug when closing files USB: ehci-sched.c: EHCI SITD scheduling bugfix USB: fix mos7840 problem with minor numbers USB: mos7840: add new device id USB: musb: fix build when !CONFIG_PM USB: musb: Remove my email address from few musb related drivers USB: Gadget: MIPS CI13xxx UDC bugfixes USB: Unusual Device support for Gold MP3 Player Energy USB: serial: fix lifetime and locking problems commit ff91fad2db543325d7221c26ff42d7df3c574064 Merge: 198aa04... 3a6b42c... Author: Linus Torvalds Date: Fri Apr 24 08:32:44 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6: eCryptfs: Larger buffer for encrypted symlink targets eCryptfs: Lock lower directory inode mutex during lookup eCryptfs: Remove ecryptfs_unlink_sigs warnings eCryptfs: Fix data corruption when using ecryptfs_passthrough eCryptfs: Print FNEK sig properly in /proc/mounts eCryptfs: NULL pointer dereference in ecryptfs_send_miscdev() eCryptfs: Copy lower inode attrs before dentry instantiation commit 198aa045601d20f39658c892dc626e16993bae78 Merge: 58be18c... adfe7c6... Author: Linus Torvalds Date: Fri Apr 24 08:32:23 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Update defconfigs for 2.6.30-rc3 m68k,m68knommu: Wire up preadv and pwritev scsi: a4000 - Correct driver unregistration in case of failure commit 58be18c4de37b9277b045c0b5bb123a664dac9ed Merge: 12bac70... e655dc8... Author: Linus Torvalds Date: Fri Apr 24 08:28:27 2009 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] update default configuration. [S390] omit frame pointers on s390 when possible [S390] Use tape_generic_offline directly. [S390] /proc/stat idle field for idle cpus [S390] appldata: avoid deadlock with appldata_mem [S390] ipl: fix compile breakage commit 12bac708e6242b0ccd969519582b2938d78289bb Merge: 6091173... d9ba761... Author: Linus Torvalds Date: Fri Apr 24 08:27:02 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Ensure that the inode goal block settings are updated GFS2: Fix bug in block allocation bitops: Add __ffs64 bitop commit 60911731fe7fd4ec4d088fc1a48a56c9fb14103f Merge: d1f53fb... 888d256... Author: Linus Torvalds Date: Fri Apr 24 08:26:01 2009 -0700 Merge branch 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Unregister cpufreq notifier on unload KVM: x86: release time_page on vcpu destruction KVM: Fix overlapping check for memory slots KVM: MMU: disable global page optimization KVM: ia64: fix locking order entering guest KVM: MMU: Fix off-by-one calculating large page count commit d1f53fb90ee631a2cf8f7bdd0e921a338106e4f9 Merge: 90c8fce... b930f96... Author: Linus Torvalds Date: Fri Apr 24 08:16:05 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: MAINTAINERS: update IDE entry palm_bk3710: palm_bk3710_udmatimings[] CodingStyle fixup palm_bk3710: those registers/bitfields don't exist mediabay: fix build for CONFIG_BLOCK=n ide: Stop disks on reboot for laptop which cuts power ide-cd: fix kernel crash on hppa regression palm_bk3710: UDMA performance fix commit 90c8fce53a48dd22cf09c67c861e3aaad17026ed Merge: ec5f5bf... 248e882... Author: Linus Torvalds Date: Fri Apr 24 08:15:25 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: ALSA: hda - Add quirk for Packard Bell RS65 [ALSA] intel8x0: another attempt to fix ac97_clock measure routine [ALSA] ac97_codec: increase timeout for analog subsections ALSA: hda - Add quirks for Realtek codecs ALSA: hda - Fix alc662_init_verbs ALSA: keywest: Convert to new-style i2c driver ALSA: AOA: Convert onyx and tas codecs to new-style i2c drivers ALSA: Atiixp: Add SSID for mute_led quirk (unknown HP model) ALSA: us122l: add snd_us122l_free() ASoC: Fix warning in wm9705 ASoC: OMAP: Update contact addresses ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR ALSA: us122l: Fix signedness in comparisions commit ec5f5bf80501abfe2da2897cfcde8452b545aacb Author: Alan Cox Date: Wed Apr 22 15:03:15 2009 +0100 radio_si470x: Fix free memory corruption The release path for a disconnected device frees the object then unlocks the mutex in the freed object... Found by Dan Carpenter using Smatch Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 79e95eba026944ec3353754f24e316d3aaa209fe Author: Niels de Vos Date: Wed Apr 22 15:02:44 2009 +0100 serial: remove contact data Remove my name and emailaddress from note in the source. Wincor Nixdorf only has some ITE-chips on their mainboards, other chips are not available for me for testing. Signed-off-by: Niels de Vos Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 67cd724f6d0919072a284f150a5761a160ac5cfa Author: Alan Cox Date: Wed Apr 22 15:02:23 2009 +0100 cafe_nand: Fix warning Wrong types on IRQ handler Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 97c68d00dbb2decda4b3dce79ce55df04246a834 Merge: 596a5c4... f2d1f0a... Author: Linus Torvalds Date: Fri Apr 24 07:48:24 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: cfq-iosched: cache prio_tree root in cfqq->p_root cfq-iosched: fix bug with aliased request and cooperation detection cfq-iosched: clear ->prio_trees[] on cfqd alloc block: fix intermittent dm timeout based oops umem: fix request_queue lock warning block: simplify I/O stat accounting pktcdvd.h should include mempool.h cfq-iosched: use the default seek distance when there aren't enough seek samples cfq-iosched: make seek_mean converge more quickly block: make blk_abort_queue() ignore non-request based devices block: include empty disks in /proc/diskstats bio: use bio_kmalloc() in copy/map functions bio: fix bio_kmalloc() block: fix queue bounce limit setting block: fix SG_IO vector request data length handling scatterlist: make sure sg_miter_next() doesn't return 0 sized mappings commit 596a5c4e43b08e90c0cd788861f859bf7ed6eddc Author: David Howells Date: Wed Apr 22 12:10:07 2009 +0100 MN10300: Update the ASB2303 defconfig Update the defconfig for the ASB2303 evaluation board. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 418df63c2d94f238ac7e1d1d53be35dd6b7a7252 Author: Jonathan Corbet Date: Wed Apr 22 12:01:49 2009 +0100 Delete slow-work timers properly Slow-work appears to delete its timer as soon as the first user unregisters, even though other users could be active. At the same time, it never seems to delete slow_work_oom_timer. Arrange for both to happen in the shutdown path. Signed-off-by: Jonathan Corbet Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 3e241ff0c57cb610301009fe8c3b9da4c6877800 Merge: dc0046c... 29fe1b4... Author: Linus Torvalds Date: Fri Apr 24 07:46:51 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: (94 commits) netfilter: ctnetlink: fix gcc warning during compilation net/netrom: Fix socket locking netlabel: Always remove the correct address selector ucc_geth.c: Fix upsmr setting in RMII mode 8139too: fix HW initial flow af_iucv: Fix race when queuing incoming iucv messages af_iucv: Test additional sk states in iucv_sock_shutdown af_iucv: Reject incoming msgs if RECV_SHUTDOWN is set af_iucv: fix oops in iucv_sock_recvmsg() for MSG_PEEK flag af_iucv: consider state IUCV_CLOSING when closing a socket iwlwifi: DMA fixes iwlwifi: add debugging for TX path mwl8: fix build warning. mac80211: fix alignment calculation bug mac80211: do not print WARN if config interface iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll iwlwifi: fix EEPROM validation mask to include OTP only devices atmel: fix netdev ops conversion pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM mlx4_en: Fix cleanup if workqueue create in mlx4_en_add() fails ... commit dc0046c7586da5db7561dd8b8e09b40d29ade5fa Merge: f8c3301... 956d039... Author: Linus Torvalds Date: Fri Apr 24 07:45:52 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Fix bus type probing for ESP and LE devices. sparc32: Update defconfig. sparc64: Update defconfig. commit f8c3301e8336334be62527c5314018f75f58ad4b Merge: 437f7fd... 6329db8... Author: Linus Torvalds Date: Fri Apr 24 07:44:58 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: powerpc: Fix modular build of ide-pmac when mediabay is built in powerpc/pasemi: Fix build error on UP powerpc: Make macintosh/mediabay driver depend on CONFIG_BLOCK maintainers: Fix PS3 patterns powerpc/ps3: Fix CONFIG_PS3_FLASH=n build warning powerpc/32: Don't clobber personality flags on exec powerpc: Fix crash on CPU hotplug powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover powerpc/85xx: Added SMP defconfig powerpc/85xx: Enabled a bunch of FSL specific drivers/options powerpc/85xx: Updated generic mpc85xx_defconfig powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCD fsl_rio: Pass the proper device to dma mapping routines powerpc: Fix of_node_put() exit path in of_irq_map_one() powerpc/5200: defconfig updates powerpc/5200: Add FLASH nodes to lite5200 device tree powerpc/device-tree: Document MTD nodes with multiple "reg" tuples powerpc/of-device-tree: Factor MTD physmap bindings out of booting-without-of powerpc/5200: Bring the legacy fsl_spi_platform_data hooks back commit 1162cf6bc6c4650943735438e2be0785ea40a3c6 Merge: 5f855a8... d68b597... Author: Len Brown Date: Fri Apr 24 10:42:29 2009 -0400 Merge branch 'bjorn.button' into release commit 5f855a8f0ca8f8a81a7752d6bfdc65bfca426b5a Merge: 1fe94d3... a38d75f... Author: Len Brown Date: Fri Apr 24 10:42:21 2009 -0400 Merge branch 'bugzilla-13036' into release commit 1fe94d37f9296e8884c2f4ca4e22ca3d1398f15c Merge: 9c18f0b... b7f0ab4... Author: Len Brown Date: Fri Apr 24 10:42:11 2009 -0400 Merge branch 'bugzilla-13048' into release commit 9c18f0b7095c7981c48f41aae8abdaa06a76d9b3 Merge: 3869e92... 615dfd9... Author: Len Brown Date: Fri Apr 24 10:42:03 2009 -0400 Merge branch 'bugzilla-13142' into release commit 3869e929bb38499b37f8cd76ec96ab6e5a169efb Merge: 2d40570... f461dde... Author: Len Brown Date: Fri Apr 24 10:41:31 2009 -0400 Merge branch 'hpet' into release commit 437f7fdb607f32b737e4da9f14bebcfdac2c90c3 Author: Oleg Nesterov Date: Fri Apr 24 01:02:45 2009 +0200 check_unsafe_exec: s/lock_task_sighand/rcu_read_lock/ write_lock(¤t->fs->lock) guarantees we can't wrongly miss LSM_UNSAFE_SHARE, this is what we care about. Use rcu_read_lock() instead of ->siglock to iterate over the sub-threads. We must see all CLONE_THREAD|CLONE_FS threads which didn't pass exit_fs(), it takes fs->lock too. With or without this patch we can miss the freshly cloned thread and set LSM_UNSAFE_SHARE, we don't care. Signed-off-by: Oleg Nesterov Acked-by: Roland McGrath [ Fixed lock/unlock typo - Hugh ] Acked-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 8c652f96d3852b97a49c331cd0bb02d22f3cb31b Author: Oleg Nesterov Date: Fri Apr 24 01:01:56 2009 +0200 do_execve() must not clear fs->in_exec if it was set by another thread If do_execve() fails after check_unsafe_exec(), it clears fs->in_exec unconditionally. This is wrong if we race with our sub-thread which also does do_execve: Two threads T1 and T2 and another process P, all share the same ->fs. T1 starts do_execve(BAD_FILE). It calls check_unsafe_exec(), since ->fs is shared, we set LSM_UNSAFE but not ->in_exec. P exits and decrements fs->users. T2 starts do_execve(), calls check_unsafe_exec(), now ->fs is not shared, we set fs->in_exec. T1 continues, open_exec(BAD_FILE) fails, we clear ->in_exec and return to the user-space. T1 does clone(CLONE_FS /* without CLONE_THREAD */). T2 continues without LSM_UNSAFE_SHARE while ->fs is shared with another process. Change check_unsafe_exec() to return res = 1 if we set ->in_exec, and change do_execve() to clear ->in_exec depending on res. When do_execve() suceeds, it is safe to clear ->in_exec unconditionally. It can be set only if we don't share ->fs with another process, and since we already killed all sub-threads either ->in_exec == 0 or we are the only user of this ->fs. Also, we do not need fs->lock to clear fs->in_exec. Signed-off-by: Oleg Nesterov Acked-by: Roland McGrath Acked-by: Hugh Dickins Signed-off-by: Linus Torvalds commit f2d1f0ae7851be5ebd9613a80dac139270938809 Author: Jens Axboe Date: Thu Apr 23 12:19:38 2009 +0200 cfq-iosched: cache prio_tree root in cfqq->p_root Currently we look it up from ->ioprio, but ->ioprio can change if either the process gets its IO priority changed explicitly, or if cfq decides to temporarily boost it. So if we are unlucky, we can end up attempting to remove a node from a different rbtree root than where it was added. Fix this by using ->org_ioprio as the prio_tree index, since that will only change for explicit IO priority settings (not for a boost). Additionally cache the rbtree root inside the cfqq, then we don't have to add code to reinsert the cfqq in the prio_tree if IO priority changes. Signed-off-by: Jens Axboe commit 3ac6c9f8a66726745136e46f63600550c3eb6cec Author: Jens Axboe Date: Thu Apr 23 12:14:56 2009 +0200 cfq-iosched: fix bug with aliased request and cooperation detection cfq_prio_tree_lookup() should return the direct match, yet it always returns zero. Fix that. cfq_prio_tree_add() assumes that we don't get a direct match, while it is very possible that we do. Using O_DIRECT, you can have different cfqq with matching requests, since you don't have the page cache to serialize things for you. Fix this bug by only adding the cfqq if there isn't an existing match. Signed-off-by: Jens Axboe commit 26a2ac009c2b07e1959c8864ca23486c1c485587 Author: Jens Axboe Date: Thu Apr 23 12:13:27 2009 +0200 cfq-iosched: clear ->prio_trees[] on cfqd alloc Not strictly needed, but we should make it clear that we init the rbtree roots here. Signed-off-by: Jens Axboe commit 17d5c8ca7572124c9623045f24b0c21d4aa2b47f Author: Hannes Reinecke Date: Thu Apr 23 10:32:59 2009 +0200 block: fix intermittent dm timeout based oops Very rarely under stress testing of dm, oopses are occuring as something tampers with an old stack frame. This has been traced back to blk_abort_queue() leaving a timeout_list pointing to the stack. The reason is that sometimes blk_abort_request() won't delete the timer (if the request is marked as complete but before the timer has been removed, a small race window). Fix this by splicing back from the ususally empty list to the q->timeout_list. Signed-off-by: Hannes Reinecke Signed-off-by: Jens Axboe commit f3c737de8f57b5ce756010c2175f7d574194b30d Author: Sage Weil Date: Thu Apr 23 08:37:58 2009 +0200 umem: fix request_queue lock warning The umem driver issues two warnings on boot, due to blk_plug_device() and blk_remove_plug() being called without q->queue_lock held. Starting with e48ec690 (block: extend queue_flag bitops), the queue_flag_* functions warn if q->queue_lock doesn't appear to be locked. In fact, q->queue_lock is NULL (though that apparently isn't otherwise a problem as the driver is using card->lock for everything). Although blk_init_queue() with take a request_fn_proc and spinlock_t*, there isn't a corresponding init helper that takes a make_request_fn. Setting queue_lock to &card->lock explicitly seems to work fine for me. The warning goes away and the device appears to behave. [ 1.531881] v2.3 : Micro Memory(tm) PCI memory board block driver [ 1.538136] umem 0000:02:01.0: PCI INT A -> GSI 20 (level, low) -> IRQ 20 [ 1.545018] umem 0000:02:01.0: Micro Memory(tm) controller found (PCI Mem Module (Battery Backup)) [ 1.554176] umem 0000:02:01.0: CSR 0xfc9ffc00 -> 0xffffc200013d0c00 (0x100) [ 1.561279] umem 0000:02:01.0: Size 1048576 KB, Battery 1 Disabled (FAILURE), Battery 2 Disabled (FAILURE) [ 1.571114] umem 0000:02:01.0: Window size 16777216 bytes, IRQ 20 [ 1.577304] umem 0000:02:01.0: memory NOT initialized. Consider over-writing whole device. [ 1.585989] umema:<4>------------[ cut here ]------------ [ 1.591775] WARNING: at include/linux/blkdev.h:492 blk_plug_device+0x6d/0x106() [ 1.592025] Hardware name: H8SSL [ 1.592025] Modules linked in: [ 1.592025] Pid: 1, comm: swapper Not tainted 2.6.29 #8 [ 1.592025] Call Trace: [ 1.592025] [] warn_slowpath+0xd3/0xf2 [ 1.592025] [] ? save_trace+0x3f/0x9b [ 1.592025] [] ? add_lock_to_list+0x7a/0xba [ 1.592025] [] ? validate_chain+0xb3b/0xce8 [ 1.592025] [] ? mm_make_request+0x27/0x59 [ 1.592025] [] ? mm_make_request+0x27/0x59 [ 1.592025] [] ? __lock_acquire+0x74e/0x7b9 [ 1.592025] [] ? get_lock_stats+0x34/0x5e [ 1.592025] [] ? put_lock_stats+0xe/0x27 [ 1.592025] [] ? mm_make_request+0x27/0x59 [ 1.592025] [] blk_plug_device+0x6d/0x106 [ 1.592025] [] mm_make_request+0x46/0x59 [ 1.592025] [] generic_make_request+0x335/0x3cf [ 1.592025] [] ? mempool_alloc_slab+0x11/0x13 [ 1.592025] [] ? mempool_alloc+0x45/0x101 [ 1.592025] [] ? put_lock_stats+0xe/0x27 [ 1.592025] [] submit_bio+0x10a/0x119 [ 1.592025] [] submit_bh+0xe5/0x109 [ 1.592025] [] block_read_full_page+0x2aa/0x2cb [ 1.592025] [] ? blkdev_get_block+0x0/0x4c [ 1.592025] [] ? _spin_unlock_irq+0x36/0x51 [ 1.592025] [] ? __lru_cache_add+0x92/0xb2 [ 1.592025] [] blkdev_readpage+0x13/0x15 [ 1.592025] [] read_cache_page_async+0x90/0x134 [ 1.592025] [] ? blkdev_readpage+0x0/0x15 [ 1.592025] [] ? adfspart_check_ICS+0x0/0x16c [ 1.592025] [] read_cache_page+0xe/0x45 [ 1.592025] [] read_dev_sector+0x2e/0x93 [ 1.592025] [] adfspart_check_ICS+0x28/0x16c [ 1.592025] [] ? trace_hardirqs_on+0xd/0xf [ 1.592025] [] ? adfspart_check_ICS+0x0/0x16c [ 1.592025] [] rescan_partitions+0x168/0x2fb [ 1.592025] [] __blkdev_get+0x259/0x336 [ 1.592025] [] ? kobject_put+0x47/0x4b [ 1.592025] [] blkdev_get+0xb/0xd [ 1.592025] [] register_disk+0xc4/0x12b [ 1.592025] [] add_disk+0xc3/0x12d [ 1.592025] [] ? mm_init+0x0/0x1a5 [ 1.592025] [] mm_init+0x129/0x1a5 [ 1.592025] [] ? mm_init+0x0/0x1a5 [ 1.592025] [] _stext+0x56/0x130 [ 1.592025] [] ? register_irq_proc+0xae/0xca [ 1.592025] [] ? proc_pid_lookup+0xb4/0x18b [ 1.592025] [] kernel_init+0x132/0x18b [ 1.592025] [] child_rip+0xa/0x20 [ 1.592025] [] ? restore_args+0x0/0x30 [ 1.592025] [] ? kernel_init+0x0/0x18b [ 1.592025] [] ? child_rip+0x0/0x20 [ 1.592025] ---[ end trace 7150b3b86da74e1e ]--- [ 1.889858] ------------[ cut here ]------------[ve_plug+0x5f/0x91() [ 1.893848] Hardware name: H8SSL [ 1.893848] Modules linked in: [ 1.893848] Pid: 1, comm: swapper Tainted: G W 2.6.29 #8 [ 1.893848] Call Trace: [ 1.893848] [] warn_slowpath+0xd3/0xf2 [ 1.893848] [] ? trace_hardirqs_on_thunk+0x3a/0x3f [ 1.893848] [] ? restore_args+0x0/0x30 [ 1.893848] [] ? __atomic_notifier_call_chain+0x0/0xb2 [ 1.893848] [] ? _spin_unlock_irq+0x31/0x51 [ 1.893848] [] ? _spin_unlock_irq+0x4d/0x51 [ 1.893848] [] ? mm_make_request+0x4e/0x59 [ 1.893848] [] ? get_lock_stats+0x34/0x5e [ 1.893848] [] ? put_lock_stats+0x25/0x27 [ 1.893848] [] ? mm_unplug_device+0x25/0x50 [ 1.893848] [] blk_remove_plug+0x5f/0x91 [ 1.893848] [] mm_unplug_device+0x30/0x50 [ 1.893848] [] blk_unplug+0x78/0x7d [ 1.893848] [] blk_backing_dev_unplug+0xd/0xf [ 1.893848] [] block_sync_page+0x4a/0x4c [ 1.893848] [] sync_page+0x44/0x4d [ 1.893848] [] __wait_on_bit_lock+0x42/0x8a [ 1.893848] [] ? sync_page+0x0/0x4d [ 1.893848] [] __lock_page+0x64/0x6b [ 1.893848] [] ? wake_bit_function+0x0/0x2a [ 1.893848] [] read_cache_page_async+0xd4/0x134 [ 1.893848] [] ? blkdev_readpage+0x0/0x15 [ 1.893848] [] ? adfspart_check_ICS+0x0/0x16c [ 1.893848] [] read_cache_page+0xe/0x45 [ 1.893848] [] read_dev_sector+0x2e/0x93 [ 1.893848] [] adfspart_check_ICS+0x28/0x16c [ 1.893848] [] ? trace_hardirqs_on+0xd/0xf [ 1.893848] [] ? adfspart_check_ICS+0x0/0x16c [ 1.893848] [] rescan_partitions+0x168/0x2fb [ 1.893848] [] __blkdev_get+0x259/0x336 [ 1.893848] [] ? kobject_put+0x47/0x4b [ 1.893848] [] blkdev_get+0xb/0xd [ 1.893848] [] register_disk+0xc4/0x12b [ 1.893848] [] add_disk+0xc3/0x12d [ 1.893848] [] ? mm_init+0x0/0x1a5 [ 1.893848] [] mm_init+0x129/0x1a5 [ 1.893848] [] ? mm_init+0x0/0x1a5 [ 1.893848] [] _stext+0x56/0x130 [ 1.893848] [] ? register_irq_proc+0xae/0xca [ 1.893848] [] ? proc_pid_lookup+0xb4/0x18b [ 1.893848] [] kernel_init+0x132/0x18b [ 1.893848] [] child_rip+0xa/0x20 [ 1.893848] [] ? restore_args+0x0/0x30 [ 1.893848] [] ? kernel_init+0x0/0x18b [ 1.893848] [] ? child_rip+0x0/0x20 [ 1.893848] ---[ end trace 7150b3b86da74e1f ]--- Signed-off-by: Sage Weil Signed-off-by: Jens Axboe commit 42dad7647aec49b3ad20dd0cb832b232a6ae514f Author: Jerome Marchand Date: Wed Apr 22 14:01:49 2009 +0200 block: simplify I/O stat accounting This simplifies I/O stat accounting switching code and separates it completely from I/O scheduler switch code. Requests are accounted according to the state of their request queue at the time of the request allocation. There is no need anymore to flush the request queue when switching I/O accounting state. Signed-off-by: Jerome Marchand Signed-off-by: Jens Axboe commit 097102c2d04974bdfcfa16a5f3062d499842139c Author: Alexander Beregalov Date: Tue Apr 21 09:33:14 2009 +0200 pktcdvd.h should include mempool.h Fix this build error: In file included from fs/compat_ioctl.c:104: include/linux/pktcdvd.h:285: error: expected specifier-qualifier-list before 'mempool_t' Signed-off-by: Alexander Beregalov Signed-off-by: Jens Axboe commit 2d40570786c7c208539c65893818119557327ba0 Merge: 04a2e62... e047cca... Author: Len Brown Date: Fri Apr 24 01:35:46 2009 -0400 Merge branch 'bugzilla-12249' into release commit 04a2e6297df5ff04ddfbd6f2bdeefc218195ce96 Merge: ac0849f... 82babbb... Author: Len Brown Date: Fri Apr 24 01:35:33 2009 -0400 Merge branch 'bugzilla-12270' into release commit ac0849fb6c66ca865270fda32bcbc39f6dd52de1 Merge: 09041da... 96f15ef... Author: Len Brown Date: Fri Apr 24 01:35:24 2009 -0400 Merge branch 'bugzilla-13041' into release commit 09041daeea467090f57507473a3ec8ec0e68be6d Merge: f752a09... d876dfb... Author: Len Brown Date: Fri Apr 24 01:35:15 2009 -0400 Merge branch 'cpufreq' into release commit f752a091abd1f9d38f926823bfd5c8480dd1132b Merge: 6e6c348... 9261461... Author: Len Brown Date: Fri Apr 24 01:35:08 2009 -0400 Merge branch 'idle' into release commit 6e6c348fb23122c6faf89ef10f1b9f034dba0da5 Merge: 7f3745a... 88bea18... Author: Len Brown Date: Fri Apr 24 01:34:59 2009 -0400 Merge branch 'irq' into release commit 7f3745ad7aca48b946136e3173861821fa8b24c5 Merge: 771e5ce... 53005a0... Author: Len Brown Date: Fri Apr 24 01:34:52 2009 -0400 Merge branch 'sony-laptop' into release commit 771e5ce3bd96f315e213f6263e40b2b2ee7e5201 Merge: 7b80601... 6740543... Author: Len Brown Date: Fri Apr 24 01:34:45 2009 -0400 Merge branch 'thermal-regression' into release commit 7b806016b14532b4206b81ba16062cf82c68e430 Merge: 60cd8ad... b57f7e7... Author: Len Brown Date: Fri Apr 24 01:34:37 2009 -0400 Merge branch 'thinkpad-acpi' into release commit 60cd8adc6bfddd5139a4400ba5127863f0381dac Merge: 0910697... 90af2cf... Author: Len Brown Date: Fri Apr 24 01:34:29 2009 -0400 Merge branch 'video-ac-dc' into release commit b7f0ab460f772b09a9c664d746236a280fec714c Author: Matthew Garrett Date: Wed Apr 15 21:46:36 2009 +0100 ACPI, i915: Register ACPI video even when not modesetting The ACPI video driver defers registration to the i915 driver if the system supports opregion-mediated backlight control. This registration was only being performed in the KMS case. Ensure it's done even if we don't have modesetting enabled. http://bugzilla.kernel.org/show_bug.cgi?id=13048 Signed-off-by: Matthew Garrett Signed-off-by: Len Brown commit a38d75fa2e48d4960b656eac39bc8a6b584a83c0 Author: Len Brown Date: Fri Apr 24 00:32:52 2009 -0400 Revert "ACPICA: delete check for AML access to port 0x81-83" This reverts commit fdbdc7fc79c02ae4ede869d514179a2c65633d28. That temporary quick-fix is no longer necessary, as the previous patch, a65131e942e25c707a652fa4ec2cfcd8b63fec11, "I/O port protection: update for windows compatibility" should handle this issue for all ports, including this one. Signed-off-by: Len Brown commit a65131e942e25c707a652fa4ec2cfcd8b63fec11 Author: Lin Ming Date: Thu Apr 16 15:18:16 2009 +0800 I/O port protection: update for windows compatibility. For windows compatibility, 1) On a port protection violation, simply ignore the request and do not return an exception (allow the control method to continue execution.) 2) If only part of the request overlaps a protected port, read/write the individual ports that are not protected. http://bugzilla.kernel.org/show_bug.cgi?id=13036 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 53005a0a1b53bda5810c45efe3025d1884aa6bb3 Author: Mattia Dongili Date: Sun Apr 12 11:26:31 2009 +0000 sony-laptop: always try to unblock rfkill on load This fixes an inconsistent behaviour when loading the driver with the switch on or off. In the former case you would also need to soft unblock the switch via the sysfs file entries to really disable rfkill, in the latter you wouldn't. Signed-off-by: Mattia Dongili Cc: Matthias Welwarsky Acked-by: Matthew Garrett Signed-off-by: Len Brown commit c35d4b3532ed3e2076fb14c25385cf6cef41cc69 Author: Mattia Dongili Date: Sun Apr 12 11:26:30 2009 +0000 sony-laptop: fix bogus error message display on resume sony_backlight_update_status returns 0 on success -1 on failure (i.e.: the return value from acpi_callsetfunc. The return value in the resume path was broken and thus always displaying a bogus warning about not being able to restore the brightness level. Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit 5aa63f038f042fd1acd6e720a95df72857db0bc7 Author: Almer S. Tigelaar Date: Sun Apr 12 11:26:29 2009 +0000 ACPI: EC: Fix ACPI EC resume non-query interrupt message When resuming from standby (on a laptop) I see the following message in my kernel.log: "ACPI: EC: non-query interrupt received, switching to interrupt mode" This apparently prevented sony-laptop to properly restore the brightness level on resume. The cause: In drivers/acpi/ec.c the acpi_ec_suspend function clears the GPE mode bit, but this is not restored in acpi_ec_resume (the function below it). The patch below fixes this by properly restoring the GPE_MODE bit. Tested and confirmed to work. Signed-off-by: Almer S. Tigelaar Signed-off-by: Mattia Dongili Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit a83021a229016f93b4e532d9cef21b01be5a8bb7 Author: Almer S. Tigelaar Date: Sun Apr 12 11:26:28 2009 +0000 sony-laptop: SNC input event 38 fix Fixes the "unknown input event 38" messages. ANYBUTTON_RELEASED is now treated the same way as FN_KEY_RELEASED. Signed-off-by: Almer S. Tigelaar Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit 560e84ac1b92d2a704fbfda29b46ad1b0a8d457e Author: Almer S. Tigelaar Date: Sun Apr 12 11:26:27 2009 +0000 sony-laptop: SNC 127 Initialization Fix Fixes additional special key initialization for SNC 127 key events. Verified / tested on a Sony VAIO SR model. Signed-off-by: Almer S. Tigelaar Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit 226fced325e2865369cbeac41c6a97536d4daa1b Author: Almer S. Tigelaar Date: Sun Apr 12 11:26:26 2009 +0000 sony-laptop: Duplicate SNC 127 Event Fix Fixes a duplicate mapping in the SNC sony_127_events structure. Signed-off-by: Almer S. Tigelaar Signed-off-by: Mattia Dongili Signed-off-by: Len Brown commit 615dfd93e2346b604232b559e7ea0835d24abe26 Author: Len Brown Date: Thu Apr 23 23:21:29 2009 -0400 ACPI: prevent processor.max_cstate=0 boot crash As processor.max_cstate is an init-time-only modparam, sanity checking it at init-time is sufficient. http://bugzilla.kernel.org/show_bug.cgi?id=13142 Signed-off-by: Len Brown commit f461ddea0af8b98e2b7940eba9c693b0ee44d64a Author: Len Brown Date: Thu Apr 23 18:59:43 2009 -0400 ACPI/hpet: prevent boot hang when hpet=force used on ICH-4M Linux tells ICH4 users that they can (manually) invoke "hpet=force" to enable the undocumented ICH-4M HPET. The HPET becomes available for both clocksource and clockevents. But as of ff69f2bba67bd45514923aaedbf40fe351787c59 (acpi: fix of pmtimer overflow that make Cx states time incorrect) the HPET may be used via clocksource for idle accounting, and hpet=force on an ICH4 box hangs boot. It turns out that touching the MMIO HPET withing the ARB_DIS part of C3 will hang the hardware. The fix is to simply move the timer access outside the ARB_DIS region. This is a no-op on modern hardware because ARB_DIS is no longer used. http://bugzilla.kernel.org/show_bug.cgi?id=13087 Acked-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit fdd8b079e33d4711527ace19798e9db99a056469 Author: Nicolas Pitre Date: Wed Apr 22 20:08:17 2009 +0100 [ARM] 5460/1: Orion: reduce namespace pollution Symbols like SOFT_RESET are way too generic to be exported at large. To avoid this, let's move the mbus bridge register defines into a separate file and include it where needed. This affects mach-kirkwood, mach-loki, mach-mv78xx0 and mach-orion5x simultaneously as they all share code in plat-orion which relies on those defines. Some other defines have been moved to narrower scopes, or simply deleted when they had no user. This fixes compilation problem with mpt2sas on the above listed platforms. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit ae1036a2f4e8f83b544ddce4f875a1e4e2ac7b62 Author: Dmitry Baryshkov Date: Mon Apr 20 17:48:28 2009 +0100 [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config Check if we really have Scoop config, otherwice we can get a nice Oops during probe. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Russell King commit 6b35ca0d3d586b8ecb8396821af21186e20afaf0 Author: Martin Fuzzey Date: Tue Apr 21 21:48:09 2009 +0200 USB: pwc : do not pass stack allocated buffers to USB core. This is causes problems on platforms that have alignment requirements for DMA transfers. Signed-off-by: Martin Fuzzey Acked-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit ecf85e481a716cfe07406439fdc7ba9526bbfaeb Author: Robert Jarzmik Date: Tue Apr 21 20:33:10 2009 -0700 USB: otg: Fix bug on remove path without transceiver In the case where a gadget driver is removed while no transceiver was found at probe time, a bug in otg_put_transceiver() will trigger. Provide symetric calls for otg_get_transceiver() and otg_put_transceiver(), wherever a transceiver was found or not. Signed-off-by: Robert Jarzmik Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 052fbc0d7f76106725c998183d64dcacecd21f8f Author: Oliver Neukum Date: Mon Apr 20 17:24:49 2009 +0200 USB: correct error handling in cdc-wdm This patch to cdc-wdm - checks for partial extra descriptors - fixes a leak in the error case of probe - checks for an exact number of endpoints - adds a clarifying comment Signed-off-by: Oliver Neukum Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2400a2bfbd0e912193fe3b077f492d4980141813 Author: Oliver Neukum Date: Mon Apr 20 17:28:53 2009 +0200 USB: removal of tty->low_latency hack dating back to the old serial code This removes tty->low_latency from all USB serial drivers that push data into the tty layer at hard interrupt context. It's no longer needed and actually harmful. Signed-off-by: Oliver Neukum Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 212b8f0c3f5a2280bfa1d6ab13a6fe98552becaa Author: Elina Pasheva Date: Tue Apr 21 17:54:42 2009 -0700 USB: serial: sierra driver bug fix for composite interface This patch fixes a problem in sierra_send_setup() function when composite devices are used. One should not be sending ACM commands to interfaces that are OBEX. Doing this causes an apparent failure as the ACM command has to time out before the interface can start being used. Signed-off-by: Elina Pasheva Signed-off-by: Greg Kroah-Hartman commit 864e28b4f24106b799e991fa136fa6fa2b638a68 Author: David Brownell Date: Thu Apr 16 13:51:46 2009 -0700 USB: gadget: omap_udc uses platform_driver_probe() We now have a more correct solution for shrinking runtime driver footprints than just marking probe() as __init ... use it. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 36825a2deca913a11915893b6ecf5e1d817b6e75 Author: Matthias Kaehlcke Date: Wed Apr 15 22:28:36 2009 +0200 USB: ci13xxx_udc: fix build error Fix build error in the MIPS USB IP core family device controller driver. The driver calls udelay() without including linux/delay.h Signed-off-by: Matthias Kaehlcke Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit fbfc396efbc11d784b4325adfc02e82a0df01a8d Author: Mark A. Greer Date: Tue Apr 21 20:52:54 2009 -0700 USB: musb: Prevent multiple includes of musb.h Add #ifndef to musb header file to prevent multiple inclusions. Signed-off-by: Mark A. Greer Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit a8aa401f38cfb5fa26e970b48e93fb851d68fe64 Author: Johannes Berg Date: Sat Apr 18 11:00:39 2009 +0200 USB: pass mem_flags to dma_alloc_coherent When I want to use my webcam, I get: vvvvvvv cheese: page allocation failure. order:5, mode:0x8004 Pid: 8100, comm: cheese Not tainted 2.6.30-rc2-wl-dirty #102 Call Trace: [] __alloc_pages_internal+0x3fe/0x520 [] dma_generic_alloc_coherent+0x90/0x120 [] hcd_buffer_alloc+0xee/0x130 [usbcore] [] usb_buffer_alloc+0x2d/0x40 [usbcore] [] uvc_alloc_urb_buffers+0x84/0x140 [uvcvideo] [] uvc_init_video+0x126/0x400 [uvcvideo] [...] Oddly, I remembered fixing this and putting in __GFP_NOWARN because uvcvideo retries a smaller allocation. However, the allocation function doesn't pass the gfp flags through to dma_alloc_coherent so we still get the warning! Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman commit 82a10a81c853be3859b3d222db0f372ee8d2eaa2 Author: Alan Stern Date: Thu Apr 16 15:37:28 2009 -0400 USB: g_file_storage: fix use-after-free bug when closing files This patch (as1231) fixes a use-after-free bug in g_file_storage. A device's name may not be available after the device is unregistered, even if the device structure itself is still allocated. Since close_backing_file() prints a LUN's name for debugging, it shouldn't be called after the LUN has been unregistered. That whole area needed to be cleaned up; the backing files were getting closed in a couple of different places. The patch fixes things so that they get closed in just one place, as part of the unbind procedure, immediately before the LUN is unregistered. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c065c60e83c006611caed23d1320450fcd709398 Author: Dan Streetman Date: Tue Apr 21 13:37:12 2009 -0400 USB: ehci-sched.c: EHCI SITD scheduling bugfix Without this patch, the driver won't check that the last fully-occupied uframe for a new split transaction was vacant beforehand. This can lead to a situation in which the first 188 bytes of a 192-byte isochronous transfer are scheduled in the same uframe as an existing interrupt transfer. The resulting schedule looks like this: uframe 0: 188-byte isoc-OUT SSPLIT, 8-byte int-IN SSPLIT uframe 1: 4-byte isoc-OUT SSPLIT The SSPLITs are intermingled, causing an error in the downstream hub's TT. If you are having problems with devices or hub ports resetting, or failed interrupt transfers, when you start using a USB audio or video (Isochronous) device, this patch may help. Signed-off-by: Dan Streetman Reported-by: Kung James Acked-by: David Brownell Cc: Alan Stern commit 37768adf9a1d49aeac0db1ba3dc28b3274b7b789 Author: Tony Cook Date: Sat Apr 18 22:42:18 2009 +0930 USB: fix mos7840 problem with minor numbers This patch fixes a problem with any mos7840 device where the use of the field "minor" before it is initialised results in all the devices being overlaid in memory (minor = 0 for all instances) Contributed by: Phillip Branch Signed-off-by: Tony Cook Signed-off-by: Greg Kroah-Hartman commit e9b8cffa923e8eb3fe70ea05d3fcfffc90a71a57 Author: Tony Cook Date: Sat Apr 18 22:42:18 2009 +0930 USB: mos7840: add new device id add USB ids for the mos7840 based ATEN International serial devices. Contributed by: Phillip Branch Signed-off-by: Tony Cook Signed-off-by: Greg Kroah-Hartman commit 10c966c310da12e1e3f68d717a8e15274fdadf29 Author: Alexander Beregalov Date: Fri Apr 17 15:19:14 2009 +0400 USB: musb: fix build when !CONFIG_PM Fix this build error when CONFIG_PM is not set: drivers/usb/musb/musb_core.c:2232: error: 'musb_resume_early' undeclared here Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 9cceedb8a87f31e341c1bf1bc6c28a13f9632aff Author: Jarkko Nikula Date: Fri Apr 17 13:52:00 2009 +0300 USB: musb: Remove my email address from few musb related drivers This email address is going to expire soon and my contribution to musb is next to zero so remove it. Signed-off-by: Jarkko Nikula Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit f23e649bb605523b960434c5e18c8e9ad3f0b5bd Author: David Lopo Date: Thu Apr 16 14:35:24 2009 -0700 USB: Gadget: MIPS CI13xxx UDC bugfixes Bug Fix: high speed detection in LPM mode Bug Fix: max packet size configuration when switching between HS and FS Signed-off-by: David Lopo Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 46c6e93faa85d1362e1d127dc28cf9d0b304a6f1 Author: Chuck Short Date: Tue Apr 14 20:50:31 2009 +0200 USB: Unusual Device support for Gold MP3 Player Energy Reported by Alessio Treglia on https://bugs.launchpad.net/ubuntu/+source/linux/+bug/125250 User was getting the following errors in dmesg: [ 2158.139386] sd 5:0:0:1: ioctl_internal_command return code = 8000002 [ 2158.139390] : Current: sense key: No Sense [ 2158.139393] Additional sense: No additional sense information Adds unusual device support. modified: drivers/usb/storage/unusual_devs.h Signed-off-by: Chuck Short Signed-off-by: Tim Gardner Signed-off-by: Stefan Bader Cc: stable Signed-off-by: Greg Kroah-Hartman commit 2d93148ab6988cad872e65d694c95e8944e1b626 Author: Alan Stern Date: Tue Apr 14 11:31:02 2009 -0400 USB: serial: fix lifetime and locking problems This patch (as1229) fixes a few lifetime and locking problems in the usb-serial driver. The main symptom is that an invalid kevent is created when the serial device is unplugged while a connection is active. Ports should be unregistered when device is disconnected, not when the parent usb_serial structure is deallocated. Each open file should hold a reference to the corresponding port structure, and the reference should be released when the file is closed. serial->disc_mutex should be acquired in serial_open(), to resolve the classic race between open and disconnect. serial_close() doesn't need to hold both serial->disc_mutex and port->mutex at the same time. Release the subdriver's module reference only after releasing all the other references, in case one of the release routines needs to invoke some code in the subdriver module. Replace a call to flush_scheduled_work() (which is prone to deadlocks) with cancel_work_sync(). Also, add a call to cancel_work_sync() in the disconnect routine. Reduce the scope of serial->disc_mutex in serial_disconnect(). The only place it really needs to protect is where the "disconnected" flag is set. This fixes the bug reported in http://bugs.freedesktop.org/show_bug.cgi?id=20703 Signed-off-by: Alan Stern Tested-by: Dan Williams Tested-by: Ming Lei Reviewed-by: Oliver Neukum Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b930f964cfe65941c6b1ba61efedfe49da3f6353 Author: Bartlomiej Zolnierkiewicz Date: Thu Apr 23 22:53:45 2009 +0200 MAINTAINERS: update IDE entry By a popular demand quilt tree was replaced by a git one. Signed-off-by: Bartlomiej Zolnierkiewicz commit d7f5143522d938ea7c4f117c6fa6b1d3fa5af994 Author: Bartlomiej Zolnierkiewicz Date: Thu Apr 23 22:53:45 2009 +0200 palm_bk3710: palm_bk3710_udmatimings[] CodingStyle fixup Remove superfluous commas and add missing whitespaces. Noticed-by: Joe Perches Cc: David Brownell Signed-off-by: Bartlomiej Zolnierkiewicz commit 33e86019f77b6358bfe06767e08154be032d8751 Author: David Brownell Date: Thu Apr 23 22:53:43 2009 +0200 palm_bk3710: those registers/bitfields don't exist Bugfixes noted by checking the code against the controller documentation (TI document number SPRUE21): - Remove declarations for eight non-existent registers (!); and remove accesses to two of them. - Remove access to various non-existent bitfields in some of the registers which *do* exist (those fields must-be-zero). - Provide comment to replace bogus reset logic (removed above, it relied on non-existent bitfields). Resets require GPIO help; this driver doesn't currently know about that. With some minor cleanup: relocate a comment, avoid an extra lookup of the PIO timings. Signed-off-by: David Brownell Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit f57f2fe2a39338c47b67fbd564a9d3b7587bcbee Author: Coly Li Date: Thu Apr 23 03:05:31 2009 +0800 microblaze: add parameter to microblaze_read() This patch modifies parameter of microblaze_read() from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type. Signed-off-by: Coly Li Cc: Michal Simek Cc: Ingo Molnar Signed-off-by: Michal Simek commit 993ce24078eac1442078741cd204584b63de0881 Author: Michal Simek Date: Tue Apr 21 14:12:18 2009 +0200 microblaze: Use CFLAGS_KERNEL instead of CFLAGS Signed-off-by: Michal Simek commit 2921e2bd679949a7892d308b414e6a3b3c705260 Author: Michal Simek Date: Tue Apr 21 14:08:47 2009 +0200 microblaze: Add STATE_SAVE_ARG_SPACE for noMMU kernel too For noMMU kernel this change nothing bring but this change helps with MMU synchronization. Signed-off-by: Michal Simek commit 6dfb79aa114ac69032f3931235ffc90799e9630b Author: Michal Simek Date: Tue Apr 21 14:07:00 2009 +0200 microblaze: Do not check use_dcache It is not necessary to check cpuinfo.use_dcache because this checking is done in function which call that functions Signed-off-by: Michal Simek commit fbeda67782689bf80109512b16ac47264a282d01 Author: Michal Simek Date: Tue Apr 21 14:06:08 2009 +0200 microblaze: Do not use PVR configuration for broken MB version Signed-off-by: Michal Simek commit 79533fd4cb7c261694d3b7d5bdde78836bc35b49 Author: Michal Simek Date: Tue Apr 21 14:04:39 2009 +0200 microblaze: Fix USR1/2 pvr printing message Signed-off-by: Michal Simek commit 6e60c14810d8da792e418fdcb2110b4185d1b9a2 Author: Roel Kluin Date: Thu Apr 16 22:49:17 2009 +0200 microblaze: iowrite upon timeout retries reaches -1, so the iowrite occurrs upon timeout. Acked-by: John Williams Signed-off-by: Roel Kluin Signed-off-by: Michal Simek commit 04e3a553e0cbed369e5649c472ac317b6c45215d Author: Michal Simek Date: Mon Apr 20 09:56:24 2009 +0200 microblaze: Correspond CONFIG...PCMP in Makefile/Kconfig Makefile contained different cpu config flag than is in Kconfig.auto in platform folder Signed-off-by: Michal Simek commit 6714fcc34e1bcf247fe542ebdea36b699ff8e2b8 Author: Michal Simek Date: Thu Apr 16 11:32:21 2009 +0200 microblaze: Remove redundant variable Signed-off-by: Michal Simek commit e1c4bd0897b6d03eff4b32197d6ab017f83fc836 Author: Michal Simek Date: Thu Apr 16 11:30:16 2009 +0200 microblaze: Move start_thread to process.c This change is due to upcomming MMU merge Signed-off-by: Michal Simek commit df4f3eb7c318e34899e9499bc5c9295690f7a106 Author: Michal Simek Date: Thu Apr 16 11:29:13 2009 +0200 microblaze: Add missing preadv and pwritev syscalls Signed-off-by: Michal Simek commit ce0b755f7dda4f1c06b89f7e903667f538dadd3c Author: Michal Simek Date: Thu Apr 16 11:11:22 2009 +0200 microblaze: Add missing declaration for die and _exception func This change remove sparse errors. Signed-off-by: Michal Simek commit bf7e9da4e70a9d4bf9dc5829ff854398e0e4b7f7 Author: Michal Simek Date: Thu Apr 16 11:10:07 2009 +0200 microblaze: Remove sparse error in traps.c CHECK arch/microblaze/kernel/traps.c arch/microblaze/kernel/traps.c:37:47: warning: Using plain integer as NULL pointer CC arch/microblaze/kernel/traps.o Signed-off-by: Michal Simek commit 2eba318e0db1114726e69660d6b9e1bd59b10ba1 Author: Michal Simek Date: Thu Apr 16 11:05:26 2009 +0200 microblaze: Move task_pt_regs up This change is important for easier merge with Microblaze MMU code. Signed-off-by: Michal Simek commit ac3efab50621bd6d01e5b40f3134dc7824788390 Author: Michal Simek Date: Thu Apr 16 10:58:47 2009 +0200 microblaze: Rename kernel_mode to pt_mode in pt_regs Signed-off-by: Michal Simek commit ceb8944b3a3dd3ec4094a476a44802cc32c4fc02 Author: Michal Simek Date: Thu Apr 16 10:46:37 2009 +0200 microblaze: Remove uncache shadow condition Uncached shadow feature is not supported in current kernel code that's why I removed it. Signed-off-by: Michal Simek commit 51eb6dc9ca40d086c102bb868ba7f29f33a30f6f Author: Michal Simek Date: Thu Apr 16 10:41:45 2009 +0200 microblaze: Remove while(1) loop from show_regs function I removed it because of show_regs can't break die function. If process/kernel failed, die (do_exit) function resolve it. Signed-off-by: Michal Simek commit f2ec24fd42d52a52829070b5e31d9a17d145df30 Author: Michal Simek Date: Thu Apr 16 10:36:54 2009 +0200 microblaze: Remove unneded per cpu SYSCALL_SAVE variable Signed-off-by: Michal Simek commit e655dc8873b2390d92888095af6adad822a8b386 Author: Martin Schwidefsky Date: Thu Apr 23 13:58:11 2009 +0200 [S390] update default configuration. Signed-off-by: Martin Schwidefsky commit 75ee034addc9ac3f6a38a9e6b30e9b54be15d4e5 Author: Heiko Carstens Date: Thu Apr 23 13:58:10 2009 +0200 [S390] omit frame pointers on s390 when possible Always omit frame pointers on s390. They aren't too useful for the kernel since we have already the kernel stack backchain which allows us to walk the kernel stack. So eleminate the extra code for frame pointers. Only allow the extra code for the function tracer since the gcc compile options -pg and -fomit-frame-pointer are incompatible. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 4d7a3cdfb4c9aa1e2ce61f3b16b24eb6acf6726d Author: Frank Munzert Date: Thu Apr 23 13:58:09 2009 +0200 [S390] Use tape_generic_offline directly. tape_3590_offline and tape_34xx_offline are removed and tape_generic_offline is called directly instead. Signed-off-by: Frank Munzert Signed-off-by: Martin Schwidefsky commit e1c805309d19c69d4ebeac38724076fa86feacdf Author: Martin Schwidefsky Date: Thu Apr 23 13:58:08 2009 +0200 [S390] /proc/stat idle field for idle cpus The cpu idle field in the output of /proc/stat is too small for cpus that have been idle for more than a tick. Add the architecture hook arch_idle_time that allows to add the not accounted idle time of a sleeping cpu without waking the cpu. The s390 implementation of arch_idle_time uses the already existing s390_idle_data per_cpu variable to find the sleep time of a neighboring idle cpu. Signed-off-by: Martin Schwidefsky commit b1ad171efa089ae26aba750d747d8149a4f860d5 Author: Gerald Schaefer Date: Thu Apr 23 13:58:07 2009 +0200 [S390] appldata: avoid deadlock with appldata_mem The appldata_ops callbacks are called with a spin_lock held. But the appldata_mem callback then calls all_vm_events(), which calls get_online_cpus(), which might sleep. This possible deadlock is fixed by using a mutex instead of a spin_lock. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 3bd5f3ef290627efa3c219fa21a82eea90bc4cb0 Author: Heiko Carstens Date: Thu Apr 23 13:58:06 2009 +0200 [S390] ipl: fix compile breakage Fix this for !CONFIG_SMP: arch/s390/kernel/ipl.c: In function 'stop_run': arch/s390/kernel/ipl.c:1461: error: implicit declaration of function 'signal_processor' Reported-by: Sachin Sant Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d9ba7615bfd8bb06f79c853f9dfff9e93a837941 Author: Steven Whitehouse Date: Thu Apr 23 08:59:41 2009 +0100 GFS2: Ensure that the inode goal block settings are updated GFS2 has a goal block associated with each inode indicating the search start position for future block allocations (in fact there are two, but thats for backward compatibility with GFS1 as they are set to identical locations in GFS2). In some circumstances, depending on the ordering of updates to the inode it was possible for the goal block settings to not be updated on disk. This patch ensures that the goal block will always get updated, thus reducing the potential for searching the same (already allocated) blocks again when looking for free space during block allocation. Signed-off-by: Steven Whitehouse commit d8bd504ab800c8e9aadb983914a33e7166320bec Author: Steven Whitehouse Date: Thu Apr 23 08:54:02 2009 +0100 GFS2: Fix bug in block allocation The new bitfit algorithm was counting from the wrong end of 64 bit words in the bitfield. This fixes it by using __ffs64 instead of fls64 Signed-off-by: Steven Whitehouse commit 952043ac12a117d8e94bddd9088338d7ad20ca7d Author: Steven Whitehouse Date: Thu Apr 23 08:48:15 2009 +0100 bitops: Add __ffs64 bitop Finds the first set bit in a 64 bit word. This is required in order to fix a bug in GFS2, but I think it should be a generic function in case of future users. Signed-off-by: Steven Whitehouse Reviewed-by: Christoph Lameter Reviewed-by: Willy Tarreau commit b5451f7b2694b04d9f912f6cf09db1729f291996 Author: Theodore Ts'o Date: Wed Apr 22 21:00:36 2009 -0400 ext4: Fix potential inode allocation soft lockup in Orlov allocator If the Orlov allocator is having trouble finding an appropriate block group, the fallback code could loop forever, causing a soft lockup warning in find_group_orlov(): BUG: soft lockup - CPU#0 stuck for 61s! [cp:11728] ... Pid: 11728, comm: cp Not tainted (2.6.30-rc1-dirty #77) Lenovo EIP: 0060:[] EFLAGS: 00000246 CPU: 0 EIP is at ext4_get_group_desc+0x54/0x9d ... Call Trace: [] find_group_orlov+0x2ee/0x334 [] ? sched_clock+0x8/0xb [] ext4_new_inode+0x2cf/0xb1a Signed-off-by: "Theodore Ts'o" commit e84a26ce178345498a7eca0590852bcc36f1092f Author: Theodore Ts'o Date: Wed Apr 22 20:52:25 2009 -0400 ext4: Make the extent validity check more paranoid Instead of just checking that the extent block number is greater or equal than s_first_data_block, make sure it it is not pointing into the block group descriptors, since that is clearly wrong. This helps prevent filesystem from getting very badly corrupted in case an extent block is corrupted. Signed-off-by: "Theodore Ts'o" commit 92614610774072ea68131f16e024ee8fc15be9be Author: Len Brown Date: Wed Apr 22 19:28:15 2009 -0400 ACPI: delete obsolete "bus master activity" proc field Linux-2.6.29 deleted the legacy ACPI idle handler, leaving the CPU_IDLE handler, which does not track bus master activity. So delete the unused bm_activity field -- it is confusing to print an always zero value. This patch could break programs that parse /proc/acpi/processor/*/power, since it deletes this line from that file: bus master activity: 00000000 http://bugzilla.kernel.org/show_bug.cgi?id=13145 is not fixed by this patch, but provoked this patch. Signed-off-by: Len Brown commit 64f68416e794d59a42ddffdf1c5b7f026a4f23d5 Author: Greg Ungerer Date: Thu Apr 23 09:23:32 2009 +1000 m68knommu: update the default config for the ColdFire 5407C3 board Signed-off-by: Greg Ungerer commit a71e4917dc0ebbcb5a0ecb7ca3486643c1c9a6e2 Author: Len Brown Date: Tue Apr 21 00:50:11 2009 -0400 ACPI: idle: mark_tsc_unstable() at init-time, not run-time The c2 and c3 idle handlers check tsc_halts_in_c() after every time they return from idle. Um, when?:-) Move this check to init-time to remove the unnecessary run-time overhead, and also to have the check complete before the first entry into the idle handler. ff69f2bba67bd45514923aaedbf40fe351787c59 (acpi: fix of pmtimer overflow that make Cx states time incorrect) replaced the hard-coded use of the PM-timer inside idle, with ktime_get_readl(), which possibly uses the TSC -- so it is now especially prudent to detect a broken TSC before entering idle. http://bugzilla.kernel.org/show_bug.cgi?id=13087 Signed-off-by: Len Brown commit 3a6b42cadc112b01daf0525e5fcd90bb333a5bb3 Author: Tyler Hicks Date: Thu Apr 16 18:35:37 2009 -0500 eCryptfs: Larger buffer for encrypted symlink targets When using filename encryption with eCryptfs, the value of the symlink in the lower filesystem is encrypted and stored as a Tag 70 packet. This results in a longer symlink target than if the target value wasn't encrypted. Users were reporting these messages in their syslog: [ 45.653441] ecryptfs_parse_tag_70_packet: max_packet_size is [56]; real packet size is [51] [ 45.653444] ecryptfs_decode_and_decrypt_filename: Could not parse tag 70 packet from filename; copying through filename as-is This was due to bufsiz, one the arguments in readlink(), being used to when allocating the buffer passed to the lower inode's readlink(). That symlink target may be very large, but when decoded and decrypted, could end up being smaller than bufsize. To fix this, the buffer passed to the lower inode's readlink() will always be PATH_MAX in size when filename encryption is enabled. Any necessary truncation occurs after the decoding and decrypting. Signed-off-by: Tyler Hicks commit ca8e34f2b05a8289b47907b083dc01dd654ecbde Author: Tyler Hicks Date: Wed Apr 22 16:27:12 2009 -0500 eCryptfs: Lock lower directory inode mutex during lookup This patch locks the lower directory inode's i_mutex before calling lookup_one_len() to find the appropriate dentry in the lower filesystem. This bug was found thanks to the warning set in commit 2f9092e1. Signed-off-by: Tyler Hicks commit adfe7c69891128f5e238a5e6823709b4bb85b340 Author: Geert Uytterhoeven Date: Sun Mar 29 14:23:44 2009 +0200 m68k: Update defconfigs for 2.6.30-rc3 Signed-off-by: Geert Uytterhoeven commit cc7c0fa3b90a047751f50371639b90dc119e63ea Author: Geert Uytterhoeven Date: Thu Apr 9 22:23:51 2009 +0200 m68k,m68knommu: Wire up preadv and pwritev Signed-off-by: Geert Uytterhoeven Acked-by: Greg Ungerer commit 2d138ae09935cec055f65d18300727a7a46d92b9 Author: Geert Uytterhoeven Date: Thu Apr 9 21:22:42 2009 +0200 scsi: a4000 - Correct driver unregistration in case of failure commit 7a192ec334cab9fafe3a8665a65af398b0e24730 ("platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver') turned a driver_UNregister into platform_driver_REGISTER. Correct this to platform_driver_UNregister. Signed-off-by: Geert Uytterhoeven commit 83cff839268feb2f31ae7667b9b2b7641dc10575 Author: Bartlomiej Zolnierkiewicz Date: Wed Apr 22 20:33:41 2009 +0200 mediabay: fix build for CONFIG_BLOCK=n On Tuesday 14 April 2009 20:31:21 Subrata Modak wrote: > Observed the following build error: > --- > CC drivers/macintosh/mediabay.o > In file included from drivers/macintosh/mediabay.c:21: > include/linux/ide.h:605: error: field ‘request_sense_rq’ has incomplete > type > make[2]: *** [drivers/macintosh/mediabay.o] Error 1 > make[1]: *** [drivers/macintosh] Error 2 > make: *** [drivers] Error 2 > --- mediabay shouldn't include unconditionally so remove the superfluous include from mediabay.c ( will pull in for CONFIG_BLK_DEV_IDE_PMAC=y). Reported-by: Subrata Modak Cc: Paul Mackerras Signed-off-by: Bartlomiej Zolnierkiewicz commit b0aedb04eae79372fbe101d98513773d6b89935d Author: Bruno Prémont Date: Wed Apr 22 20:33:41 2009 +0200 ide: Stop disks on reboot for laptop which cuts power My laptop (Acer Travelmate 660) always cuts the power when rebooting which causes the disk to emergency-park it's head. Add a dmi check to stop disk as for shutdown on this laptop. Signed-off-by: Bruno Prémont Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit a1f9a89c90b4ac143c5b6054c2a157572b272cd2 Author: Helge Deller Date: Wed Apr 22 20:33:40 2009 +0200 ide-cd: fix kernel crash on hppa regression With 2.6.30-rc2 I face a kernel crash on the 32bit hppa architecture due to ide-cd when udev creates the device nodes at startup: Kernel Fault: Code=26 regs=8ed34c40 (Addr=00000024) IASQ: 00000000 00000000 IAOQ: 1034b5ac 1034b5b0 IIR: 4ab30048 ISR: 00000000 IOR: 00000024 CPU: 0 CR30: 8ed34000 CR31: ffff55ff ORIG_R28: 00000000 IAOQ[0]: ide_complete_rq+0x2c/0x70 IAOQ[1]: ide_complete_rq+0x30/0x70 RP(r2): cdrom_newpc_intr+0x178/0x46c Backtrace: [<1035c608>] cdrom_newpc_intr+0x178/0x46c [<1034c494>] ide_intr+0x1b0/0x214 [<1016d284>] handle_IRQ_event+0x70/0x150 [<1016d4b0>] __do_IRQ+0x14c/0x1cc [<102f7864>] superio_interrupt+0x88/0xbc [<1016d284>] handle_IRQ_event+0x70/0x150 [<1016d4b0>] __do_IRQ+0x14c/0x1cc [<10112efc>] do_cpu_irq_mask+0x9c/0xd0 [<10116068>] intr_return+0x0/0x4 This crash seems to happen due to an uninitialized variable "rc". The compiler even warns about that: CC drivers/ide/ide-cd.o /mnt/sda4/home/cvs/parisc/git-kernel/linus-linux-2.6/drivers/ide/ide-cd.c: In function `cdrom_newpc_intr': /mnt/sda4/home/cvs/parisc/git-kernel/linus-linux-2.6/drivers/ide/ide-cd.c:612: warning: `rc' might be used uninitialized in this function After applying the trivial patch below, which just initializes the variable to zero, the kernel doesn't crash any longer: Starting the hotplug events dispatcher: udevd. Synthesizing the initial hotplug events... hda: command error: status=0x51 { DriveReady SeekComplete Error } hda: command error: error=0x54 <3>{ AbortedCommand LastFailedSense=0x05 } ide: failed opcode was: unknown done. Signed-off-by: Helge Deller Acked-by: Borislav Petkov Cc: Linus Cc: Kyle McMartin Cc: "Rafael J. Wysocki" Signed-off-by: Bartlomiej Zolnierkiewicz commit db2f38c22ea3f545be3b5772e5f9dc5861b74536 Author: David Brownell Date: Wed Apr 22 20:33:40 2009 +0200 palm_bk3710: UDMA performance fix Fix UDMA throughput bug: tCYC averages t2CYCTYP/2, but the code previously assumed it was the same as t2CYCTYP. (That is, it was using just one clock edge, not both.) Move the table's type declaration so it's adjacent to the table, making it more clear what those numbers mean. On one system this change increased throughput by almost 4x: UDMA/66 sometimes topped 23 MB/sec (on a drive known to do much better). On another system it was around a 10% win (UDMA/66 up to 7+ MB/sec). The difference might be caused by the ratio between memory and IDE clocks. In the system with large speedup, this was exactly 2 (as a workaround for a rev 1.1 silicon bug). The other system used a more standard ratio of 1.63 (and rev 2.1 silicon) ... clock domain synch might have some issues, they're not unheard-of. Signed-off-by: David Brownell Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 73fc267615fd547538d4afb602f51de6b5ab0a31 Author: Greg Ungerer Date: Thu Apr 23 00:11:23 2009 +1000 m68knommu: update the default config for the ColdFire 5307C3 board Signed-off-by: Greg Ungerer commit 2d4f9efa2a529f352dafd41a616c91531bb13ccd Author: Greg Ungerer Date: Wed Apr 22 23:30:48 2009 +1000 m68knommu: update the default config for the ColdFire 5257EVB board Signed-off-by: Greg Ungerer commit 92ea599c9757bc31c279b34737fd79a4f074f91c Author: Greg Ungerer Date: Wed Apr 22 23:16:21 2009 +1000 m68knommu: update the default config for the ColdFire 5249EVB. Signed-off-by: Greg Ungerer commit 888d256e9c565cb61505bd218eb37c81fe77a325 Author: Jan Kiszka Date: Fri Apr 17 19:24:58 2009 +0200 KVM: Unregister cpufreq notifier on unload Properly unregister cpufreq notifier on onload if it was registered during init. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 7f1ea208968f021943d4103ba59e06bb6d8239cb Author: Joerg Roedel Date: Wed Feb 25 16:08:31 2009 +0100 KVM: x86: release time_page on vcpu destruction Not releasing the time_page causes a leak of that page or the compound page it is situated in. Cc: stable@kernel.org Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 4cd481f68dde99ac416003b825c835f71e364393 Author: Jan Kiszka Date: Mon Apr 13 11:59:32 2009 +0200 KVM: Fix overlapping check for memory slots When checking for overlapping slots on registration of a new one, kvm currently also considers zero-length (ie. deleted) slots and rejects requests incorrectly. This finally denies user space from joining slots. Fix the check by skipping deleted slots and advertise this via a KVM_CAP_JOIN_MEMORY_REGIONS_WORKS. Cc: stable@kernel.org Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit bf47a760f66add7870fba33ab50f58b550d6bbd1 Author: Marcelo Tosatti Date: Sun Apr 5 14:54:46 2009 -0300 KVM: MMU: disable global page optimization Complexity to fix it not worthwhile the gains, as discussed in http://article.gmane.org/gmane.comp.emulators.kvm.devel/28649. Cc: stable@kernel.org Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit d24d2c1cc4156102f9df9cd0425d58cabf955519 Author: Jes Sorensen Date: Thu Apr 9 16:38:14 2009 +0200 KVM: ia64: fix locking order entering guest Reorder locking as down_read() may return with local interrupts enabled, which means we could go into vti_vcpu_run() with interrupts enabled. This caused random crashes on the Altix as the timer interrupt tried to read a memory mapped clock source, for which the TLB had not yet been reinstated in the exit, before ipsr was retored. Signed-off-by: Jes Sorensen Acked-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 99894a799f09cf9e28296bb16e75bd5830fd2c4e Author: Avi Kivity Date: Sun Mar 29 16:31:25 2009 +0300 KVM: MMU: Fix off-by-one calculating large page count The large page initialization code concludes there are two large pages spanned by a slot covering 1 (small) page starting at gfn 1. This is incorrect, and also results in incorrect write_count initialization in some cases (base = 1, npages = 513 for example). Cc: stable@kernel.org Signed-off-by: Avi Kivity commit 956d039a2537cf79ca608450d36cc70e0e515482 Author: David S. Miller Date: Fri Apr 17 04:14:15 2009 -0700 sparc: Fix bus type probing for ESP and LE devices. If there is a dummy "espdma" or "ledma" parent device above ESP scsi or LE ethernet device nodes, we have to match the bus as SBUS. Otherwise the address and size cell counts are wrong and we don't calculate the final physical device resource values correctly at all. Commit 5280267c1dddb8d413595b87dc406624bb497946 ("sparc: Fix handling of LANCE and ESP parent nodes in of_device.c") was meant to fix this problem, but that only influences the inner loop of build_device_resources(). We need this logic to also kick in at the beginning of build_device_resources() as well, when we make the first attempt to determine the device's immediate parent bus type for 'reg' property element extraction. Based almost entirely upon a patch by Friedrich Oslage. Tested-by: Meelis Roos Signed-off-by: David S. Miller commit 29fe1b481283a1bada994a69f65736db4ae6f35f Author: Pablo Neira Ayuso Date: Wed Apr 22 02:26:37 2009 -0700 netfilter: ctnetlink: fix gcc warning during compilation This patch fixes a (bogus?) gcc warning during compilation: net/netfilter/nf_conntrack_netlink.c:1234: warning: 'helpname' may be used uninitialized in this function net/netfilter/nf_conntrack_netlink.c:991: warning: 'helpname' may be used uninitialized in this function In fact, helpname is initialized by ctnetlink_parse_help() so I cannot see a way to use it without being initialized. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit e77cc8d243f9f1e1d3f0799e23cc14e837ccc8c6 Author: Tyler Hicks Date: Wed Apr 22 04:08:46 2009 -0500 eCryptfs: Remove ecryptfs_unlink_sigs warnings A feature was added to the eCryptfs umount helper to automatically unlink the keys used for an eCryptfs mount from the kernel keyring upon umount. This patch keeps the unrecognized mount option warnings for ecryptfs_unlink_sigs out of the logs. Signed-off-by: Tyler Hicks commit 13a791b4e63eb0537a7f804a340d6527485983b4 Author: Tyler Hicks Date: Mon Apr 13 15:29:27 2009 -0500 eCryptfs: Fix data corruption when using ecryptfs_passthrough ecryptfs_passthrough is a mount option that allows eCryptfs to allow data to be written to non-eCryptfs files in the lower filesystem. The passthrough option was causing data corruption due to it not always being treated as a non-eCryptfs file. The first 8 bytes of an eCryptfs file contains the decrypted file size. This value was being written to the non-eCryptfs files, too. Also, extra 0x00 characters were being written to make the file size a multiple of PAGE_CACHE_SIZE. Signed-off-by: Tyler Hicks commit 3a5203ab3c0c31e0f1434c69e893bfb85c6e6657 Author: Tyler Hicks Date: Mon Mar 16 12:35:12 2009 -0500 eCryptfs: Print FNEK sig properly in /proc/mounts The filename encryption key signature is not properly displayed in /proc/mounts. The "ecryptfs_sig=" mount option name is displayed for all global authentication tokens, included those for filename keys. This patch checks the global authentication token flags to determine if the key is a FEKEK or FNEK and prints the appropriate mount option name before the signature. Signed-off-by: Tyler Hicks commit 57ea34d19963781d05eb12f9b31bd4f70d61ec16 Author: Tyler Hicks Date: Sun Mar 15 14:17:01 2009 -0500 eCryptfs: NULL pointer dereference in ecryptfs_send_miscdev() If data is NULL, msg_ctx->msg is set to NULL and then dereferenced afterwards. ecryptfs_send_raw_message() is the only place that ecryptfs_send_miscdev() is called with data being NULL, but the only caller of that function (ecryptfs_process_helo()) is never called. In short, there is currently no way to trigger the NULL pointer dereference. This patch removes the two unused functions and modifies ecryptfs_send_miscdev() to remove the NULL dereferences. Signed-off-by: Tyler Hicks commit ae6e84596e7b321d9a08e81679c6a3f799634636 Author: Tyler Hicks Date: Thu Mar 12 00:19:46 2009 -0500 eCryptfs: Copy lower inode attrs before dentry instantiation Copies the lower inode attributes to the upper inode before passing the upper inode to d_instantiate(). This is important for security_d_instantiate(). The problem was discovered by a user seeing SELinux denials like so: type=AVC msg=audit(1236812817.898:47): avc: denied { 0x100000 } for pid=3584 comm="httpd" name="testdir" dev=ecryptfs ino=943872 scontext=root:system_r:httpd_t:s0 tcontext=root:object_r:httpd_sys_content_t:s0 tclass=file Notice target class is file while testdir is really a directory, confusing the permission translation (0x100000) due to the wrong i_mode. Signed-off-by: Tyler Hicks commit cc29c70dd581f85ee7a3e7980fb031f90b90a2ab Author: Jean Delvare Date: Wed Apr 22 00:49:51 2009 -0700 net/netrom: Fix socket locking Patch "af_rose/x25: Sanity check the maximum user frame size" (commit 83e0bbcbe2145f160fbaa109b0439dae7f4a38a9) from Alan Cox got locking wrong. If we bail out due to user frame size being too large, we must unlock the socket beforehand. Signed-off-by: Jean Delvare Signed-off-by: David S. Miller commit 50b2ff1bc47baacb8e9882b2b2a74b240ddbeecf Author: Paul Moore Date: Tue Apr 21 10:04:22 2009 +0000 netlabel: Always remove the correct address selector The NetLabel address selector mechanism has a problem where it can get mistakenly remove the wrong selector when similar addresses are used. The problem is caused when multiple addresses are configured that have different netmasks but the same address, e.g. 127.0.0.0/8 and 127.0.0.0/24. This patch fixes the problem. Reported-by: Etienne Basset Signed-off-by: Paul Moore Acked-by: James Morris Tested-by: Etienne Basset Signed-off-by: David S. Miller commit cef309cf6112f9a44b1ebcefc1641d01d35c83dc Author: Heiko Schocher Date: Mon Apr 20 22:36:43 2009 +0000 ucc_geth.c: Fix upsmr setting in RMII mode If using the UCC on a MPC8360 in RMII mode, don;t set UCC_GETH_UPSMR_RPM bit in the upsmr register. Signed-off-by: Heiko Schocher Acked-by: Li Yang Signed-off-by: David S. Miller commit 3f9738f73ad08ef770df64f145007bd27ac2fa16 Author: Jianjun kong Date: Mon Apr 20 23:48:25 2009 +0000 8139too: fix HW initial flow While ifconfig eth0 up kernel calls open() of 8139 driver(8139too.c). In rtl8139_hw_start() of rtl8139_open(), 8139 driver enable RX before setting up the DMA buffer address. In this interval where RX was enabled and DMA buffer address is not yet set up, any incoming broadcast packet would be send to a strange physical address: 0x003e8800 which is the default value of DMA buffer address. Unfortunately, this address is used by Linux kernel. So kernel panics. This patch fix it by setting up DMA buffer address before RX enabled and everything is fine even under broadcast packets attack. Signed-off-by: Jonathan Lin Signed-off-by: Amos Kong Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f170ea24c218905f78791b15a6dcb3c99b730a60 Author: Greg Ungerer Date: Wed Apr 22 17:26:49 2009 +1000 m68knommu: add a defconfig for the ColdFire M5272C3 board Signed-off-by: Greg Ungerer commit c5505081cd734a409eb11e1f844b6bf5427a7925 Author: Greg Ungerer Date: Wed Apr 22 17:10:46 2009 +1000 m68knommu: update the defconfig for the ColdFire 5208evb board Signed-off-by: Greg Ungerer commit 248e88247a0e03125a663be69f2656d2e158371e Merge: bc8d489... 30fd994... Author: Takashi Iwai Date: Wed Apr 22 09:09:29 2009 +0200 Merge commit 'alsa/master' into for-linus * commit 'alsa/master': [ALSA] intel8x0: another attempt to fix ac97_clock measure routine [ALSA] ac97_codec: increase timeout for analog subsections commit 3fa6b5adbe46b3d665267dee0f879858ab464f44 Author: Hendrik Brueckner Date: Tue Apr 21 06:04:24 2009 +0000 af_iucv: Fix race when queuing incoming iucv messages AF_IUCV runs into a race when queuing incoming iucv messages and receiving the resulting backlog. If the Linux system is under pressure (high load or steal time), the message queue grows up, but messages are not received and queued onto the backlog queue. In that case, applications do not receive any data with recvmsg() even if AF_IUCV puts incoming messages onto the message queue. The race can be avoided if the message queue spinlock in the message_pending callback is spreaded across the entire callback function. Signed-off-by: Hendrik Brueckner Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit e14ad5fa8705fb354e72312479abbe420ebc3f8e Author: Hendrik Brueckner Date: Tue Apr 21 06:04:23 2009 +0000 af_iucv: Test additional sk states in iucv_sock_shutdown Add few more sk states in iucv_sock_shutdown(). Signed-off-by: Hendrik Brueckner Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit fe86e54ef9465c97a16337d2a41a4cf486b937ae Author: Hendrik Brueckner Date: Tue Apr 21 06:04:22 2009 +0000 af_iucv: Reject incoming msgs if RECV_SHUTDOWN is set Reject incoming iucv messages if the receive direction has been shut down. It avoids that the queue of outstanding messages increases and exceeds the message limit of the iucv communication path. Signed-off-by: Hendrik Brueckner Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit 60d3705fcbfe7deca8e94bc7ddecd6f9f1a4647e Author: Hendrik Brueckner Date: Tue Apr 21 06:04:21 2009 +0000 af_iucv: fix oops in iucv_sock_recvmsg() for MSG_PEEK flag If iucv_sock_recvmsg() is called with MSG_PEEK flag set, the skb is enqueued twice. If the socket is then closed, the pointer to the skb is freed twice. Remove the skb_queue_head() call for MSG_PEEK, because the skb_recv_datagram() function already handles MSG_PEEK (does not dequeue the skb). Signed-off-by: Hendrik Brueckner Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit bbe188c8f16effd902d1ad391e06e41ce649b22e Author: Ursula Braun Date: Tue Apr 21 06:04:20 2009 +0000 af_iucv: consider state IUCV_CLOSING when closing a socket Make sure a second invocation of iucv_sock_close() guarantees proper freeing of an iucv path. Signed-off-by: Ursula Braun Signed-off-by: David S. Miller commit 04dc6e71a28d4815bf9431efcafc107bb0ad2792 Author: Jeff Moyer Date: Tue Apr 21 07:31:56 2009 +0200 cfq-iosched: use the default seek distance when there aren't enough seek samples If the cfq io context doesn't have enough samples yet to provide a mean seek distance, then use the default threshold we have for seeky IO instead of defaulting to 0. Signed-off-by: Jeff Moyer Signed-off-by: Jens Axboe commit 4d00aa47e2337dcfe2d8a7215dbde3765b507167 Author: Jeff Moyer Date: Tue Apr 21 07:25:04 2009 +0200 cfq-iosched: make seek_mean converge more quickly Right now, depending on the first sector to which a process issues I/O, the seek time may start out way out of whack. So make sure we start with 0 sectors in seek, instead of the offset of the first request issued. Signed-off-by: Jeff Moyer Signed-off-by: Jens Axboe commit b759113499d6c7cb75fab04f56772579308bc0f8 Author: Jens Axboe Date: Fri Apr 17 08:36:50 2009 +0200 block: make blk_abort_queue() ignore non-request based devices There's nothing to do for those devices, since the timeout handling is based on requests. Signed-off-by: Jens Axboe commit 71982a409f12c50d011325a4471aa20666bb908d Author: Tejun Heo Date: Fri Apr 17 08:34:48 2009 +0200 block: include empty disks in /proc/diskstats /proc/diskstats used to show stats for all disks whether they're zero-sized or not and their non-zero partitions. Commit 074a7aca7afa6f230104e8e65eba3420263714a5 accidentally changed the behavior such that it doesn't print out zero sized disks. This patch implements DISK_PITER_INCL_EMPTY_PART0 flag to partition iterator and uses it in diskstats_show() such that empty part0 is shown in /proc/diskstats. Reported and bisectd by Dianel Collins. Signed-off-by: Tejun Heo Reported-by: Daniel Collins Signed-off-by: Jens Axboe commit a9e9dc24bbc3e084450a22cf4fb82f5f5d4cbeea Author: Tejun Heo Date: Wed Apr 15 22:10:27 2009 +0900 bio: use bio_kmalloc() in copy/map functions Impact: remove possible deadlock condition There is no reason to use mempool backed allocation for map functions. Also, because kern mapping is used inside LLDs (e.g. for EH), using mempool backed allocation can lead to deadlock under extreme conditions (mempool already consumed by the time a request reached EH and requests are blocked on EH). Switch copy/map functions to bio_kmalloc(). Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 451a9ebf653d28337ba53ed5b4b70b0b9543cca1 Author: Tejun Heo Date: Wed Apr 15 19:50:51 2009 +0200 bio: fix bio_kmalloc() Impact: fix bio_kmalloc() and its destruction path bio_kmalloc() was broken in two ways. * bvec_alloc_bs() first allocates bvec using kmalloc() and then ignores it and allocates again like non-kmalloc bvecs. * bio_kmalloc_destructor() didn't check for and free bio integrity data. This patch fixes the above problems. kmalloc patch is separated out from bio_alloc_bioset() and allocates the requested number of bvecs as inline bvecs. * bio_alloc_bioset() no longer takes NULL @bs. None other than bio_kmalloc() used it and outside users can't know how it was allocated anyway. * Define and use BIO_POOL_NONE so that pool index check in bvec_free_bs() triggers if inline or kmalloc allocated bvec gets there. * Relocate destructors on top of each allocation function so that how they're used is more clear. Jens Axboe suggested allocating bvecs inline. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit cd0aca2d550f238d80ba58e7dcade4ea3d0a3aa7 Author: Tejun Heo Date: Wed Apr 15 22:10:25 2009 +0900 block: fix queue bounce limit setting Impact: don't set GFP_DMA in q->bounce_gfp unnecessarily All DMA address limits are expressed in terms of the last addressable unit (byte or page) instead of one plus that. However, when determining bounce_gfp for 64bit machines in blk_queue_bounce_limit(), it compares the specified limit against 0x100000000UL to determine whether it's below 4G ending up falsely setting GFP_DMA in q->bounce_gfp. As DMA zone is very small on x86_64, this makes larger SG_IO transfers very eager to trigger OOM killer. Fix it. While at it, rename the parameter to @dma_mask for clarity and convert comment to proper winged style. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 25636e282fe95508cae96bb27f86407aef935817 Author: Tejun Heo Date: Wed Apr 15 22:10:24 2009 +0900 block: fix SG_IO vector request data length handling Impact: fix SG_IO behavior such that it matches the documentation SG_IO howto says that if ->dxfer_len and sum of iovec disagress, the shorter one wins. However, the current implementation returns -EINVAL for such cases. Trim iovc if it's longer than ->dxfer_len. This patch uses iov_*() helpers which take struct iovec * by casting struct sg_iovec * to it. sg_iovec is always identical to iovec and this will be further cleaned up with later patches. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 23c560a99d78bddf5c251bfa97bce19e4da4b3f3 Author: Tejun Heo Date: Wed Apr 15 22:10:23 2009 +0900 scatterlist: make sure sg_miter_next() doesn't return 0 sized mappings Impact: fix not-so-critical but annoying bug sg_miter_next() returns 0 sized mapping if there is an zero sized sg entry in the list or at the end of each iteration. As the users always check the ->length field, this bug shouldn't be critical other than causing unnecessary iteration. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 6329db8bd60fbc0832f30c350b0181b8d865573e Author: Bartlomiej Zolnierkiewicz Date: Tue Apr 21 09:04:37 2009 +0000 powerpc: Fix modular build of ide-pmac when mediabay is built in Now that the powermac IDE host driver can be modular, we need to export check_media_bay_by_base() and media_bay_set_ide_infos() from drivers/macintosh/mediabay.c for it. This fixes the following build error: > CC [M] drivers/ide/pmac.o > drivers/ide/pmac.c: In function ‘pmac_ide_init_dev’: > drivers/ide/pmac.c:955: error: implicit declaration of function > ‘check_media_bay_by_base’ > drivers/ide/pmac.c: In function ‘pmac_ide_setup_device’: > drivers/ide/pmac.c:1090: error: implicit declaration of function > ‘media_bay_set_ide_infos’ > make[2]: *** [drivers/ide/pmac.o] Error 1 > make[1]: *** [drivers/ide] Error 2 > make: *** [drivers] Error 2 Reported-by: Subrata Modak Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Paul Mackerras commit 2d6b3de2374dd8c9f5ab23d57c7bbcda08553356 Author: Geoff Levand Date: Fri Apr 17 06:36:37 2009 +0000 powerpc/pasemi: Fix build error on UP A non-SMP version of smp_send_stop() is now included in smp.h. Remove the unneeded definition in the pasemi setup.c. Fixes build errors like these when CONFIG_SMP=n: arch/powerpc/platforms/pasemi/setup.c:48: error: redefinition of ‘smp_send_stop’ include/linux/smp.h:125: error: previous definition of 'smp_send_stop' was here Reported-by: subrata@linux.vnet.ibm.com Signed-off-by: Geoff Levand Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit bcd71fe6b1a8694747b0b451c9ec22d813ad7e27 Author: Alexander Beregalov Date: Fri Apr 17 00:15:13 2009 +0000 powerpc: Make macintosh/mediabay driver depend on CONFIG_BLOCK Fixes this build error: In file included from drivers/macintosh/mediabay.c:21: include/linux/ide.h:605: error: field 'request_sense_rq' has incomplete type Signed-off-by: Alexander Beregalov Signed-off-by: Paul Mackerras commit fec629b827335154366ecd8b38f007d649338fb3 Author: Geoff Levand Date: Thu Apr 16 09:05:40 2009 +0000 maintainers: Fix PS3 patterns Correct the MAINTAINERS file patterns for PS3. Removes some PS3 patterns that were under 'CELL BROADBAND ENGINE ARCHITECTURE', and adds missing PS3 sound and RTC driver patterns. CC: Arnd Bergmann Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 0d3b2ab6be1500041e11059bee97e83da9da28cc Author: Geoff Levand Date: Thu Apr 16 09:05:38 2009 +0000 powerpc/ps3: Fix CONFIG_PS3_FLASH=n build warning Fix build warnings like these when CONFIG_PS3_FLASH=n: arch/powerpc/platforms/ps3/os-area.c: warning: 'update_flash_db' defined but not used Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 59e4c3a2fe9cb1681bb2cff508ff79466f7585ba Author: Andreas Schwab Date: Thu Apr 16 06:22:01 2009 +0000 powerpc/32: Don't clobber personality flags on exec Now that ppc32 implements address randomization it also wants to inherit personality flags like ADDR_NO_RANDOMIZE across exec, for things like `setarch ppc -R' to work. But the ppc32 version of SET_PERSONALITY forcefully sets PER_LINUX, clearing all personality flags. So be careful about preserving the flags. Signed-off-by: Andreas Schwab Signed-off-by: Paul Mackerras commit 24f1ce803c55f645429e6a7dd94763fbace84b0a Author: Michael Ellerman Date: Thu Apr 16 04:47:32 2009 +0000 powerpc: Fix crash on CPU hotplug early_init_mmu_secondary() is called at CPU hotplug time, so it must be marked as __cpuinit, not __init. Caused by 757c74d2 ("powerpc/mm: Introduce early_init_mmu() on 64-bit"). Tested-by: Sachin Sant Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit ec40f95db753d3bfdbcc43b1505ecf7980cb6492 Author: Greg Ungerer Date: Fri Apr 17 23:11:38 2009 +1000 m68knommu: fix DMA support for ColdFire ColdFire CPU family members support DMA (all those with the FEC ethernet core use it, the rest have dedicated DMA engines). The code support is just missing a handful of routines for it to be usable by drivers. Add the missing dma_ functions. Signed-off-by: Greg Ungerer commit 830c072b1ea0078396c42db120452fc36516ed1d Author: Greg Ungerer Date: Fri Apr 17 22:56:50 2009 +1000 m68knommu: remove unused kernel stats offsets The irq field of the kernel stats struct is not used by the assembly support code, so remove it from the offsets. Signed-off-by: Greg Ungerer commit a14f5e4feb3efd907df7f1b176c2367910a8e796 Author: Greg Ungerer Date: Fri Apr 17 22:55:06 2009 +1000 m68knommu: fix missing .data.cacheline_aligned section Add a .data.cacheline_aligned section to the data segment. Signed-off-by: Greg Ungerer commit 592578a1dd1be0c940e36f769acdd3cc6651a7a1 Author: Richard Retanubun Date: Wed Apr 8 11:51:27 2009 +1000 m68knommu: Fixed GPIO pin initialization for CONFIG_M5271 FEC. This processor only have one FEC and its MDIO pins are located at a different offset than the code used for the current CONFIG_M527x. Tesed on M5271EVB eval platform. Without this patch the FEC driver will report no PHY attached if the bootloader does not pre-initialize the PAR_FECI2C GPIO register. Signed-off-by: Richard Retanubun Signed-off-by: Greg Ungerer commit 5bd3ef84d73c2ea7b4babbad060909753c4828d4 Merge: 0658c16... 6d25b68... Author: Paul Mackerras Date: Wed Apr 22 13:02:09 2009 +1000 Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge commit 0658c16056660886ea2f35c4f038be70a94b1532 Author: Kumar Gala Date: Wed Apr 15 16:48:50 2009 -0500 powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover Signed-off-by: Kumar Gala commit 3de0e075486cc1a175d63bb7167bfc66e9ac16f4 Author: Kumar Gala Date: Wed Apr 15 16:33:08 2009 -0500 powerpc/85xx: Added SMP defconfig Since the vast majority of 85xx platforms are UP we introduce a new SMP config for the few platforms that have more than one core. Beyond CONFIG_SMP=y and its dependencies this should be identical to mpc85xx_defconfig. Signed-off-by: Kumar Gala commit 8db3dca86e0a1b74b87ffb612f1e57c481a122b9 Author: Kumar Gala Date: Tue Apr 21 15:40:51 2009 -0500 powerpc/85xx: Enabled a bunch of FSL specific drivers/options * Add new 85xx boards * Added QE/FSL gpio * Enabled PHY drivers that exist on various boards * Enabled FS_ENET & UCC ethernet drivers (CPM2 & QE) * FSL HW Crypto Engine * CPM I2C * QE Serial Signed-off-by: Kumar Gala commit 778544e59857bed3f8c152e3c8755b12f7f3971f Author: Kumar Gala Date: Wed Apr 15 16:10:20 2009 -0500 powerpc/85xx: Updated generic mpc85xx_defconfig Signed-off-by: Kumar Gala commit df833b1d73680f9f9dc72cbc3215edbbc6ab740d Author: Reinette Chatre Date: Tue Apr 21 10:55:48 2009 -0700 iwlwifi: DMA fixes A few issues wrt DMA were uncovered when using the driver with swiotlb. - driver should not use memory after it has been mapped - iwl3945's RX queue management cannot use all of iwlagn because the size of the RX buffer is different. Revert back to using iwl3945 specific routines that map/unmap memory. - no need to "dma_syn_single_range_for_cpu" followed by pci_unmap_single, we can just call pci_unmap_single initially - only map the memory area that will be used by device. this is especially relevant to the mapping of iwl_cmd. we should not map the entire structure because the meta data at the beginning of structure contains the address to be used later for unmapping. If the address to be used for unmapping is stored in mapped data it creates a problem. - ensure that _if_ memory needs to be modified after it is mapped that we call _sync_single_for_cpu first, and then release it back to device with _sync_single_for_device - we mapped the wrong length of data for host commands, with mapped length differing with length provided to device, fix that. Thanks to Jason Andryuk for significant bisecting help to find these issues. This fixes http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1964 Signed-off-by: Reinette Chatre Tested-by: Jason Andryuk Tested-by: Ben Gamari Signed-off-by: John W. Linville commit d2ee9cd2e2bdfa2e5817142d6f044697066d3977 Author: Reinette Chatre Date: Tue Apr 21 10:55:47 2009 -0700 iwlwifi: add debugging for TX path When debugging TX issues it is helpful to know the seq nr of the frame being transmitted. The seq nr is printed as part of ucode's log informing us which frame is being processed. Having this information printed in driver log makes it easy to match activities between driver and firmware. Also make possible to print TX flags directly. These are already printed as part of entire TX command, but having it printed directly in cpu format makes it easier to look at. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c491bf1205485c83086bf4f2f26ca6598d48133a Author: Rami Rosen Date: Tue Apr 21 16:22:01 2009 +0300 mwl8: fix build warning. This patch fixes a build warning in mwl8.c. (Marvell TOPDOG wireless driver) The warning it fixes is: "large integer implicitly truncated to unsigned type." The rx_ctrl member of the mwl8k_rx_desc struct is 8 bit (__u8 ), whereas trying to assign it a 32 bit value (which is returned from cpu_to_le32()) causes the compiler to issue a truncation warning. Signed-off-by: Rami Rosen Signed-off-by: John W. Linville commit d1bcb9f1273adee6d2ce5edf84f19409a5cc31b9 Author: Johannes Berg Date: Tue Apr 21 01:36:59 2009 +0200 mac80211: fix alignment calculation bug When checking whether or not a given frame needs to be moved to be properly aligned to a 4-byte boundary, we use & 4 which wasn't intended, this code should check the lowest two bits. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7d42081a271bd8a82f2100524085c4f029e47717 Author: Reinette Chatre Date: Mon Apr 20 15:36:19 2009 -0700 mac80211: do not print WARN if config interface It is expected that config interface will always succeed as mac80211 will only request what driver supports. The exception here is when a device has rfkill enabled. At this time the rfkill state is unknown to mac80211 and config interface can fail. When this happens we deal with this error instead of printing a WARN. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 71d449b55abf5018d7c711b2b62abc0c083723c4 Author: Reinette Chatre Date: Mon Apr 20 14:37:01 2009 -0700 iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll Users reported lockup with work still trying to run after module has been unloaded. http://thread.gmane.org/gmane.linux.kernel.wireless.general/30594/focus=30601 Signed-off-by: Reinette Chatre Reported-by: TJ Reported-by: Huaxu Wan Signed-off-by: John W. Linville commit 4b6f764e148a194f792e75d43dc3504bc0d81064 Author: Jay Sternberg Date: Mon Apr 20 14:36:54 2009 -0700 iwlwifi: fix EEPROM validation mask to include OTP only devices Fix the bug where some revisions of 6000 series hardware cannot be used. Later versions of 6000 series have the EEPROM replaced by OTP. For these devices to be used we need to expand valid EEPROM mask. Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 595e23f390b675a5a264af48a42eda81413f2598 Author: Timur Tabi Date: Mon Apr 20 10:54:35 2009 -0500 powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCD The ULI 1575 PCI quirk function for the Freescale MPC8610 HPCD was disabling the SATA INTx interrupt, even when SATA support was enabled. This was safe, because the SATA driver re-enabled it. But with commit a5bfc471 ("ahci: drop intx manipulation on msi enable"), the driver no longer does this, and so SATA support on the 8610 HPCD is broken. The original quirk function disabled INTx because it caused some other interrupt problem during early development on this board, but no one remembers any more what that problem was, and it doesn't seem to occur any more. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit 0dbbbf1a0e305ad900b733e2ba1cac304d31696e Author: Anton Vorontsov Date: Sat Apr 18 21:48:52 2009 +0400 fsl_rio: Pass the proper device to dma mapping routines The driver should pass a device that specifies internal DMA ops, but currently NULL pointer is passed, therefore following bug appears during boot up: ------------[ cut here ]------------ Kernel BUG at c0018a7c [verbose debug info unavailable] Oops: Exception in kernel mode, sig: 5 [#1] [...] NIP [c0018a7c] fsl_rio_doorbell_init+0x34/0x60 LR [c0018a70] fsl_rio_doorbell_init+0x28/0x60 Call Trace: [ef82bda0] [c0018a70] fsl_rio_doorbell_init+0x28/0x60 (unreliable) [ef82bdc0] [c0019160] fsl_rio_setup+0x6b8/0x84c [ef82be20] [c02d28ac] fsl_of_rio_rpn_probe+0x30/0x50 [ef82be40] [c0234f20] of_platform_device_probe+0x5c/0x84 [...] ---[ end trace 561bb236c800851f ]--- This patch fixes the issue. Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit bc8d489c44e05fae469f63b40c0da0718dba6798 Merge: a7b554a... 5bd3729... Author: Takashi Iwai Date: Tue Apr 21 18:38:28 2009 +0200 Merge branch 'fix/hda' into for-linus * fix/hda: ALSA: hda - Add quirk for Packard Bell RS65 commit 5bd3729f6818721f76a2a2f7d2ecad899bace340 Author: Takashi Iwai Date: Tue Apr 21 18:36:30 2009 +0200 ALSA: hda - Add quirk for Packard Bell RS65 Added a quirk (model=m51va) for Packard Bell RS65 with ALC663. Reference: Novell bnc#496787 https://bugzilla.novell.com/show_bug.cgi?id=496787 Signed-off-by: Takashi Iwai commit 30fd9940eee910d847f48bd8740b2d0eaa8d2cfc Author: Jaroslav Kysela Date: Tue Apr 21 15:30:31 2009 +0200 [ALSA] intel8x0: another attempt to fix ac97_clock measure routine Appearently, a big delay ~300ms is required before hw is settled and ready to transfer samples on some hardware variants. Also, return back "clocking to 48000Hz" message when something fails. Signed-off-by: Jaroslav Kysela commit e10f9d87c9ac9fdfadb6305dbbc9052e49a02fdd Author: Jaroslav Kysela Date: Tue Apr 21 15:17:54 2009 +0200 [ALSA] ac97_codec: increase timeout for analog subsections On some hardware platforms, the AC97 codec requires more time to wake up. Signed-off-by: Jaroslav Kysela commit 1bb593801ee32dd9d983dea3cbedf68f71345f78 Author: Johannes Berg Date: Tue Apr 21 02:08:51 2009 -0700 atmel: fix netdev ops conversion sparse says: drivers/net/wireless/atmel.c:1501:3: warning: Initializer entry defined twice drivers/net/wireless/atmel.c:1505:3: also defined here and it's correct; atmel has its own ndo_change_mtu and shouldn't use eth_change_mtu. Signed-off-by: Johannes Berg Signed-off-by: David S. Miller commit 99b28c47091db2bb7f594a5088831d341a800a33 Author: Ken Kawasaki Date: Sat Apr 18 13:44:44 2009 +0000 pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit 1a44cc3778f63dca5795708da2a2a7696da7fd61 Author: Roland Dreier Date: Mon Apr 20 18:32:08 2009 +0000 mlx4_en: Fix cleanup if workqueue create in mlx4_en_add() fails If creating a workqueue fails, don't jump to the error path where that same workqueue is destroyed, since destroy_workqueue() can't handle a NULL pointer. This was spotted by the Coverity checker (CID 2617). Signed-off-by: Roland Dreier Signed-off-by: David S. Miller commit b1b243afac302d181d19c8024c355d9677beab49 Author: Yevgeny Petrilin Date: Mon Apr 20 04:34:38 2009 +0000 mlx4_en: Move to SW counters for total bytes and packets The per ring counters are implemented in SW. Now moving to have the total counters as the sum of all rings. This way the numbers will always be consistent and we no longer depend on HW buffer size limitations for those counters that can be insufficient in some cases. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 45b4d66d690600dac1aa805b75763331483acf22 Author: Yevgeny Petrilin Date: Mon Apr 20 04:33:15 2009 +0000 mlx4_en: use NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM for tx csum at initialization The former usage was to set the NETIF_F_HW_CSUM flag which is not used in get_tx_csum. It caused Ethtool to show tx checksum as "on" even though it was turned off in previous operation. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 966508f7a591399a0b0dcfc0336e88480e5ed520 Author: Yevgeny Petrilin Date: Mon Apr 20 04:30:03 2009 +0000 mlx4_en: Assign dummy event handler for TX queue The low level driver always assumes this handler exists. The lack of it could cause kernel panic Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 1e338db56e5a6a5bb93884c1fb3b0b9f01958f93 Author: Yevgeny Petrilin Date: Mon Apr 20 04:26:05 2009 +0000 mlx4_en: Fix a race at restart task The query whether the port is up or not should be done at the execution of the restart task and not when it is queued. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 9a4f92a603cd72ee534cead20cbc627b34cfc884 Author: Yevgeny Petrilin Date: Mon Apr 20 04:24:28 2009 +0000 mlx4_en: Fix error handling while activating RX rings In case of failure of either srq creation or page allocation, the cleanup code handled the failed ring as well, and tried to destroy resources that where not allocated. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit a7b554ad7eefdfc9f2955fdba2634e225d761628 Merge: 4262efe... 5d4af1b... Author: Takashi Iwai Date: Tue Apr 21 07:43:10 2009 +0200 Merge branch 'fix/usx2y' into for-linus * fix/usx2y: ALSA: us122l: add snd_us122l_free() ALSA: us122l: Fix signedness in comparisions commit 4262efee8fbbfc083401f22a57d5eca5ba37c2fd Merge: f22d806... e3ba906... Author: Takashi Iwai Date: Tue Apr 21 07:43:05 2009 +0200 Merge branch 'fix/misc' into for-linus * fix/misc: ALSA: Atiixp: Add SSID for mute_led quirk (unknown HP model) commit f22d806b6cc0c74dd0a1a21b3f311dba51d9df84 Merge: 9bc5df2... 516ef69... Author: Takashi Iwai Date: Tue Apr 21 07:42:49 2009 +0200 Merge branch 'fix/asoc' into for-linus * fix/asoc: ASoC: Fix warning in wm9705 ASoC: OMAP: Update contact addresses ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR commit 9bc5df222b9cfc4be1176e566dfba2ab5c6b43f8 Merge: 5de4155... 622e84c... Author: Takashi Iwai Date: Tue Apr 21 07:42:44 2009 +0200 Merge branch 'fix/hda' into for-linus * fix/hda: ALSA: hda - Add quirks for Realtek codecs ALSA: hda - Fix alc662_init_verbs commit 622e84cdff719b9dcd3f495ddb0afb54995799cc Author: Kailang Yang Date: Tue Apr 21 07:39:04 2009 +0200 ALSA: hda - Add quirks for Realtek codecs - Support ASUS F81Se F5Q P80 U20A U80 U50 UX50 for ALC269 - Support ASUS F70SL UX20 X58LE F50Z N80Vc N81Te N505Tp Vx3V N5051A for ALC663 - Support DELL ZM1 for ALC272 Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit bb023080fe72f1f80648e9b60771d9a94ce75aca Author: Kailang Yang Date: Tue Apr 21 07:35:25 2009 +0200 ALSA: hda - Fix alc662_init_verbs Don't unmute unneeded amps for input mixers of ALC662 & co. It caused possible recording noises. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit 5de4155bb3760fc13a172c5cef2368ce218ebe1c Author: Jean Delvare Date: Mon Apr 20 22:56:59 2009 +0200 ALSA: keywest: Convert to new-style i2c driver The legacy i2c binding model is going away soon, so convert the ppc keywest sound driver to the new model or it will break. Signed-off-by: Jean Delvare Cc: Benjamin Herrenschmidt Signed-off-by: Takashi Iwai commit cfbf1eecd70db9a7a49c42a0613c00f7a2a86dfb Author: Jean Delvare Date: Mon Apr 20 22:54:25 2009 +0200 ALSA: AOA: Convert onyx and tas codecs to new-style i2c drivers The legacy i2c binding model is going away soon, so convert the AOA codec drivers to the new model or they'll break. Signed-off-by: Jean Delvare Tested-by: Johannes Berg Tested-by: Andreas Schwab Cc: Benjamin Herrenschmidt Signed-off-by: Takashi Iwai commit 88bea188b85f9cefefbbd56b8a48d0f798409177 Author: Len Brown Date: Tue Apr 21 00:35:47 2009 -0400 ACPI: add /sys/firmware/acpi/interrupts/sci_not counter This counter may prove useful in debugging some spurious interrupt issues seen in the field. Signed-off-by: Len Brown commit 775d8d931581764a1ec982ebe5a927b12762fb6d Merge: 62cedd1... 7e0986c... Author: David S. Miller Date: Mon Apr 20 15:33:46 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 62cedd11f63c99efd2962fb69763a09e2778f6e6 Author: Matt Carlson Date: Mon Apr 20 14:52:29 2009 -0700 tg3: Fix SEEPROM accesses The recent NVRAM patches sanitized how the driver deals with NVRAM data, but they failed to bring the SEEPROM interfaces inline with the new strategy. This patch brings the SEEPROM interfaces up to date. This patch also reverts commit 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 ("tg3: fix big endian MAC address collection failure"). Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Tested-by: Robin Holt Tested-by: James Bottomley Signed-off-by: David S. Miller commit 7e0986c17f695952ce5d61ed793ce048ba90a661 Author: Johannes Berg Date: Sun Apr 19 13:22:11 2009 +0200 mac80211: fix basic rate bitmap calculation "mac80211: fix basic rates setting from association response" introduced a copy/paste error. Unfortunately, this not just leads to wrong data being passed to the driver but is remotely exploitable for some hardware or driver combinations. Signed-off-by: Johannes Berg Cc: stable@kernel.org [2.6.29] Signed-off-by: John W. Linville commit ad935687dbe7307f5abd9e3f610a965a287324a9 Author: Kalle Valo Date: Sun Apr 19 08:47:19 2009 +0300 mac80211: fix beacon loss detection after scan Currently beacon loss detection triggers after a scan. A probe request is sent and a message like this is printed to the log: wlan0: beacon loss from AP 00:12:17:e7:98:de - sending probe request But in fact there is no beacon loss, the beacons are just not received because of the ongoing scan. Fix it by updating last_beacon after the scan has finished. Reported-by: Jaswinder Singh Rajput Signed-off-by: Kalle Valo Acked-by: Johannes Berg Signed-off-by: John W. Linville commit d91c01c757bd9659ac10549504586fae610265a4 Author: Jouni Malinen Date: Sat Apr 18 21:53:15 2009 +0300 nl80211: Make nl80211_send_mlme_event() atomic One of the code paths sending deauth/disassoc events ends up calling this function with rcu_read_lock held, so we must use GFP_ATOMIC in allocation routines. Reported-by: Johannes Berg Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit e10a9dfc35ae6bd62bbb83df08297ea06b54d9ce Author: Christian Lamparter Date: Sat Apr 18 17:12:18 2009 +0200 ar9170usb: fix hang on resume This patch fixes a hang on resume when the filesystem is not available and request_firmware blocks. However, the device does not accept the firmware on resume. and it will exit with: > firmware part 1 upload failed (-71). > device is in a bad state. please reconnect it! Reported-by: Johannes Berg Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 18aaab15f9a9cd4f20dc596aa38408c5e5d208ed Author: Robert P. J. Day Date: Sat Apr 18 09:33:55 2009 -0400 MAC80211: Remove unused MAC80211_VERBOSE_SPECT_MGMT_DEBUG. Remove this unused Kconfig variable, which Intel apparently once promised to make use of but never did. Signed-off-by: Robert P. J. Day Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 230f7af0d8f6f2019e64920378b3b66e7d3e99a5 Author: Joerg Albert Date: Sat Apr 18 02:10:45 2009 +0200 mwl8k: fix module re-insertion bug swap mwl8k_remove and mwl8k_shutdown functions to allow "rmmod mwl8k; modprobe mwl8k" Signed-off-by: Joerg Albert Signed-off-by: John W. Linville commit c3b93c878d7912a01467890bc0785071c2dc4bc1 Author: Christian Lamparter Date: Fri Apr 17 15:14:22 2009 +0200 p54: deactivate broken powersave function This patch deactivates powersave in station mode. It does not work correctly yet, so the code does more harm than good. Reported-by: Johannes Berg Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 125143966f02bd7366eb9040aa74392d19955da8 Author: Joe Perches Date: Thu Apr 16 16:23:26 2009 -0700 iwl3945-base.c: Add missing space to debug print "not" is not printed without a space after %pM Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 499a214ca2765522d6a59ff73825d40e7bb31510 Author: Ivo van Doorn Date: Sat Mar 28 20:51:58 2009 +0100 rt2x00: Don't free register information on suspend After suspend & resume the rt2x00 devices won't wakeup anymore due to a broken register information setup. The most important problem is the release of the EEPROM buffer which is completely cleared and never read again after the suspend. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6d25b688ecc488753af3c9e6f6a9a575b863cf37 Author: Ilpo Järvinen Date: Mon Apr 20 12:18:43 2009 -0600 powerpc: Fix of_node_put() exit path in of_irq_map_one() Signed-off-by: Grant Likely commit 8db70d3deee33e661d091b3e317fccc87bf0975d Author: Grant Likely Date: Mon Apr 20 11:33:12 2009 -0600 powerpc/5200: defconfig updates Signed-off-by: Grant Likely commit 64bd43a086469a0bfdd87e012523184bdd96ce81 Merge: 4a014a2... a48dc30... Author: Russell King Date: Mon Apr 20 14:03:04 2009 +0100 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit 4a014a240b5a3c3b167702948a22dbe9e9a150a8 Author: David Brownell Date: Mon Apr 20 03:33:09 2009 +0100 [ARM] 5457/1: mach-imx gpio buildfix From: David Brownell Fix GPIO-related build error on mach-imx platform: CC drivers/spi/spi_gpio.o In file included from /home/db/kernel/scratch/arch/arm/include/asm/gpio.h:5, from include/linux/gpio.h:7, from drivers/spi/spi_gpio.c:23: arch/arm/mach-imx/include/mach/gpio.h: In function 'imx_gpio_get_value': arch/arm/mach-imx/include/mach/gpio.h:27: error: implicit declaration of function '__REG2' arch/arm/mach-imx/include/mach/gpio.h:27: error: 'IMX_IO_BASE' undeclared (first use in this function) arch/arm/mach-imx/include/mach/gpio.h:27: error: (Each undeclared identifier is reported only once arch/arm/mach-imx/include/mach/gpio.h:27: error: for each function it appears in.) arch/arm/mach-imx/include/mach/gpio.h: In function 'imx_gpio_set_value_inline': arch/arm/mach-imx/include/mach/gpio.h:36: error: 'IMX_IO_BASE' undeclared (first use in this function) arch/arm/mach-imx/include/mach/gpio.h:36: error: lvalue required as left operand of assignment arch/arm/mach-imx/include/mach/gpio.h:38: error: lvalue required as left operand of assignment ... Signed-off-by: David Brownell Signed-off-by: Russell King commit eb8f3142fa30201426feb7b3f9046fcd730e17d3 Author: Mikael Pettersson Date: Sat Apr 18 21:26:57 2009 +0100 [ARM] 5456/1: add sys_preadv and sys_pwritev Kernel 2.6.30-rc1 added sys_preadv and sys_pwritev to most archs but not ARM, resulting in :1421:2: warning: #warning syscall preadv not implemented :1425:2: warning: #warning syscall pwritev not implemented This patch adds sys_preadv and sys_pwritev to ARM. These syscalls simply take five long-sized parameters, so they should have no calling-convention/ABI issues in the kernel. Tested on armv5tel eabi using a preadv/pwritev test program posted on linuxppc-dev earlier this month. It would be nice to get this into the kernel before 2.6.30 final, so that glibc's kernel version feature test for these syscalls doesn't have to special-case ARM. Signed-off-by: Mikael Pettersson Signed-off-by: Russell King commit e3ba906ad17330e44fad5af42a423417249c6e09 Author: Daniel T Chen Date: Mon Apr 20 07:09:11 2009 -0400 ALSA: Atiixp: Add SSID for mute_led quirk (unknown HP model) Reference: Ubuntu #84973 (https://launchpad.net/bugs/84973) Reference: Linux #8001 (http://bugzilla.kernel.org/show_bug.cgi?id=8001) Make the mute LED function properly on this unknown HP model. Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 5d4af1be06affa2b42cdf59cd376752be1f934b3 Author: Karsten Wiese Date: Mon Apr 20 13:01:21 2009 +0200 ALSA: us122l: add snd_us122l_free() Use it to clean up snd_us122l_card_used[]. Without patch unplugging of an US122L soundcard didn't reset the corresponding element of snd_us122l_card_used[] to 0. The (SNDRV_CARDS + 1)th plugging in did not result in creating the soundcard device anymore. Index values supplied with the modprobe command line were not used correctly anymore after the first unplugging of an US122L. Signed-off-by: Karsten Wiese Cc: stable@kernel.org Signed-off-by: Takashi Iwai commit c40af84a6726f63e35740d26f841992e8f31f92c Author: Herbert Xu Date: Sun Apr 19 22:35:50 2009 +0000 tun: Fix sk_sleep races when attaching/detaching As the sk_sleep wait queue actually lives in tfile, which may be detached from the tun device, bad things will happen when we use sk_sleep after detaching. Since the tun device is the persistent data structure here (when requested by the user), it makes much more sense to have the wait queue live there. There is no reason to have it in tfile at all since the only time we can wait is if we have a tun attached. In fact we already have a wait queue in tun_struct, so we might as well use it. Reported-by: Eric W. Biederman Tested-by: Christian Borntraeger Tested-by: Patrick McHardy Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9c3fea6ab04a7bd9298e635bf29b4a5379f6c476 Author: Herbert Xu Date: Sat Apr 18 14:15:52 2009 +0000 tun: Only free a netdev when all tun descriptors are closed The commit c70f182940f988448f3c12a209d18b1edc276e33 ("tun: Fix races between tun_net_close and free_netdev") fixed a race where an asynchronous deletion of a tun device can hose a poll(2) on a tun fd attached to that device. However, this came at the cost of moving the tun wait queue into the tun file data structure. The problem with this is that it imposes restrictions on when and where the tun device can access the wait queue since the tun file may change at any time due to detaching and reattaching. In particular, now that we need to use the wait queue on the receive path it becomes difficult to properly synchronise this with the detachment of the tun device. This patch solves the original race in a different way. Since the race is only because the underlying memory gets freed, we can prevent it simply by ensuring that we don't do that until all tun descriptors ever attached to the device (even if they have since be detached because they may still be sitting in poll) have been closed. This is done by using reference counting the attached tun file descriptors. The refcount in tun->sk has been reappropriated for this purpose since it was already being used for that, albeit from the opposite angle. Note that we no longer zero tfile->tun since tun_get will return NULL anyway after the refcount on tfile hits zero. Instead it represents whether this device has ever been attached to a device. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5db8765a86a4cbaf45adaf8c231cf9a6ca2dcfaf Author: Ben Hutchings Date: Thu Apr 16 08:04:20 2009 +0000 net: Fix GRO for multiple page fragments This loop over fragments in napi_fraginfo_skb() was "interesting". Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 9a5120ddd18ff93c304c9ead0b5c4278d9b417e2 Merge: eb39c57... 9499237... Author: David S. Miller Date: Mon Apr 20 02:16:44 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 commit eb39c57ff7782bc015da517af1d9c3b2592e721e Author: Marcin Slusarz Date: Sun Apr 19 07:24:24 2009 +0000 net: fix "compatibility" typos Signed-off-by: Marcin Slusarz Signed-off-by: David S. Miller commit 52cf3cc8acea52ecb93ef1dddb4ef2ae4e35c319 Author: Ilpo Järvinen Date: Sat Apr 18 05:48:48 2009 +0000 tcp: fix mid-wq adjustment helper Just noticed while doing some new work that the recent mid-wq adjustment logic will misbehave when FACK is not in use (happens either due sysctl'ed off or auto-detected reordering) because I forgot the relevant TCPCB tagbit. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 8caf153974f2274301e583fda732cc8e5b80331f Author: Jarek Poplawski Date: Fri Apr 17 10:08:49 2009 +0000 net: sch_netem: Fix an inconsistency in ingress netem timestamps. Alex Sidorenko reported: "while experimenting with 'netem' we have found some strange behaviour. It seemed that ingress delay as measured by 'ping' command shows up on some hosts but not on others. After some investigation I have found that the problem is that skbuff->tstamp field value depends on whether there are any packet sniffers enabled. That is: - if any ptype_all handler is registered, the tstamp field is as expected - if there are no ptype_all handlers, the tstamp field does not show the delay" This patch prevents unnecessary update of tstamp in dev_queue_xmit_nit() on ingress path (with act_mirred) adding a check, so minimal overhead on the fast path, but only when sniffers etc. are active. Since netem at ingress seems to logically emulate a network before a host, tstamp is zeroed to trigger the update and pretend delays are from the outside. Reported-by: Alex Sidorenko Tested-by: Alex Sidorenko Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit c7c1a0f60b90955855ba8cd9cfc480167bf6c3da Author: Alan Cox Date: Fri Apr 17 04:19:36 2009 +0000 ax25: proc uid file misses header This has been broken for a while. I happened to catch it testing because one app "knew" that the top line of the calls data was the policy line and got confused. Put the header back. Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit e8d19370734f11e5880bb9ae2125f586e9e5d15c Author: Divy Le Ray Date: Fri Apr 17 12:21:27 2009 +0000 cxgb3: Fix EEH final recovery attempt EEH attempts to recover up 6 times. The last attempt leaves all the ports and adapter down.hen The driver is then unloaded, bringing the adapter down again unconditionally. The unload will hang. Check if the adapter is already down before trying to bring it down again. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 2c2f409f32d55d901b28b4e9a06c40e9d899ad25 Author: Divy Le Ray Date: Fri Apr 17 12:21:22 2009 +0000 cxgb3: Fix potential msi-x vector leak Release vectors when a MSI-X allocation fails. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit c80b0c28caed5cd9165caab6295ed86b4e9fc327 Author: Divy Le Ray Date: Fri Apr 17 12:21:17 2009 +0000 cxgb3: fix workqueue flush issues The fatal error task can be scheduled while processing an offload packet in NAPI context when the connection handle is bogus. this can race with the ports being brought down and the cxgb3 workqueue being flushed. Stop napi processing before flushing the work queue. The ULP drivers (iSCSI, iWARP) might also schedule a task on keventd_wk while releasing a connection handle (cxgb3_offload.c::cxgb3_queue_tid_release()). The driver however does not flush any work on keventd_wq while being unloaded. This patch also fixes this. Also call cancel_delayed_work_sync in place of the the deprecated cancel_rearming_delayed_workqueue. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 3851c66cf0d130ae49f99fe1dea42950d9835037 Author: Divy Le Ray Date: Fri Apr 17 12:21:11 2009 +0000 cxgb3: fix link fault handling Use the existing periodic task to handle link faults. The link fault interrupt handler is also called in work queue context, which is wrong and might cause potential deadlocks. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 90af2cf6205bfc8def8c5a64c9134031d60b10fb Author: Zhang Rui Date: Tue Apr 14 11:02:18 2009 +0800 ACPI video: fix an error when the brightness levels on AC and on Battery are same when the brightness level on AC and brightness level on Battery are same, the level_ac_battery is 1 in the current code, which is wrong. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit d876dfbbf5c8728102fb4f683450fa9ae3259cda Author: Thomas Renninger Date: Fri Apr 17 16:22:08 2009 +0200 acpi-cpufreq: Do not let get_measured perf depend on internal variable Take already available policy->cpuinfo.max_freq and get rid of acpi-cpufreq specific max_freq variable. This implies that P0 is always the highest frequency which should always be true as ACPI spec says: As a result, the zeroth entry describes the highest performance state Signed-off-by: Thomas Renninger Acked-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit d91758f5ddb80e91176fa2cf80c88c1633950b3d Author: Thomas Renninger Date: Fri Apr 17 16:22:07 2009 +0200 acpi-cpufreq: style-only: add parens to math expression Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit e0e8c4e512e92bc25c19bd8d4926de17d2f8fbf2 Author: Thomas Renninger Date: Fri Apr 17 16:22:06 2009 +0200 acpi-cpufreq: Cleanup: Use printk_once Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit 093f13e23137b9e5f7629dd5932ceea1419e2b61 Author: Pallipadi, Venkatesh Date: Wed Apr 15 10:37:33 2009 -0700 x86, acpi_cpufreq: Fix the NULL pointer dereference in get_measured_perf Fix for a regression that was introduced by earlier commit 18b2646fe3babeb40b34a0c1751e0bf5adfdc64c on Mon Apr 6 11:26:08 2009 Regression resulted in the below error happened on systems with software coordination where per_cpu acpi data will not be initiated for secondary CPUs in a P-state domain. On Tue, 2009-04-14 at 23:01 -0700, Zhang, Yanmin wrote: My machine hanged with kernel 2.6.30-rc2 when script read > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor. > > opps happens in get_measured_perf: > > cur.aperf.whole = readin.aperf.whole - > per_cpu(drv_data, cpu)->saved_aperf; > > Because per_cpu(drv_data, cpu)=NULL. > > So function get_measured_perf should check if (per_cpu(drv_data, > cpu)==NULL) > and return 0 if it's NULL. --------------sys log------------------ BUG: unable to handle kernel NULL pointer dereference at 0000000000000020 IP: [] get_measured_perf+0x4a/0xf9 PGD a7dd88067 PUD a7ccf5067 PMD 0 Oops: 0000 [#1] SMP last sysfs file: /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor CPU 0 Modules linked in: video output Pid: 2091, comm: kondemand/0 Not tainted 2.6.30-rc2 #1 MP Server RIP: 0010:[] [] get_measured_perf+0x4a/0xf9 RSP: 0018:ffff880a7d56de20 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 00000046241a42b6 RCX: ffff88004d219000 RDX: 000000000000b660 RSI: 0000000000000020 RDI: 0000000000000001 RBP: ffff880a7f052000 R08: 00000046241a42b6 R09: ffffffff807639f0 R10: 00000000ffffffea R11: ffffffff802207f4 R12: ffff880a7f052000 R13: ffff88004d20e460 R14: 0000000000ddd5a6 R15: 0000000000000001 FS: 0000000000000000(0000) GS:ffff88004d200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000000020 CR3: 0000000a7f1bf000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process kondemand/0 (pid: 2091, threadinfo ffff880a7d56c000, task ffff880a7d4d18c0) Stack: ffff880a7f052078 ffffffff803efd54 00000046241a42b6 000000462ffa9e95 0000000000000001 0000000000000001 00000000ffffffea ffffffff8064f41a 0000000000000012 0000000000000012 ffff880a7f052000 ffffffff80650547 Call Trace: [] ? kobject_get+0x12/0x17 [] ? __cpufreq_driver_getavg+0x42/0x57 [] ? do_dbs_timer+0x147/0x272 [] ? do_dbs_timer+0x0/0x272 [] ? worker_thread+0x15b/0x1f5 [] ? autoremove_wake_function+0x0/0x2e [] ? worker_thread+0x0/0x1f5 [] ? kthread+0x54/0x83 [] ? child_rip+0xa/0x20 [] ? kthread+0x0/0x83 [] ? child_rip+0x0/0x20 Code: 99 a6 03 00 31 c9 85 c0 0f 85 c3 00 00 00 89 df 4c 8b 44 24 10 48 c7 c2 60 b6 00 00 48 8b 0c fd e0 30 a5 80 4c 89 c3 48 8b 04 0a <48> 2b 58 20 48 8b 44 24 18 48 89 1c 24 48 8b 34 0a 48 2b 46 28 RIP [] get_measured_perf+0x4a/0xf9 RSP CR2: 0000000000000020 ---[ end trace 2b8fac9a49e19ad4 ]--- Tested-by: "Zhang, Yanmin" Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 9499237a1c42a27fbcc7ed1d59e34df2b574cdfb Author: Marcel Holtmann Date: Sun Apr 19 19:30:03 2009 +0200 Bluetooth: Add workaround for wrong HCI event in eSCO setup The Broadcom chips with 2.1 firmware handle the fallback case to a SCO link wrongly when setting up eSCO connections. < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17 handle 11 voice setting 0x0060 > HCI Event: Command Status (0x0f) plen 4 Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1 > HCI Event: Connect Complete (0x03) plen 11 status 0x00 handle 1 bdaddr 00:1E:3A:xx:xx:xx type SCO encrypt 0x01 The Link Manager negotiates the fallback to SCO, but then sends out a Connect Complete event. This is wrong and the Link Manager should actually send a Synchronous Connection Complete event if the Setup Synchronous Connection has been used. Only the remote side is allowed to use Connect Complete to indicate the missing support for eSCO in the host stack. This patch adds a workaround for this which clearly should not be needed, but reality is that broken Broadcom devices are deployed. Based on a report by Ville Tervo Signed-off-by: Marcel Holtman commit 732547f96ea2442965a24e0ed529d285321a0fff Author: Marcel Holtmann Date: Sun Apr 19 19:14:14 2009 +0200 Bluetooth: Fallback from eSCO to SCO on unspecified error Some Bluetooth chips (like the ones from Texas Instruments) don't do proper eSCO negotiations inside the Link Manager. They just return an error code and in case of the Kyocera ED-8800 headset it is just a random error. < HCI Command: Setup Synchronous Connection 0x01|0x0028) plen 17 handle 1 voice setting 0x0060 > HCI Event: Command Status (0x0f) plen 4 Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1 > HCI Event: Synchronous Connect Complete (0x2c) plen 17 status 0x1f handle 257 bdaddr 00:14:0A:xx:xx:xx type eSCO Error: Unspecified Error In these cases it is up to the host stack to fallback to a SCO setup and so retry with SCO parameters. Based on a report by Nick Pelly Signed-off-by: Marcel Holtmann commit e2139b32726e5dd184974c785ea3f62026590801 Author: Johan Hedberg Date: Thu Mar 26 16:41:56 2009 +0200 Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP There is a missing call to rfcomm_dlc_clear_timer in the case that DEFER_SETUP is used and so the connection gets disconnected after the timeout even if it was successfully accepted previously. This patch adds a call to rfcomm_dlc_clear_timer to rfcomm_dlc_accept which will get called when the user accepts the connection by calling read() on the socket. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann commit a48dc30da44769ea3f3562c18f54878a9a3e78a1 Author: Guennadi Liakhovetski Date: Wed Apr 15 13:56:08 2009 +0200 [ARM] pxa/pcm990: start external GPIOs immediately after built-in ones As a result of an off-by-1 error pcm990 leaves one unused GPIO number between built-in GPIOs and the pca9536 extender. Fix it. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Eric Miao commit e91fb9137dd235ab959d7675d0e4104974dad5eb Author: Marek Vasut Date: Fri Apr 17 11:37:35 2009 +0200 [ARM] pxa/palm27x: General fix for Palm27x aSoC driver Firstly, this patch makes the palm27x asoc driver a little more sane. Also, since all affected devices use GPIO95 as AC97_nRESET, this patch sets that properly. Affected are PalmT5, TX and LifeDrive. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 516ef69f160fb2f092d71f2cb635a9394ff8a71a Author: Russell King - ARM Linux Date: Sat Apr 18 10:11:53 2009 +0100 ASoC: Fix warning in wm9705 I notice that the fixes were merged, minus one: sound/soc/codecs/wm9705.c: At top level: sound/soc/codecs/wm9705.c:445: warning: initialization from incompatible pointer type so you might find this trivial patch useful. Signed-off-by: Russell King Signed-off-by: Mark Brown commit b57f7e7b836d271902b8b7b1ec8cf9312dc5d228 Author: Henrique de Moraes Holschuh Date: Tue Apr 14 02:44:14 2009 +0000 thinkpad-acpi: bump up version to 0.23 Plenty of high-profile changes, so it deserves a new version number. Features added since 0.22: * Restrict unsafe LEDs * New race-less brightness control strategy for IBM ThinkPads * Disclose TGID of driver access from userspace (debug) * Warn when deprecated functions are used Other changes: * Better debug messages in some subdrivers * Removed "hotkey disable" support, since it breaks the driver * Dropped "ibm-acpi" alias Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 922fe097b1e8f2f2f23dbed61cfe6e0316fecff1 Author: Henrique de Moraes Holschuh Date: Tue Apr 14 02:44:13 2009 +0000 thinkpad-acpi: simplify module autoloading Simplify the module autoloading a great deal, by keying to the HID for the HKEY interface. Only _really_ ancient IBM ThinkPad models like the 240, 240x and 570 lack the HKEY interface, and they're getting their own trimmed-down driver one of these days. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit f68f53a217b827580647d23fdc34eecdcb3739c6 Author: Henrique de Moraes Holschuh Date: Tue Apr 14 02:44:12 2009 +0000 thinkpad-acpi: fix use of MODULE_AUTHOR Fix the module to use one instance of MODULE_AUTHOR per author. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 75bd3bf2ade9d548be0d2bde60b5ee0fdce0b127 Author: Henrique de Moraes Holschuh Date: Tue Apr 14 02:44:11 2009 +0000 thinkpad-acpi: fix LED blinking through timer trigger The set_blink hook code in the LED subdriver would never manage to get a LED to blink, and instead it would just turn it on. The consequence of this is that the "timer" trigger would not cause the LED to blink if given default parameters. This problem exists since 2.6.26-rc1. To fix it, switch the deferred LED work handling to use the thinkpad-acpi-specific LED status (off/on/blink) directly. This also makes the code easier to read, and to extend later. Signed-off-by: Henrique de Moraes Holschuh Cc: stable@kernel.org Signed-off-by: Len Brown commit 406e988bef742aa74cdc1f5fafc812ecebf7c02b Author: Henrique de Moraes Holschuh Date: Tue Apr 14 02:44:10 2009 +0000 thinkpad-acpi: silence hotkey enable warning for module parameter Avoid the WARN() when the procfs handler for hotkey enable is used by a module parameter. Instead, urge the user to stop doing that. Reported-by: Niel Lambrechts Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 67405439bca28c4dbecd3fefd97fbdb282a302d9 Author: Matthew Garrett Date: Tue Apr 14 20:16:45 2009 +0100 thermal: Fix polling frequency for systems without passive cooling The polling interval (in deciseconds) was accidently interpreted as being in milliseconds in one codepath, resulting in excessively frequent polling. Ensure that the conversion is performed. Signed-off-by: Matthew Garrett Acked-by: Zhang Rui Signed-off-by: Len Brown commit 96f15efcea94545987715f453a8c2b8ea592d000 Author: Len Brown Date: Fri Apr 17 23:32:20 2009 -0400 ACPI: Disable _GTS and _BFS support by default Executing BIOS code paths not exercised by Windows tends to get Linux into trouble. However, if a system does benefit from _GTS or _BFS, acpi.gts=1 an acpi.bfs=1 are now available to enable them. http://bugzilla.kernel.org/show_bug.cgi?id=13041 Signed-off-by: Len Brown commit 7816a0a862d851d0b05710e7d94bfe390f3180e2 Author: Patrick McHardy Date: Fri Apr 17 15:59:23 2009 -0700 vlan/macvlan: fix NULL pointer dereferences in ethtool handlers Check whether the underlying device provides a set of ethtool ops before checking for individual handlers to avoid NULL pointer dereferences. Reported-by: Art van Breemen Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 75a241f959a65ec9bde237d1af1a34ef794f0c9c Merge: e18e37e... 957b051... Author: David S. Miller Date: Fri Apr 17 15:54:40 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit e18e37e50966f137f8a3b807fe0da7703779be34 Merge: a0a69a0... a014273... Author: David S. Miller Date: Fri Apr 17 15:38:38 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit 957b0516f7881284b48f2f2e4a909a1c5de0ddf8 Author: Christian Lamparter Date: Fri Apr 17 14:52:23 2009 +0200 ar9170usb: add ZyXEL NWD271N Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 60375541f7c8a577b977d344565259776c3acfc1 Author: Johannes Berg Date: Fri Apr 17 00:54:23 2009 +0200 mac80211: validate TIM IE length The TIM IE must not be shorter than 4 bytes, so verify that when parsing it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit cd1658f592a60d028dd2e48d86724b737a82cab0 Author: Johannes Berg Date: Thu Apr 16 15:00:58 2009 +0200 cfg80211: do not replace BSS structs Instead, allocate extra IE memory if necessary. Normally, this isn't even necessary since there's enough space. This is a better way of correcting the "held BSS can disappear" issue, but also a lot more code. It is also necessary for proper auth/assoc BSS handling in the future. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 160002fe845218f5789a26954048592c3920ac7b Author: Johannes Berg Date: Thu Apr 16 12:15:38 2009 +0200 cfg80211: copy hold when replacing BSS When we receive a probe response frame we can replace the BSS struct in our list -- but if that struct is held then we need to hold the new one as well. We really should fix this completely and not replace the struct, but this is a bandaid for now. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7181d4673710888b6d7084b37b9d77ed4f4e41b2 Author: Johannes Berg Date: Wed Apr 15 21:33:15 2009 +0200 mac80211: avoid crashing when no scan sdata Using the scan_sdata variable here is terribly wrong, if there has never been a scan then we fail. However, we need a bandaid... Signed-off-by: Johannes Berg Cc: stable@kernel.org [2.6.29] Signed-off-by: John W. Linville commit a0142733a7ef2f3476e63938b330026a08c53f37 Author: Pablo Neira Ayuso Date: Fri Apr 17 17:48:44 2009 +0200 netfilter: nfnetlink: return ENOMEM if we fail to create netlink socket With this patch, nfnetlink returns -ENOMEM instead of -EPERM if we fail to create the nfnetlink netlink socket during the module loading. This is exactly what rtnetlink does in this case. Ideally, it would be better if we propagate the error that has happened in netlink_kernel_create(), however, this function still does not implement this yet. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit 150ace0db360373d2016a2497d252138a59c5ba8 Author: Pablo Neira Ayuso Date: Fri Apr 17 17:47:31 2009 +0200 netfilter: ctnetlink: report error if event message allocation fails This patch fixes an inconsistency that results in no error reports to user-space listeners if we fail to allocate the event message. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit b08f7a62cafd7998862072a1c353219e3d84bbef Author: Jarkko Nikula Date: Fri Apr 17 14:42:26 2009 +0300 ASoC: OMAP: Update contact addresses My email address is going to expire soon so update it. Adding also Peter Ujfalusi as a second contact to OMAP core drivers since I won't have anymore access to non-public OMAP documentation in the future and Peter is working with these drivers as well. Signed-off-by: Jarkko Nikula Cc: Peter Ujfalusi Signed-off-by: Mark Brown commit 1a297286868e13274ab02ec0626a00054fb0a5de Author: Philipp Zabel Date: Fri Apr 17 11:39:38 2009 +0200 ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR Those macros are just screwed as soon as CONFIG_PXA25x is enabled. This patch - changes ssp_set_scr to take an ssp_dev pointer instead of ssp_device - adds a corresponding ssp_get_scr function. Signed-off-by: Philipp Zabel Signed-off-by: Mark Brown commit f600f6c4824d7e40be370f7e26ab0fbc3f6f911c Author: Karsten Wiese Date: Thu Apr 16 19:35:01 2009 +0200 ALSA: us122l: Fix signedness in comparisions Within 2.6.30's mergewindow, struct urb's transfer_buffer_length has become unsigned. This changed an "int > int" comparision to an "unsigned > int" one in snd_usb_122l. Fix this by using a local int variable instead of urb->transfer_buffer_length in comparisions. Shorten playback_prep_freqn() a bit and tweak error-paths in usb_stream_prepare_playback(). Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai commit a40ac3414eb4122345efd071f787a349a30fccf7 Author: David S. Miller Date: Fri Apr 17 04:05:06 2009 -0700 sparc32: Update defconfig. Signed-off-by: David S. Miller commit 60c8a774fb7971cec4a72fd5d002f39668826808 Author: David S. Miller Date: Fri Apr 17 03:59:42 2009 -0700 sparc64: Update defconfig. Signed-off-by: David S. Miller commit a0a69a0106dab8d20596f97f6674bed3b394d1ee Author: Herbert Xu Date: Fri Apr 17 02:34:38 2009 -0700 gro: Fix use after free in tcp_gro_receive After calling skb_gro_receive skb->len can no longer be relied on since if the skb was merged using frags, then its pages will have been removed and the length reduced. This caused tcp_gro_receive to prematurely end merging which resulted in suboptimal performance with ixgbe. The fix is to store skb->len on the stack. Reported-by: Mark Wagner Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9dd014eb9804f19d6230c3cbc10fa25f5416bda7 Author: Oliver Neukum Date: Fri Apr 17 01:40:19 2009 -0700 pegasus: Handle disconnect error code correctly. EPERM means that disconnect() is runnung. It should be treated like ENODEV Signed-off-by: Oliver Neukum Signed-off-by: David S. Miller commit 62bcaa13039538c7f794b0cfcbc26e0313e7fcd5 Author: Oliver Hartkopp Date: Fri Apr 17 01:38:46 2009 -0700 can: Network Drop Monitor: Make use of consume_skb() in af_can.c Since commit ead2ceb0ec9f85cff19c43b5cdb2f8a054484431 ("Network Drop Monitor: Adding kfree_skb_clean for non-drops and modifying end-of-line points for skbs") so called end-of-line points for skb's should use consume_skb() to free the socket buffer. In opposite to consume_skb() the function kfree_skb() is intended to be used for unexpected skb drops e.g. in error conditions that now can trigger the network drop monitor if enabled. This patch moves the skb end-of-line point in af_can.c to use consume_skb(). Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller commit f72f550c5885419ee1b32f47213087e6640e766b Author: Erik Waling Date: Wed Apr 15 23:32:11 2009 +0000 macb: process the RX ring regardless of interrupt status Suppose that we receive lots of frames, start processing them, but exhaust our budget so that we return before we had a chance to look at all of them. Then, when the network layer calls us again, we will only continue processing the buffers if the REC bit was set in the mean time, which it might not be if there was a brief pause in the flow of packets. If this happens, we'll simply display a warning and call netif_rx_complete() with potentially lots of unprocessed packets in the RX ring... Fix this by scanning the ring no matter what flags are set in the interrupt status register. Signed-off-by: Erik Waling Signed-off-by: Haavard Skinnemoen Signed-off-by: David S. Miller commit ee33c58541bae92669fe64a39f695ab533d0de14 Author: Erik Waling Date: Wed Apr 15 23:32:10 2009 +0000 macb: Handle Retry Limit Exceeded errors When transfering large amounts of data we sometimes experienced that the Retry Limit Exceeded (RLE) bit got set in TSR during transmission attempts. When this happened the driver would stall in a state that prevented any more data from being sent. Signed-off-by: Erik Waling Signed-off-by: Haavard Skinnemoen Signed-off-by: David S. Miller commit 2f3889f42ec7c2b0c3049ecdd8e4687b6930779a Author: PJ Waskiewicz Date: Thu Apr 16 15:00:41 2009 +0000 ixgbe: Fix the DCB PFC thresholds for 82599 The thresholds for the DCB priority flow control are incorrect for 82599. This fixes the thresholds to be correct. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit f92ef202988ffb07bb86cf94d0b09f2a61192da7 Author: PJ Waskiewicz Date: Thu Apr 16 15:00:20 2009 +0000 ixgbe: Fix DCB traffic class mapping for 82599 The traffic classes in hardware are not symmetrical for Rx and Tx. Rx is every 16 descriptor queues, Tx is not. It runs 32-32-16-16-8-8-8 when running with 8 traffic classes, and runs 64-32-16 when running with 4 traffic classes. This patch fixes the mapping. Signed-off-by: Peter P Waskiewicz Jr Cc: stable@kernel.org Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 843f42678f6c47a2c8d1648e584cb57ebff3750f Author: Jesse Brandeburg Date: Thu Apr 16 16:59:47 2009 +0000 e1000: fix transmit routine exit bug If the e1000 transmit cleanup inner loop exited early, then cleaned might not be true. This could cause tx hangs or other badness. Use count to track the total number of descriptors cleaned instead of basing a tx queue restart off of a temporary working state variable. This code now makes the flow the same for e1000/e1000e/igb/ixgbe Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a86043c2ad92aa6312807039198d6ab6171164ef Author: Jesse Brandeburg Date: Thu Apr 16 16:59:28 2009 +0000 e1000e: fix bug in restart queue logic If the e1000e transmit cleanup inner loop exited early, then cleaned might not be true. This could cause tx hangs or other badness. Use count to track the total number of descriptors cleaned instead of basing a tx queue restart off of a temporary working state variable. This code now makes the flow the same for e1000/e1000e/igb/ixgbe Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b1e8fd54af73116331376a7b3074932a21e7477a Author: Joe Perches Date: Thu Apr 16 09:38:46 2009 +0000 MAINTAINERS - Update NETWORKING W: url and standardize T: git url Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 788873ac70a5f2a5569ad41ef9753763ab270ddf Author: Joe Perches Date: Thu Apr 16 09:38:45 2009 +0000 MAINTAINERS - Add section NETWORKING DRIVERS Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 134ffb4cad92a6aa534e55a9be145bca780a32c1 Merge: 2238aff... 98d500d... Author: David S. Miller Date: Thu Apr 16 16:32:29 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit 2238aff5bbd9d928b69e579b4c95842f97da95ba Author: Tony Breeds Date: Thu Apr 16 16:27:23 2009 -0700 ixgbe: Be explict with what we are !'ing in ixgbe_sfp_config_module_task() GCC warns: drivers/net/ixgbe/ixgbe_main.c: In function 'ixgbe_sfp_config_module_task': drivers/net/ixgbe/ixgbe_main.c:3920: warning: suggest parantheses around operand of '!' or change '&' to '&&' or '!' to '~' Which I think is right. Bracket to remove ambiguity. Signed-off-by: Tony Breeds Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit bda9de2c4fff8d7e9ac3ee66ce853716280a21ea Author: Grant Likely Date: Thu Apr 16 15:11:54 2009 -0600 powerpc/5200: Add FLASH nodes to lite5200 device tree Signed-off-by: Grant Likely commit c5a88dd90cf243a17c4a8c10e1ed973192ea5825 Author: Stefan Roese Date: Thu Apr 16 15:11:54 2009 -0600 powerpc/device-tree: Document MTD nodes with multiple "reg" tuples Add binding for mtd nodes with multiple reg tuples. Multiple reg tuples are used when the flash region covers multiple devices of the same type, but not necessarily the same size. Signed-off-by: Stefan Roese Signed-off-by: Grant Likely commit efcc2da3fd148c9acb7d7cf1d9800e0649f950fc Author: Stefan Roese Date: Thu Apr 16 15:11:54 2009 -0600 powerpc/of-device-tree: Factor MTD physmap bindings out of booting-without-of It's easier to find bindings descriptions in separate files. So factor out the MTD physmap bindings into a separate file to not clutter booting-without-of.txt more. Signed-off-by: Stefan Roese Signed-off-by: Grant Likely commit 98d500d66cb7940747b424b245fc6a51ecfbf005 Author: Patrick McHardy Date: Thu Apr 16 18:33:01 2009 +0200 netfilter: nf_nat: add support for persistent mappings The removal of the SAME target accidentally removed one feature that is not available from the normal NAT targets so far, having multi-range mappings that use the same mapping for each connection from a single client. The current behaviour is to choose the address from the range based on source and destination IP, which breaks when communicating with sites having multiple addresses that require all connections to originate from the same IP address. Introduce a IP_NAT_RANGE_PERSISTENT option that controls whether the destination address is taken into account for selecting addresses. http://bugzilla.kernel.org/show_bug.cgi?id=12954 Signed-off-by: Patrick McHardy commit 412401029259b1ad67559cec93bcc7ee4a9551aa Author: Anton Vorontsov Date: Thu Apr 16 09:58:44 2009 -0600 powerpc/5200: Bring the legacy fsl_spi_platform_data hooks back In commit 364fdbc00fbdd409ade63500710123fe323aa164 ("spi_mpc83xx: rework chip selects handling"), I merged activate_cs and deactivate_cs hooks into cs_control, but I overlooked that mpc52xx_psc_spi driver is using these hooks too. And that resulted in the following build failure: CC drivers/spi/mpc52xx_psc_spi.o drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_do_probe': drivers/spi/mpc52xx_psc_spi.c:398: error: 'struct fsl_spi_platform_data' has no member named 'activate_cs' drivers/spi/mpc52xx_psc_spi.c:399: error: 'struct fsl_spi_platform_data' has no member named 'deactivate_cs' make[2]: *** [drivers/spi/mpc52xx_psc_spi.o] Error 1 This patch simply adds the legacy hooks back for 2.6.30, and for 2.6.31 we'll convert the driver to ->cs_control. Reported-by: Subrata Modak Signed-off-by: Anton Vorontsov Signed-off-by: Grant Likely commit 1269fa737f21b3f643e4b12d3ac9938b142a7f00 Author: Johannes Berg Date: Fri Apr 10 10:02:45 2009 +0200 ar9170: fix struct layout on arm arm will pad even between u8's, so mark the structs/unions packed. Fixes a build bug on arm due to BUILD_BUG_ON tests in the code. Signed-off-by: Johannes Berg Reported-by: Al Viro Signed-off-by: John W. Linville commit 91fe9ca74e8220f17e2fa71a92cda330857daac4 Author: Pavel Roskin Date: Thu Apr 9 21:41:05 2009 -0400 orinoco: correct timeout logic in __orinoco_hw_set_tkip_key() If the value read from HERMES_RID_TXQUEUEEMPTY becomes 0 after exactly 100 readings, we wrongly consider it a timeout. Rewrite the clever while loop as a for loop that does the right thing and looks simpler. Reported by Juha Leppanen Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 23a99840d571a237845fd0906bce78e7c76be650 Author: Gerrit Renker Date: Tue Apr 14 06:32:56 2009 +0200 mac80211: Fragmentation threshold (typo) mac80211: Fragmentation threshold (typo) ieee80211_ioctl_siwfrag() sets the fragmentation_threshold to 2352 when frame fragmentation is to be disabled, yet the corresponding 'get' function tests for 2353 bytes instead. This causes user-space tools to display a fragmentation threshold of 2352 bytes even if fragmentation has been disabled. Signed-off-by: Gerrit Renker Signed-off-by: John W. Linville commit f05faa31c387fb07f4c561350f00ba12cf673c9f Author: Herton Ronaldo Krzesinski Date: Fri Apr 10 18:05:14 2009 -0300 rt2x00: prevent double kfree when failing to register hardware In a scenario where there isn't any firmware available, we will have a double kfree of rt2x00dev->spec.channels_info when ieee80211_register_hw returns an error status inside rt2x00lib_probe_hw. The problem is that if ieee80211_register_hw fails, we call rt2x00lib_remove_hw twice: * first inside rt2x00lib_probe_hw upon failure of ieee80211_register_hw * error status is returned to rt2x00lib_probe_dev, which then sees it and calls in this case rt2x00lib_remove_dev that will again run rt2x00lib_remove_hw Prevent this avoiding calling rt2x00lib_remove_hw inside rt2x00lib_probe_hw Problem was detected with CONFIG_DEBUG_PAGEALLOC=y, CONFIG_SLUB_DEBUG=y, CONFIG_SLUB_DEBUG_ON=y, that dumps this with no firmware available: rt61pci 0000:00:07.0: PCI INT A -> GSI 19 (level, low) -> IRQ 19 wmaster0 (rt61pci): not using net_device_ops yet phy0: Selected rate control algorithm 'pid' phy0: Failed to initialize wep: -2 phy0 -> rt2x00lib_probe_dev: Error - Failed to initialize hw. ============================================================================= BUG kmalloc-128: Object already free ----------------------------------------------------------------------------- INFO: Allocated in rt61pci_probe_hw+0x3e5/0x6e0 [rt61pci] age=340 cpu=0 pid=21 INFO: Freed in rt2x00lib_remove_hw+0x59/0x70 [rt2x00lib] age=0 cpu=0 pid=21 INFO: Slab 0xc13ac3e0 objects=23 used=10 fp=0xdd59f6e0 flags=0x400000c3 INFO: Object 0xdd59f6e0 @offset=1760 fp=0xdd59f790 Bytes b4 0xdd59f6d0: 15 00 00 00 b2 8a fb ff 5a 5a 5a 5a 5a 5a 5a 5a ....².ûÿZZZZZZZZ Object 0xdd59f6e0: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object 0xdd59f6f0: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object 0xdd59f700: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object 0xdd59f710: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object 0xdd59f720: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object 0xdd59f730: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object 0xdd59f740: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object 0xdd59f750: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b a5 kkkkkkkkkkkkkkk¥ Redzone 0xdd59f760: bb bb bb bb »»»» Padding 0xdd59f788: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ Pid: 21, comm: stage1 Not tainted 2.6.29.1-desktop-1.1mnb #1 Call Trace: [] print_trailer+0xd3/0x120 [] object_err+0x37/0x50 [] __slab_free+0xe7/0x2f0 [] kfree+0x7e/0xd0 [] ? rt2x00lib_remove_hw+0x59/0x70 [rt2x00lib] [] ? rt2x00lib_remove_hw+0x59/0x70 [rt2x00lib] [] rt2x00lib_remove_hw+0x59/0x70 [rt2x00lib] [] rt2x00lib_remove_dev+0x37/0x50 [rt2x00lib] [] rt2x00lib_probe_dev+0x1a7/0x3b0 [rt2x00lib] [] rt2x00pci_probe+0xdf/0x1ee [rt2x00pci] [] local_pci_probe+0xe/0x10 [] pci_device_probe+0x60/0x80 [] driver_probe_device+0x9a/0x2e0 [] __driver_attach+0x89/0x90 [] bus_for_each_dev+0x4b/0x70 [] ? pci_device_remove+0x0/0x40 [] driver_attach+0x19/0x20 [] ? __driver_attach+0x0/0x90 [] bus_add_driver+0x1cf/0x2a0 [] ? pci_device_remove+0x0/0x40 [] driver_register+0x69/0x140 [] __pci_register_driver+0x40/0x80 [] ? rt61pci_init+0x0/0x19 [rt61pci] [] rt61pci_init+0x17/0x19 [rt61pci] [] do_one_initcall+0x26/0x1c0 [] ? slab_pad_check+0x3c/0x120 [] ? slab_pad_check+0x3c/0x120 [] ? check_object+0xda/0x210 [] ? percpu_free+0x46/0x50 [] ? __slab_free+0x22e/0x2f0 [] ? percpu_free+0x46/0x50 [] ? percpu_free+0x46/0x50 [] ? percpu_free+0x46/0x50 [] ? stop_machine_destroy+0x3c/0x40 [] ? load_module+0xa5/0x1c50 [] ? rt61pci_eepromregister_read+0x0/0x40 [rt61pci] [] ? rt2x00pci_write_tx_data+0x0/0x90 [rt2x00pci] [] ? mutex_lock+0xb/0x20 [] ? mutex_lock+0xb/0x20 [] ? tracepoint_update_probe_range+0x76/0xa0 [] ? tracepoint_module_notify+0x2f/0x40 [] ? notifier_call_chain+0x2d/0x70 [] ? __blocking_notifier_call_chain+0x4d/0x60 [] ? blocking_notifier_call_chain+0x1a/0x20 [] sys_init_module+0x96/0x1d0 [] ? sys_munmap+0x46/0x60 [] syscall_call+0x7/0xb FIX kmalloc-128: Object at 0xdd59f6e0 not freed rt61pci 0000:00:07.0: PCI INT A disabled rt61pci: probe of 0000:00:07.0 failed with error -2 Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit d60cc91acdc45f234d8830409203f504d03513c9 Author: Johannes Berg Date: Thu Apr 9 09:56:02 2009 +0200 fix iwl3945 registration regression I forgot that iwl3945 registration is separate from iwlagn. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit a860402d8f1756dae48cdcabe153c974116fc37e Author: Michael Buesch Date: Wed Apr 15 14:41:22 2009 -0400 mac80211: quiet beacon loss messages On Sunday 05 April 2009 11:29:38 Michael Buesch wrote: > On Sunday 05 April 2009 11:23:59 Jaswinder Singh Rajput wrote: > > With latest linus tree I am getting, .config file attached: > > > > [ 22.895051] r8169: eth0: link down > > [ 22.897564] ADDRCONF(NETDEV_UP): eth0: link is not ready > > [ 22.928047] ADDRCONF(NETDEV_UP): wlan0: link is not ready > > [ 22.982292] libvirtd used greatest stack depth: 4200 bytes left > > [ 63.709879] wlan0: authenticate with AP 00:11:95:9e:df:f6 > > [ 63.712096] wlan0: authenticated > > [ 63.712127] wlan0: associate with AP 00:11:95:9e:df:f6 > > [ 63.726831] wlan0: RX AssocResp from 00:11:95:9e:df:f6 (capab=0x471 status=0 aid=1) > > [ 63.726855] wlan0: associated > > [ 63.730093] ADDRCONF(NETDEV_CHANGE): wlan0: link becomes ready > > [ 74.296087] wlan0: no IPv6 routers present > > [ 79.349044] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 119.358200] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 179.354292] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 259.366044] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 359.348292] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 361.953459] packagekitd used greatest stack depth: 4160 bytes left > > [ 478.824258] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 598.813343] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 718.817292] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 838.824567] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 958.815402] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 1078.848434] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 1198.822913] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 1318.824931] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 1438.814157] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 1558.827336] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 1678.823011] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 1798.830589] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 1918.828044] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 2038.827224] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 2116.517152] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 2158.840243] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > [ 2278.827427] wlan0: beacon loss from AP 00:11:95:9e:df:f6 - sending probe request > > > I think this message should only show if CONFIG_MAC80211_VERBOSE_DEBUG is set. > It's kind of expected that we lose a beacon once in a while, so we shouldn't print > verbose messages to the kernel log (even if they are KERN_DEBUG). > > And besides that, I think one can easily remotely trigger this message and flood the logs. > So it should probably _also_ be ratelimited. Something like this: Signed-off-by: Michael Buesch commit 591f3dc200abb2100c473248a121ce14bfeeabd6 Author: Michael Buesch Date: Tue Mar 31 12:27:32 2009 +0200 b43: Do radio lock assertion in software The assertion of the lock-bit in the hardware register is unreliable, because there are devices with quirks that will randomly set the bit. Do the assertion in software, only. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 6aabd4c4441133836ac969a9488458b37f83b677 Author: Ivo van Doorn Date: Sat Mar 28 20:52:14 2009 +0100 rt2x00: Add rt73usb USB IDs Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit e3062403f5f71c48cf26e791e576f4feca4c9c0f Author: Christian Lamparter Date: Sun Mar 29 22:50:28 2009 +0200 p54usb: add Telsey 802.11g USB2.0 Adapter Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 4fc298b86635c60061bbd81cef8de2b031e5c4a7 Author: Christian Lamparter Date: Tue Mar 24 21:58:08 2009 +0100 ar9170: add Cace Airpcap NX usb_id This patch adds a new device to ar9170usb. Reported-by: Mike Kershaw/Dragorn Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 011f5c5bb20c08af93faa8bfd8d611c8cf85134f Author: Dan Williams Date: Wed Apr 8 10:15:17 2009 -0400 airo: queue SIOCSIWAUTH-requested auth mode change for next commit Code was clearly wrong, plus callers expect the mode change to happen as soon as possible, not dropped on the floor until the next time some other config value changes and a commit happens. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 02a9a39294017f105aedebcca5f49d552b18dbaa Author: Jamie Lentin Date: Tue Apr 7 22:59:56 2009 +0100 at76c50x-usb: Add device ID for OQO model 01+ Add USB device ID for OQO 01+'s internal wireless LAN An OQO employee mentions the chip's true identity here:- ftp://ftp.oqo.com/unsupported/linux/OQOLinux.html Signed-off-by: Jamie Lentin Acked-by: Kalle Valo Signed-off-by: John W. Linville commit f54930f363113a9357c9ae008965b6484a61cd29 Author: Philip Rakity Date: Tue Apr 7 12:41:17 2009 -0700 libertas: don't leak skb on receive error Don't lead memory when receive errors Signed-off-by: Philip Rakity Acked-by: Dan Williams Signed-off-by: John W. Linville commit 47afbaf5af9454a7a1a64591e20cbfcc27ca67a8 Author: Johannes Berg Date: Tue Apr 7 15:22:28 2009 +0200 mac80211: correct wext transmit power handler Wext makes no assumptions about the contents of data->txpower.fixed and data->txpower.value when data->txpower.disabled is set, so do not update the user-requested power level while disabling. Also, when wext configures a really _fixed_ power output [1], we should reject it instead of limiting it to the regulatory constraint. If the user wants to set a _limit_ [2] then we should honour that. [1] iwconfig wlan0 txpower 20dBm fixed [2] iwconfig wlan0 txpower 10dBm This fixes http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1942 Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 853da11b94e674445e93660f47a5f0aeeea09623 Author: Pavel Roskin Date: Fri Apr 3 20:10:26 2009 -0400 ath9k: fix access to a freed skb in ath_rx_tasklet() Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit c6dbe17f193c4adc8afc6884f26efb5fa27aa8af Author: Masakazu Mokuno Date: Mon Mar 30 11:04:36 2009 -0700 net/ps3: Fix wireless AP connect error handling This patch fixes the bug that the driver tries to continue to connect(associate) to AP even if gelic_wl_do_{wpa,wep}_setup() fails, Signed-off-by: Masakazu Mokuno Signed-off-by: Geoff Levand Signed-off-by: John W. Linville commit 731c6531684250c46d732e369b25b003356f3947 Author: Christian Lamparter Date: Mon Mar 30 15:55:24 2009 +0200 p54spi: fix locking warning in p54spi_op_tx This patch fixes the following waring: > ------------[ cut here ]------------ >WARNING: at kernel/softirq.c:138 local_bh_enable+0x54/0xbc() >Modules linked in: p54spi >[] (dump_stack+0x0/0x14) >[] (warn_on_slowpath+0x0/0x68) >[] (local_bh_enable+0x0/0xbc) >[] (p54spi_op_tx+0x0/0x4c [p54spi]) >[] (p54_sta_unlock+0x0/0x78) p54spi_op_tx needs to be called from different locking contexts. Therefore we have to protect the linked list with irqsave spinlocks. Reported-by: Max Filippov Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 540828196e48ec54b64067a2b9defd870bff3ece Author: Christian Lamparter Date: Wed Mar 25 03:11:44 2009 +0100 p54: replace MAC80211_LEDS with P54_LEDS in p54.h I'm very sorry, as this change belongs to the other patch: "[PATCH] p54: fix SoftLED compile dependencies". however I must have somehow lost "git add" for that file. Signed-off-by: Christian Lamparter Acked-by: Larry Finger Signed-off-by: John W. Linville commit cf68636a9773aa97915497fe54fa4a51e3f08f3a Author: Michael Buesch Date: Sat Mar 28 00:41:25 2009 +0100 b43: Refresh RX poison on buffer recycling The RX buffer poison needs to be refreshed, if we recycle an RX buffer, because it might be (partially) overwritten by some DMA operations. Cc: stable@kernel.org Cc: Francesco Gringoli Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit ec9a1d8c13e36440eda0f3c79b8149080e3ab5ba Author: Michael Buesch Date: Fri Mar 27 22:51:58 2009 +0100 b43: Poison RX buffers This patch adds poisoning and sanity checking to the RX DMA buffers. This is used for protection against buggy hardware/firmware that raises RX interrupts without doing an actual DMA transfer. This mechanism protects against rare "bad packets" (due to uninitialized skb data) and rare kernel crashes due to uninitialized RX headers. The poison is selected to not match on valid frames and to be cheap for checking. The poison check mechanism _might_ trigger incorrectly, if we are voluntarily receiving frames with bad PLCP headers. However, this is nonfatal, because the chance of such a match is basically zero and in case it happens it just results in dropping the packet. Bad-PLCP RX defaults to off, and you should leave it off unless you want to listen to the latest news broadcasted by your microwave oven. This patch also moves the initialization of the RX-header "length" field in front of the mapping of the DMA buffer. The CPU should not touch the buffer after we mapped it. Cc: stable@kernel.org Reported-by: Francesco Gringoli Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit b3631286aca3f54427ca0eb950981e9753866f6c Author: Vasanthakumar Thiagarajan Date: Wed Mar 25 18:10:18 2009 +0530 mac80211: Fix bug in getting rx status for frames pending in reorder buffer Currently rx status for frames which are completed from reorder buffer is taken from it's cb area which is not always right, cb is not holding the rx status when driver uses mac80211's non-irq rx handler to pass it's received frames. This results in dropping almost all frames from reorder buffer when security is enabled by doing double decryption (first in hw, second in sw because of wrong rx status). This patch copies rx status into cb area before the frame is put into reorder buffer. After this patch, there is a significant improvement in throughput with ath9k + WPA2(AES). Signed-off-by: Vasanthakumar Thiagarajan Acked-by: Johannes Berg Cc: stable@kernel.org Signed-off-by: John W. Linville commit 0ad8acaf434d360ad99813d981a68e605d6c8179 Author: Luis R. Rodriguez Date: Tue Mar 24 21:21:08 2009 -0400 cfg80211: fix NULL pointer deference in reg_device_remove() We won't ever get here as regulatory_hint_core() can only fail on -ENOMEM and in that case we don't initialize cfg80211 but this is technically correct code. This is actually good for stable, where we don't check for -ENOMEM failure on __regulatory_hint()'s failure. Cc: stable@kernel.org Reported-by: Quentin Armitage Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 38fb0afcd8761f8858e27135ed89a65117e2019c Author: Patrick McHardy Date: Wed Apr 15 12:45:08 2009 +0200 netfilter: nf_conntrack: fix crash when unloading helpers Commit ea781f197d (netfilter: nf_conntrack: use SLAB_DESTROY_BY_RCU and) get rid of call_rcu() was missing one conversion to the hlist_nulls functions, causing a crash when unloading conntrack helper modules. Reported-and-tested-by: Mariusz Kozlowski Signed-off-by: Patrick McHardy commit b6f0a3652ea9d2296fdc98c3b2c96603be611c4d Author: Eric Dumazet Date: Wed Apr 15 12:16:19 2009 +0200 netfilter: nf_log regression fix commit ca735b3aaa945626ba65a3e51145bfe4ecd9e222 'netfilter: use a linked list of loggers' introduced an array of list_head in "struct nf_logger", but forgot to initialize it in nf_log_register(). This resulted in oops when calling nf_log_unregister() at module unload time. Reported-and-tested-by: Mariusz Kozlowski Signed-off-by: Eric Dumazet Acked-by: Eric Leblond Signed-off-by: Patrick McHardy commit cc8d2730ad6fe79699cedd9cccfe632570830c3c Author: Robert Jarzmik Date: Mon Apr 13 16:07:55 2009 +0200 [ARM] pxa/mioa701: use GPIO95 as AC97 reset line MioA701 board's GPIO95 is the AC97 line. The other GPIO113 is not connected to the sound chip, but to the GSM chip as a wakeup line. It happens that when the pxa2xx_ac97 driver reconfigures the gpio as an "out gpio" for AC97 reset (bug workaround), it hangs the GSM chip. As AC97 platform data now enables to specify the AC97 reset line, use it. Signed-off-by: Robert Jarzmik Signed-off-by: Eric Miao commit eae17754ab1ffc88190ebcbd33b6bec79e6e559a Author: Mark Brown Date: Mon Apr 13 11:48:03 2009 +0100 [ARM] pxa: merge AC97 platform data structures Currently there are two possible platform datas for the PXA AC97 driver: one supported by the generic AC97 driver only which provides callbacks to allow board-specific configuration at stream startup and teardown, and another for pxa2xx-ac97-lib which allows configuration of the reset GPIO for PXA2xx CPUs. Obviously this won't actually work when using the generic AC97 driver since the drivers will attempt to parse the platform data in both formats. Fix this by merging the two structures. Signed-off-by: Mark Brown Acked-by: Robert Jarzmik Cc: Marek Vasut Signed-off-by: Eric Miao commit 5e901b37e4a8a305542ad3a776bce997efd7e5e9 Author: Eric Miao Date: Thu Apr 9 14:07:27 2009 +0800 [ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h Signed-off-by: Eric Miao Cc: Philipp Zabel Cc: Mark Brown commit 38d726d153cfe5efe5fe22d28d36ab382dda3a5c Author: Theodore Ts'o Date: Tue Apr 14 10:10:47 2009 -0400 jbd: use SWRITE_SYNC_PLUG when writing synchronous revoke records The revoke records must be written using the same way as the rest of the blocks during the commit process; that is, either marked as synchronous writes or as asynchornous writes. Signed-off-by: "Theodore Ts'o" commit 67c457a8c378a006a34d92f9bd3078a80a92f250 Author: Theodore Ts'o Date: Tue Apr 14 07:50:56 2009 -0400 jbd2: use SWRITE_SYNC_PLUG when writing synchronous revoke records The revoke records must be written using the same way as the rest of the blocks during the commit process; that is, either marked as synchronous writes or as asynchornous writes. Signed-off-by: "Theodore Ts'o" commit 6b82f3cb2d480b7714eb0ff61aee99c22160389e Author: Chuck Ebbert Date: Tue Apr 14 07:37:40 2009 -0400 ext4: really print the find_group_flex fallback warning only once Missing braces caused the warning to print more than once. Signed-Off-By: Chuck Ebbert Signed-off-by: "Theodore Ts'o" commit e047cca66c6bb0b1c346e91305011aab79dfc4b0 Author: Zhang Rui Date: Thu Apr 9 14:24:35 2009 +0800 ACPI video: handle indexed _BQC correctly In the current code, for a box with an indexed _BQC method, we 1. get the current brightness level by evaluating _BQC 2. set the value gotten in step 1 to _BCM 3. get the current brightness level again 4. set the _BQC_use_index flag if the results gotten in step 1 and in step 3 don't equal. But this logic doesn't work actually, because the _BQC_use_index is not set when acpi_video_device_lcd_set_level is invoked. This results in a failure in step 2. http://bugzilla.kernel.org/show_bug.cgi?id=12249#c83 Now, we set the _BQC_use_index flag after invoking _BQC for the first time. And reevaluate the _BQC to get the correct brightness level. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 82babbb3887e234c995626e4121d411ea9070ca5 Author: Zhang Rui Date: Wed Apr 8 09:44:29 2009 +0800 ACPI: Revert conflicting workaround for BIOS w/ mangled PRT entries 2f894ef9c8b36a35d80709bedca276d2fc691941 in Linux-2.6.21 worked around BIOS with mangled _PRT entries: http://bugzilla.kernel.org/show_bug.cgi?id=6859 d0e184abc5983281ef189db2c759d65d56eb1b80 worked around the same issue via ACPICA, and shipped in 2.6.27. Unfortunately the two workarounds conflict: http://bugzilla.kernel.org/show_bug.cgi?id=12270 So revert the Linux specific one. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit d68b597c883cf863c7216564cae08a4730d56cc1 Author: Bjorn Helgaas Date: Wed Apr 8 15:40:04 2009 +0000 ACPI: button: remove control method/fixed hardware distinctions This patch removes the driver distinction between control method (CM) and fixed hardware (FF) buttons. We previously needed that so we could install either a fixed event handler or a notify handler, but the Linux/ACPI code now handles that for us, so we don't need to worry about it. Note that this removes the FF/CM annotation from the "info" files in /proc. For example, /proc/acpi/button/PWRF/info: -type: Power Button (FF) +type: Power Button I don't think there's anything meaningful user-space can do by knowing whether a button is a control method or a fixed hardware button, so nobody should be looking at the FF/CM. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 106c19e7b978e1b84ea5cabbd470a0ddced577c8 Author: Bjorn Helgaas Date: Wed Apr 8 15:39:59 2009 +0000 ACPI: button: remove button->device pointer We no longer need a pointer from struct acpi_button back to the struct acpi_device. Everywhere we used that pointer, we either already have, or can easily get, the acpi_device pointer without using the copy from acpi_button. So this patch removes the structure element. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit bf04a77227db76f163bc2355ef4e176794987be2 Author: Bjorn Helgaas Date: Wed Apr 8 15:39:54 2009 +0000 ACPI: button: cache hid/name/class pointers This patch adds temporaries to cache the acpi_device_hid(), acpi_device_name(), and acpi_device_class() pointers so we don't have to clutter the code with so many uses of those interfaces. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 1bce81131c71064bc3163078f24545b839a31967 Author: Bjorn Helgaas Date: Wed Apr 8 15:39:49 2009 +0000 ACPI: button: use Linux style for getting driver_data It's typical and slightly more compact to look up the driver_data structure by initializing the automatic variable at its definition. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit e2fb9754d27513918a4936e8cbaad50ff56cfd3d Author: Bjorn Helgaas Date: Wed Apr 8 15:39:43 2009 +0000 ACPI: button: remove unnecessary null pointer checks Better to oops and learn about a bug than to silently cover it up. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 50a4da890102a455e5cd3dd358c38650d07178d3 Author: Bjorn Helgaas Date: Wed Apr 8 15:39:38 2009 +0000 ACPI: button: whitespace changes This patch changes a bit of whitespace to follow Linux conventions. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown