commit b2cd64153b94473f6bd82448a68b8e8c041676ea Merge: b17bfca... 13b8d09... Author: Linus Torvalds Date: Wed May 16 21:28:49 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: track spindown status and skip spindown_compat if possible libata: fix shutdown warning message printing libata-acpi: add ATA_FLAG_ACPI_SATA port flag libata: during revalidation, check n_sectors after device is configured libata: separate out ata_dev_reread_id() pata_scc had been missed by ata_std_prereset() switch commit b17bfca5f16a6090ee51250163e1720f6fe71515 Merge: 36dbe4d... a04395e... Author: Linus Torvalds Date: Wed May 16 21:21:33 2007 -0700 Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] usbaudio - Coping with short replies in usbmixer [ALSA] Include quirks from Ubuntu Dapper/Edgy/Feisty [ALSA] Fix probe of non-PnP ISA devices [ALSA] version 1.0.14rc4 [ALSA] hda-codec - Fix ALC882/861VD codec support on some laptops [ALSA] ASoC AC97 device reg bugfix [ALSA] ASoC AC97 static GPL symbol fix [ALSA] hda-codec - Make the mixer capability check more robust [ALSA] usb-audio: another Logitech QuickCam ID commit 36dbe4d6bffb90fcb2663ac50af00a942412e246 Merge: e0f88db... d0a2b7a... Author: Linus Torvalds Date: Wed May 16 21:20:28 2007 -0700 Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 * 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32: [AVR32] Implement platform hooks for atmel_lcdfb driver [AVR32] Wire up signalfd, timerfd and eventfd [AVR32] optimize pagefault path [AVR32] Remove bogus comment in arch/avr32/kernel/irq.c commit e0f88db3028798b5e6d62d1c65c991240bf317f3 Merge: 43c0f3d... c7754d4... Author: Linus Torvalds Date: Wed May 16 21:19:45 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Add hypervisor API negotiation and fix console bugs. commit 43c0f3d25c602dc96b201ed81ffda0bc600ff969 Author: Christoph Lameter Date: Tue May 15 23:57:09 2007 -0700 Fix: find_or_create_page skips cpuset memory spreading. We call alloc_page where we should be calling __page_cache_alloc. __page_cache_alloc performs cpuset memory spreading. alloc_page does not. There is no reason that pages allocated via find_or_create should be exempt. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8382d2b9a7205fe1fb262f59237715a40c911880 Author: Andrew Morton Date: Tue May 15 23:57:08 2007 -0700 parport_pc needs dma-mapping.h alpha: drivers/parport/parport_pc.c: In function 'parport_pc_fifo_write_block_dma': drivers/parport/parport_pc.c:636: warning: implicit declaration of function 'dma_map_single' drivers/parport/parport_pc.c:637: error: 'DMA_TO_DEVICE' undeclared (first use in this function) drivers/parport/parport_pc.c:637: error: (Each undeclared identifier is reported only once drivers/parport/parport_pc.c:637: error: for each function it appears in.) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a4dd7783dfc62176a29cb349404180f24f46975 Author: Domen Puncer Date: Tue May 15 23:57:05 2007 -0700 spi: fix spidev for >sizeof(long)/32 devices find_first_zero_bit accepts number of bits, not longs. Signed-off-by: Domen Puncer Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb33ed6345d6156484f39089aa8b52f44ce76609 Author: David Howells Date: Tue May 15 23:57:04 2007 -0700 AFS: Fix afs_prepare_write() afs_prepare_write() should not mark a page up to date if it only partially fills it in, in expectation of the caller filling in the rest prior to calling commit_write(). commit_write(), however, should mark the page up to date. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1800782016fda6fbc9990a0227fec581070f23af Author: Hugh Dickins Date: Tue May 15 23:57:04 2007 -0700 slub: don't confuse ctor and dtor kmem_cache_create() was swapping ctor and dtor in calling find_mergeable(): though it caused no bug, and probably never would, even if destructors are retained; but fix it so as not to generate anxiety ;) Signed-off-by: Hugh Dickins Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1abd727ed7abf5c19e7d1760671475cbecbccb0e Author: Christoph Lameter Date: Tue May 15 23:57:03 2007 -0700 SLUB: It is legit to allocate a slab of the maximum permitted size Sorry I screwed up the comparison. It is only an error if we attempt to allocate a slab larger than the maximum allowed size. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faab83bbcd9e001077e42a7c085f1e871997647f Author: David Howells Date: Tue May 15 23:57:02 2007 -0700 AFS: write back dirty data on unmount Fix AFS to write back dirty on unmounting. This didn't happen because afs_super_ops.drop_inode was pointing to generic_delete_inode. Now this pointer is left set to NULL so that the default behaviour occurs instead. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b58e21a27028a9f0399449d8bc8494fd9d9ff70 Merge: 52ade9b... 576fe0b... Author: Linus Torvalds Date: Wed May 16 21:15:18 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] optimize pagefaults a little [IA64] Fix section conflict of ia64_mlogbuf_finish [IA64] s/scalibility/scalability/ [IA64] kdump on INIT needs multi-nodes sync-up (v.2) [IA64] wire up {signal,timer,event}fd syscalls [IA64] spelling fixes: arch/ia64/ commit 52ade9b3b97fd3bea42842a056fe0786c28d0555 Author: Linus Torvalds Date: Wed May 16 15:28:14 2007 -0700 Fix ACPI suspend / device suspend ordering problem In commit e3c7db621bed4afb8e231cb005057f2feb5db557 we fixed the resume ordering, so that the ACPI low-level resume code was called before the actual driver resume was called. However, that broke the nesting logic of suspend and resume, and we continued to suspend the devices _after_ we the ACPI device suspend code was called. That resulted in us saving PCI state for devices that had already been changed by ACPI, and in some cases disabled entirely (causing the PCI save_state to be all-ones). Which in turn caused the wrong state to be written back on resume. This moves the ACPI device suspend to after the device model per-device suspend() calls. This fixes the bogus state save. Thanks to Lukáš Hejtmánek for testing. Acked-by: Lukas Hejtmanek Acked-by: Rafael J. Wysocki Cc: Len Brown Cc: Pavel Machek Cc: Andrew Morton Cc: Greg KH Signed-off-by: Linus Torvalds commit 576fe0bd7e52dce7afb6b9b2450744555b2eb53a Author: Christoph Hellwig Date: Wed May 16 14:52:19 2007 +0200 [IA64] optimize pagefaults a little Get rid of the notifier list and call the kprobes code directly if compiled in. This mirrors the changes that recently went into powerpc, s390 and sparc64. Signed-off-by: Christoph Hellwig Signed-off-by: Tony Luck commit a04395ead6d17c83da64264b6fe78f852a648202 Author: Thomas Reitmayr Date: Tue May 15 11:47:48 2007 +0200 [ALSA] usbaudio - Coping with short replies in usbmixer This patch makes sure that short USB replies are treated as an error when requesting the value of a certain mixer control. Signed-off-by: Thomas Reitmayr Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8286c53e54b8b1b9489b4dd5d2d3a4f94b8c012e Author: Daniel T Chen Date: Tue May 15 11:46:23 2007 +0200 [ALSA] Include quirks from Ubuntu Dapper/Edgy/Feisty Included is a patch against current alsa-kernel hg tip adding quirks that Ubuntu Dapper/Edgy/Feisty contains. Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 609d7694152f85734560ddc83be5e551b34d8c44 Author: Rene Herman Date: Tue May 15 11:42:56 2007 +0200 [ALSA] Fix probe of non-PnP ISA devices isa_register_driver() returns an error if no device is found and it's no fatal error for the drivers with pnp support. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 60af15f529d22a93805e74dd3c52b6f8134511d2 Author: Jaroslav Kysela Date: Wed May 16 11:45:47 2007 +0200 [ALSA] version 1.0.14rc4 Signed-off-by: Jaroslav Kysela commit 272a527c04c0c4f548232f1ec7d2d72bfdab4384 Author: Kailang Yang Date: Mon May 14 11:00:38 2007 +0200 [ALSA] hda-codec - Fix ALC882/861VD codec support on some laptops Fixed some platform no sound and Add JD Function for below platform list: Sony(0x104d) 0x9015, 0x900e, 0x1f00 Toshiba(0x1179) DALLAS 0xff00, 0xff01 Targa(0x1462) 0x28fb Asus(0x1043) A7J 0x060d Lenovo(0x17aa) 0x3bfd, 0x2085 MEDION(0x17c0) MD2 0x4071 Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a68660e0c63d8f7ab8725f9e771119c08e9f953b Author: Liam Girdwood Date: Thu May 10 19:27:27 2007 +0200 [ALSA] ASoC AC97 device reg bugfix This patch fixes a bug whereby AC97 bus device data was being clobbered when AC97 codecs using the generic ac97_codec.c driver were being registered. Codecs that didn't use the generic driver were unaffected (e.g. WM9712, WM9713). Changes:- o Add new AC97 codec class for custom (or need bus dev registration) AC97 codecs. o Only register/deregister this custom codec device with the AC97 bus. The generic AC97 driver already does this for generic codec devices. This may be related to bug #3038 :- https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3038 Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9ae67c7b870f5220a6b30e4f6e83b319bd9be718 Author: Liam Girdwood Date: Thu May 10 17:12:31 2007 +0200 [ALSA] ASoC AC97 static GPL symbol fix This patch fixes a bug whereby the GPL'ed symbol ac97_dai was being declared as static. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b75e53f09212f12369156710e84d1cbf115113cd Author: Takashi Iwai Date: Thu May 10 16:56:09 2007 +0200 [ALSA] hda-codec - Make the mixer capability check more robust In some cases, mixer elements return -EINVAL because it couldn't obtain proper amp_cap bits. The patch improves the robustness, trying the amp_cap query again in such a case. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d417045e7deeb37d97793805fe302da7b4f82eec Author: Daniel Drake Date: Thu May 10 08:52:19 2007 +0200 [ALSA] usb-audio: another Logitech QuickCam ID This patch adds the ID for another quickcam microphone, reported by freqmod on ALSA ticket #0003040 I'm going to submit a USB patch separately to provide a macro to simplify these entries, as suggested by Alan Stern. We could switch to using that in future. Signed-off-by: Daniel Drake Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 13b8d09f5de0aaa3153bbccc98baf247387823dc Author: Tejun Heo Date: Tue May 15 12:29:22 2007 +0200 libata: track spindown status and skip spindown_compat if possible Our assumption that most distros issue STANDBYNOW seems wrong. The upstream sysvinit and thus many distros including gentoo and opensuse don't take any action for libata disks on spindown. We can skip compat handling for these distros so that they don't need to update anything to take advantage of kernel-side shutdown. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit da071b42f73dabbd0daf7ea4c3ff157d53b00648 Author: Tejun Heo Date: Mon May 14 17:26:18 2007 +0200 libata: fix shutdown warning message printing Unlocking ap->lock and ssleeping don't work because SCSI commands can be issued from completion path without context. Reimplement delayed completion by allowing translation functions to override qc->scsidone(), storing the original completion function to scmd->scsi_done() and overriding qc->scsidone() with a function which schedules delayed invocation of scmd->scsi_done(). This isn't pretty at all but all the ugly parts are thankfully contained in the stop translation path where the compat feature is implemented. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3cadbcc09891b8544203f211dac13f9cc4e6832a Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata-acpi: add ATA_FLAG_ACPI_SATA port flag Whether a controller needs IDE or SATA ACPI hierarchy is determined by the programming interface of the controller not by whether the controller is SATA or PATA, or it supports slave device or not. This patch adds ATA_FLAG_ACPI_SATA port flags which tells libata-acpi that the port needs SATA ACPI nodes, and sets the flag for ahci and sata_sil24. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6ddcd3b0201a7ad72294347636d2b4028ddbd95d Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata: during revalidation, check n_sectors after device is configured Device might be resized during ata_dev_configure() due to HPA or (later) ACPI _GTF. Currently it's worked around by caching n_sectors before turning off HPA. The cached original size is overwritten if the device is reconfigured without being hardreset - which always happens after configuring trasnfer mode. If the device gets hardreset for some reason after that, revalidation fails with -ENODEV. This patch makes size checking more robust by moving n_sectors check from ata_dev_reread_id() to ata_dev_revalidate() after the device is fully configured. No matter what happens during configuration, a device must have the same n_sectors after fully configured to be treated as the same device. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fe30911b34098db58c21d0f936f6c3f17f32deb8 Author: Tejun Heo Date: Tue May 15 03:28:15 2007 +0900 libata: separate out ata_dev_reread_id() Separate out ata_dev_reread_id() from ata_dev_revalidate(). ata_dev_reread_id() reads IDENTIFY page and determines whether the same device is still there. ata_dev_revalidate() reconfigures after reread completes. This will be used by ACPI update. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d1c68fa6ce7e56e300d8561bb3b6492c336df863 Author: Al Viro Date: Tue May 15 08:21:17 2007 +0100 pata_scc had been missed by ata_std_prereset() switch Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit c7754d465b1feade85b5f1c4492781a30f6652a2 Author: David S. Miller Date: Tue May 15 17:03:54 2007 -0700 [SPARC64]: Add hypervisor API negotiation and fix console bugs. Hypervisor interfaces need to be negotiated in order to use some API calls reliably. So add a small set of interfaces to request API versions and query current settings. This allows us to fix some bugs in the hypervisor console: 1) If we can negotiate API group CORE of at least major 1 minor 1 we can use con_read and con_write which can improve console performance quite a bit. 2) When we do a console write request, we should hold the spinlock around the whole request, not a byte at a time. What would happen is that it's easy for output from different cpus to get mixed with each other. 3) Use consistent udelay() based polling, udelay(1) each loop with a limit of 1000 polls to handle stuck hypervisor console. Signed-off-by: David S. Miller commit 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 Author: Al Viro Date: Tue May 15 20:37:20 2007 +0100 arm: walk_stacktrace() needs to be exported oprofile depends on having it Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ecec5ba681a0bf1165899f8b1889f06fcd8e901a Author: Al Viro Date: Tue May 15 20:36:00 2007 +0100 fix uml-x86_64 __NR_syscall_max is done in x86_64 asm-offsets; do an equivalent in uml kern_constants.h Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 327b9eebbf2b7ce632e93a9c1386d944af0dadf4 Author: Al Viro Date: Tue May 15 20:37:10 2007 +0100 audit_match_signal() and friends are used only if CONFIG_AUDITSYSCALL is set Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b4e1ded3cf6e13c122f019532cb60347d6c88c8c Author: Al Viro Date: Tue May 15 20:37:00 2007 +0100 m32r: __xchg() should be always_inline it depends on elimination of unreachable branches in switch (by object size), so we must declare it always_inline Signed-off-by: Al Viro Acked-by: Hirokazu Takata Signed-off-by: Linus Torvalds commit 8eafafb54bc594be8a23b00b25055b59838a9c79 Author: Al Viro Date: Tue May 15 20:36:50 2007 +0100 rpadlpar breakage - fallout of struct subsystem removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1b2bad2f049e405530b4a8a478edc45770b219c1 Author: Al Viro Date: Tue May 15 20:36:40 2007 +0100 em28xx and ivtv should depend on PCI .. because video-buf.c requires PCI, and VIDEO_EM28XX selects it. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9cbe05c71251b51607d80256c3b3754957bb5ed8 Author: Al Viro Date: Tue May 15 20:36:30 2007 +0100 missing includes in mlx4 Signed-off-by: Al Viro Acked-by: Jeff Garzik Acked-by: Roland Dreier Signed-off-by: Linus Torvalds commit 7a86edef395576f69d2513c62aea7c966043bc8d Author: Al Viro Date: Tue May 15 20:36:20 2007 +0100 missing dependencies for USB drivers in input stuff that does select USB should depend on USB_ARCH_HAS_HCD, or we'll end up with unbuildable configs. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit faa2fb4e67775101a5c46074fa24f0d81cdb4deb Author: Al Viro Date: Tue May 15 20:36:10 2007 +0100 missing mm.h in fw-ohci need it for page_private(), not all targets have it pulled indirectly Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 835a906c74ecf20cdb817d6d02975cc0ba421e35 Merge: e089d43... 51a41e7... Author: Linus Torvalds Date: Tue May 15 18:50:19 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6: sh64: Add .gitignore entry for syscalltab. sh64: generic quicklist support. sh64: Update cayman defconfig. sh64: Fixup sh-sci build. sh64: ppoll/pselect6() and restartable syscalls. sh64: dma-mapping updates. sh64: Fixups for the irq_regs changes. sh64: Wire up many new syscalls. spelling fixes: arch/sh64/ sh64: ROUND_UP macro cleanup in arch/sh64/kernel/pci_sh5.c commit e089d43fb1ab8e39168c9f61d30aef5b8724d085 Merge: 0e402c6... e0ff9cd... Author: Linus Torvalds Date: Tue May 15 18:47:21 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: Use menuconfig objects: IDE sl82c105: Switch to ref counting API ide: remove ide_use_dma() ide: add missing validity checks for identify words 62 and 63 ide: remove ide_dma_enable() sl82c105: add speedproc() method and MWDMA0/1 support cs5530/sc1200: add ->speedproc support cs5530/sc1200: DMA support cleanup ide: use ide_tune_dma() part #2 cs5530/sc1200: add ->udma_filter methods ide: always disable DMA before tuning it pdc202xx_new: use ide_tune_dma() alim15x3: use ide_tune_dma() sis5513: PIO mode setup fixes serverworks: PIO mode setup fixes pdc202xx_old: rewrite mode programming code (v2) commit 0e402c6ec4f32a9192a30c4a5b5ba6867c0be7bc Merge: 28aa483... 4e19b5c... Author: Linus Torvalds Date: Tue May 15 18:46:25 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: ucc_geth: eliminate max-speed, change interface-type to phy-connection-type smc911x: fix compilation breakage pasemi_mac: Fix local-mac-address parsing pasemi_mac: Terminate PCI ID list pasemi_mac: Interrupt ack fixes pasemi_mac: Fix register defines commit 28aa483f80d146a8f117eb65a4fddf31d58230d7 Author: Linus Torvalds Date: Tue May 15 18:45:49 2007 -0700 x86: Fix discontigmem + non-HIGHMEM compile It's not necessarily a very sane configuration, but people running "make randconfig" noticed it wouldn't compile. This fixes some obvious problems in discontig.c to allow a clean compile. Acked-by: andrew hendry Signed-off-by: Linus Torvalds commit e0ff9cd12a26259f8dd676124a188037e7e90b38 Author: Jan Engelhardt Date: Wed May 16 00:51:46 2007 +0200 Use menuconfig objects: IDE Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 640b31bf1291d1fb8a3e90abed8f145410122bf8 Author: Alan Cox Date: Wed May 16 00:51:46 2007 +0200 sl82c105: Switch to ref counting API Not sure how this one got missed in the great purge some time ago but it did. Signed-off-by: Alan Cox Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 122ab0887c36247bd4508c25e4fccf9264546fe2 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: remove ide_use_dma() ide_use_dma() duplicates a lot of ide_max_dma_mode() functionality and as all users of ide_use_dma() were converted to use ide_tune_dma() now it is possible to add missing checks to ide_tune_dma() and remove ide_use_dma() completely, so do it. There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 3649c06e66ad3589374e8765ed69eda65658735c Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: add missing validity checks for identify words 62 and 63 Check validity of identify words 62 and 63 before using them in ide_get_mode_mask(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 4728d546d7137ad5350cc2e53d4748fd26f61a60 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:46 2007 +0200 ide: remove ide_dma_enable() * check ->speedproc return value in ide_tune_dma() * use ide_tune_dma() in cmd64x/cs5530/sc1200/siimage/sl82c105/scc_pata drivers * remove no longer needed ide_dma_enable() Signed-off-by: Bartlomiej Zolnierkiewicz commit 46cedc9b773795b6190c31e5d32de5207b55a356 Author: Sergei Shtylyov Date: Wed May 16 00:51:44 2007 +0200 sl82c105: add speedproc() method and MWDMA0/1 support Add the speedproc() method for setting transfer modes, modify config_for_dma() to call it and use ide_max_dma_mode() to select the best DMA mode. Add support for the multiword DMA modes 0 and 1, using the upper half of the 'drive_data' field to store the DMA timings to program into the drive control register when DMA is turned on for real. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3c3f5d2c9f64b47aceb88f8d80fcb70fb9f9809f Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:44 2007 +0200 cs5530/sc1200: add ->speedproc support * add {cs5530,sc1200}_tunepio() for programming PIO timings * add {cs5530,sc1200}_tune_chipset() (->speedproc method) for setting transfer mode and convert {cs5530,sc1200}_config_dma() to use it * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit a01ba4011aa745be44d0290c5da5cb2dfb4e37ce Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:44 2007 +0200 cs5530/sc1200: DMA support cleanup sc1200.c: * remove open-coded variant of ide_dma_host_off() (== ->dma_host_off), it is not needed because ->dma_off_quietly calls ->dma_host_off * use ->dma_host_on (== ide_dma_host_on() for this driver) instead of open-coded variant, call it from the users of sc1200_config_dma2() [ there is no need to call ->dma_host_on in sc1200_config_dma() because core code takes care of calling ->ide_dma_on on successful execution of ->ide_dma_check ] * add comment about ->tuneproc interface abuse cs5530.c/sc1200.c: * core code takes care of calling ->dma_off_quietly before calling ->ide_dma_check so there is no need to call it in ->ide_dma_check methods * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit bd203b57c7edd6bc457b769cd15fa7239cd2241e Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 ide: use ide_tune_dma() part #2 Use ide_tune_dma() in ide-cris/it821x/pdc202xx_old/serverworks drivers. Signed-off-by: Bartlomiej Zolnierkiewicz commit 5fd216bbb277b645109a889c489e13a7aafbc304 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 cs5530/sc1200: add ->udma_filter methods CS5530/SC1200 specifies that two drives on the same cable cannot mix UDMA/MDMA. Add {cs5530,sc1200}_udma_filter() to handle this. This also makes it possible to remove open-coded best DMA mode selection and use standard ide_use_dma()/ide_max_dma_mode() helpers. While at it bump version numbers. There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 793a97228d3da876f42b7fb4d4a52cc8cc86dc81 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 ide: always disable DMA before tuning it ide_start_power_step() and set_using_dma() were missing ->dma_off_quietly call (comment in probe_hwif() states that DMA should be always cleared before tuning is attempted). Fix it. Signed-off-by: Bartlomiej Zolnierkiewicz commit 7f86723a60d287be19aee620277184f9f5455283 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 pdc202xx_new: use ide_tune_dma() * remove code enabling IORDY and prefetch from config_chipset_for_dma(), as the comment states it has no real effect because these settings are overriden when the PIO mode is set (and for this driver ->autotune == 1 so PIO mode is always programmed) * use ide_tune_dma() in pdcnew_config_drive_xfer_rate() and remove no longer needed config_chipset_for_dma() There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 38ff8a74e8f015f94289b84cd6572a68c3431cdd Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:43 2007 +0200 alim15x3: use ide_tune_dma() Use ide_tune_dma() in ali15x3_config_drive_for_dma() and remove all the open coded DMA tuning code and also config_chipset_for_dma(). Set ->atapi_dma flag correctly in init_hwif_common_ali15x3() so ide_tune_dma() can take care of checking if ATAPI DMA is allowed and remove open coded ATAPI DMA check from ali15x3_config_drive_for_dma(). There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 6b8cf7724bd0f8ae1f61937c5f40f4dbbda40960 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:42 2007 +0200 sis5513: PIO mode setup fixes * limit max PIO mode to PIO4, this driver doesn't support PIO5 and attempt to program PIO5 by config_art_rwp_pio() could result in incorrect PIO timings being programmed and possibly the data corruption (for < ATA100 family chipsets PIO0 timings were used, for ATA100 and ATA100a - the random content of test1 variable was used, for ATA133 - MWDMA0 timings were used) * BUG() in sis5513_tune_chipset() if somebody tries to force unsupported PIO5, also cleanup this function a bit while at it * add comment about PIO0 timings for < ATA100 family chipsets * remove open-coded best PIO mode selection from config_art_rwp_pio(), it contained numerous bugs: - it didn't check for validity of id->eide_pio_modes and id->eide_pio_iordy before using them - it tried to found out maximum PIO mode basing on minimum IORDY cycle time (moreover wrong cycle times were used for PIO1/5) - it was overriding PIO blacklist and conservative PIO "downgrade" done by ide_get_best_pio_mode() * use sis5513_tune_drive() instead of config_art_rwp_pio() in sis5513_config_xfer_rate() so the correct PIO mode is also set on drive even if the device is not IORDY/DMA capable * config_art_rwp_pio() was always setting the best possible mode and not the wanted one - fix it and move ide_get_best_pio_mode() call to config_chipset_for_pio() * don't use ide_find_best_mode() in config_chipset_for_pio(), it was being overriden by config_art_rwp_pio() for the host timings anyway + we need to set the same PIO mode on the device and the host * pass correct "pio" argument (255 instead of 5) to sis5513_tune_drive() call in sis5513_config_xfer_rate() so the best PIO mode is set on the drive and not PIO4 * rename sis5513_tune_drive() to sis5513_tuneproc() and config_chipset_for_pio() to sis5513_tune_driver() * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit 9445de76c124e90176b5116cf82f6cd1413f5230 Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:42 2007 +0200 serverworks: PIO mode setup fixes * limit max PIO mode to PIO4, this driver doesn't support PIO5 and attempt to program PIO5 by svwks_tune_chipset() could result in incorrect PIO timings being programmed and possibly the data corruption (it seems that the minimum possible values were used but I lack the datasheets to be sure) * select best PIO mode in svwks_tune_drive() and not in svwks_tune_chipset() when doing PIO autotuning (pio == 255) * don't try to tune PIO in config_chipset_for_dma() as ide_dma_enable() could return 1 if DMA was previously enabled (svwks_config_drive_xfer_rate() takes care of PIO tuning if no suitable DMA mode is found) * remove config_chipset_for_pio() and use svwks_tune_drive() instead, config_chipset_for_pio() contained numerous bugs when selecting PIO mode (luckily it was only used for devices limited to PIO by capabilities/BIOS): - it didn't check for validity of id->eide_pio_modes and id->eide_pio_iordy before using them - it tried to found out maximum PIO mode basing on minimum IORDY cycle time (moreover wrong cycle times were used for PIO0/1/5) - it was overriding PIO blacklist and conservative PIO "downgrade" done by ide_get_best_pio_mode() - if the max drive PIO was PIO5 then XFER_PIO_0/XFER_PIO_SLOW was selected (XFER_PIO_SLOW is not supported by svwks_tune_chipset() so the result was the same as if using XFER_PIO_5 => wrong PIO timings were set) - it was overriding drive->current_speed * bump driver version Signed-off-by: Bartlomiej Zolnierkiewicz commit 4fce3164b84d5b014acbf5a3f57eb3650e154f5b Author: Bartlomiej Zolnierkiewicz Date: Wed May 16 00:51:41 2007 +0200 pdc202xx_old: rewrite mode programming code (v2) This patch is based on the documentation (I would like to thank Promise for it) and also partially on the older vendor driver. Rewrite mode programming code: * disable 66MHz clock in pdc202xx_tune_chipset() so it is correctly disabled even if both devices on the channel are not DMA capable and after reset * enable/disable IORDY and PREFETCH bits in pdc202xx_tune_chipset() as they need to be setup correctly also for PIO only devices, plus IORDY wasn't disabled for non-IORDY devices and PREFETCH wasn't disabled for ATAPI devices * remove dead code for setting SYNC_ERDDY_EN bits from config_chipset_for_dma() (driver sets ->autotune to 1 so PIO modes are always programmed => lower nibble of register A never equals 4 => "chipset_is_set" is always true) * enable PIO mode programming for all ATAPI devices (it was limited to ->media == ide_cdrom devices) * remove extra reads of registers A/B/C, don't read register D et all * do clearing / programming of registers A/B/C in one go (gets rid of extra PCI config space read/write cycle) * set initial values of drive_conf/AP/BP/CP variables to zero (paranoia for the case when PCI reads fail) * remove XFER_UDMA6 to XFER_UDMA5 remapping case - it can't happen (ide_rate_filter() takes care of it) * fix XFER_MW_DMA0 timings (they were overclocked, use the official ones) * fix bitmasks for clearing bits of register B: - when programming DMA mode bit 0x10 of register B was cleared which resulted in overclocked PIO timing setting (iff PIO0 was used) - when programming PIO mode bits 0x18 weren't cleared so suboptimal timings were used for PIO1-4 if PIO0 was previously set (bit 0x10) and for PIO0/3/4 if PIO1/2 was previously set (bit 0x08) * add FIXME comment about missing locking for 66MHz clock register Also while at it: * remove unused defines * do a few cosmetic / CodingStyle fixes * bump driver version v2: * in pdc202xx_tune_chipset() the old content of drive configuration registers is used only by the debugging code so cover "drive_conf" PCI registers read by #if PDC202XX_DEBUG_DRIVE_INFO (Noticed by Sergei Shtylyov) Signed-off-by: Bartlomiej Zolnierkiewicz commit 4e19b5c193454ade8d86468077078f680d121979 Author: Kim Phillips Date: Fri May 11 18:25:07 2007 -0500 ucc_geth: eliminate max-speed, change interface-type to phy-connection-type It was agreed that phy-connection-type was a better name for the interface-type property, so this patch renames it. Also, the max-speed property name was determined too generic, and is therefore eliminated in favour of phy-connection-type derivation logic. includes corrections to copyright text. Signed-off-by: Kim Phillips Signed-off-by: Jeff Garzik commit f2773a29596d835d2b00137ba925c186699ea117 Author: Vitaly Wool Date: Sun May 13 18:42:08 2007 +0400 smc911x: fix compilation breakage Looks like the new version of this patch has been overlooked, so I'm resending it. It just adapts the driver to the new IRQ API according to what Russell has pointed out. drivers/net/smc911x.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) Signed-off-by: Vitaly Wool Signed-off-by: Jeff Garzik commit 1af7f05628fab81fdf4412d757676412ba5db660 Author: olof@lixom.net Date: Sat May 12 14:57:46 2007 -0500 pasemi_mac: Fix local-mac-address parsing Turns out we have an old version of firmware that stores the mac address in 'mac-address' as a string instead of a byte array. All versions that use local-mac-address should have it as byte array, so no need to do string parsing for that case. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit fd17825480b2de3076727c677f8e257623705963 Author: olof@lixom.net Date: Sat May 12 14:57:36 2007 -0500 pasemi_mac: Terminate PCI ID list This caused some very interesting behaviour depending on what happened to be built at the same time. Add terminating empty entry to the list of IDs. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit 52a9435183f961e1bb3c146a62bfbecf93d15d58 Author: Olof Johansson Date: Sat May 12 18:01:09 2007 -0500 pasemi_mac: Interrupt ack fixes Interrupt ack fixes Fix the packet count resets at interrupt time, using the cacheable packet count status to set number of processed/received packets, since the ack count is the cumulative number of packets processed, and not incremental. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit a54c545134ea77609ed9eb5df50524c097112327 Author: olof@lixom.net Date: Sat May 12 14:57:27 2007 -0500 pasemi_mac: Fix register defines Some shift values were obviously wrong. Fix them to correspond with the masks. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit 17028c5c91580036eb41da2fad292965fa3b9a7d Author: Martin Michlmayr Date: Tue May 15 21:03:36 2007 +0200 [IA64] Fix section conflict of ia64_mlogbuf_finish Building with GCC 4.2, I get the following error: CC arch/ia64/kernel/mca.o arch/ia64/kernel/mca.c:275: error: __ksymtab_ia64_mlogbuf_finish causes a section type conflict This is because ia64_mlogbuf_finish is both declared static and exported. Fix by removing the export (which is unneeded now). Signed-off-by: Martin Michlmayr Signed-off-by: Tony Luck commit 0560551dca0c02a4b23f95a9c339882ff291e1c7 Merge: 1ca9bc4... bbdfff8... Author: Linus Torvalds Date: Tue May 15 12:10:26 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] Fix wrong ID in via-agp.c commit 1ca9bc4f2ae22741f2a545c1b0c3a042a2d71b11 Merge: f653c34... 99fbe1a... Author: Linus Torvalds Date: Tue May 15 12:10:00 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] Correct revision mask for powernow-k8 [CPUFREQ] powernow-k7: fix MHz rounding issue with perflib [CPUFREQ] Support rev H AMD64s in powernow-k8 commit f653c34dd3d8bde2c918316fd5ba2e2c4f95afcf Author: Jens Axboe Date: Tue May 15 19:30:07 2007 +0200 ll_rw_blk: fix gcc 4.2 warning on current_io_context() current_io_context() is both static and exported with EXPORT_SYMBOL(). As there are no users outside of ll_rw_blk.c itself, just kill the export. Problem reported by Martin Michlmayr Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit de7860c3f3272086a4c3a1b4280b11ffae7c32be Merge: cfbf07f... 7c5b9ef... Author: Linus Torvalds Date: Tue May 15 09:52:31 2007 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB/cm: Optimize stale connection detection IB/mthca: Set cleaned CQEs back to HW ownership when cleaning CQ IB/mthca: Fix posting >255 recv WRs for Tavor RDMA/cma: Add check to validate that cm_id is bound to a device RDMA/cma: Fix synchronization with device removal in cma_iw_handler RDMA/cma: Simplify device removal handling code IB/ehca: Disable scaling code by default, bump version number IB/ehca: Beautify sysfs attribute code and fix compiler warnings IB/ehca: Remove _irqsave, move #ifdef IB/ehca: Fix AQP0/1 QP number IB/ehca: Correctly set GRH mask bit in ehca_modify_qp() IB/ehca: Serialize hypervisor calls in ehca_register_mr() IB/ipath: Shadow the gpio_mask register IB/mlx4: Fix uninitialized spinlock for 32-bit archs mlx4_core: Remove unused doorbell_lock net: Trivial MLX4_DEBUG dependency fix. commit cfbf07f2a80b618c42a42c20d83647ea8fcceca0 Author: Christoph Lameter Date: Tue May 15 01:42:06 2007 -0700 SLUB: CONFIG_LARGE_ALLOCS must consider MAX_ORDER limit Take MAX_ORDER into consideration when determining KMALLOC_SHIFT_HIGH. Otherwise we may run into a situation where we attempt to create general slabs larger than MAX_ORDER. Signed-off-by: Christoph Lameter Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a3ee3d5529c5e66aedf91401bfac65c61998639 Author: Jeremy Fitzhardinge Date: Tue May 15 01:41:59 2007 -0700 i386: fix voyager build This adds an smp_ops for voyager, and hooks things up appropriately. This is the first baby-step to making subarch runtime switchable. Signed-off-by: Jeremy Fitzhardinge Cc: James Bottomley Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 297d9c035edd04327fedc0d1da27c2b112b66fcc Author: Jeremy Fitzhardinge Date: Tue May 15 01:41:48 2007 -0700 i386: move common parts of smp into their own file Several parts of kernel/smp.c and smpboot.c are generally useful for other subarchitectures and paravirt_ops implementations, so make them available for reuse. Signed-off-by: Jeremy Fitzhardinge Acked-by: Chris Wright Cc: James Bottomley Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 838c41184fee5e151c09972f2ba90c16493af614 Author: Prarit Bhargava Date: Tue May 15 01:41:43 2007 -0700 Remove cpu hotplug defines for __INIT & __INITDATA After examining what was checked in and the code base I discovered that most of 86c0baf123e474b6eb404798926ecf62b426bf3a wasn't necessary anymore.... So here's a patch that reverts the last part of that changeset: Revert part of 86c0baf123e474b6eb404798926ecf62b426bf3a. The kernel has moved forward to a state where the original change is not necessary. After porting forward, this final version of the patch was applied and broke non-x86 architectures. Signed-off-by: Prarit Bhargava Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bd2aad2103314a0a09614dc29926a1437db02f7 Author: Stephen Rothwell Date: Tue May 15 01:41:36 2007 -0700 Revert "MAINTAINERS: remove invalid list address for TPM" This reverts commit b6d1c9a44744224d83125a5a89c1a6cc4db27361. Others tell me that this address has worked for them, so I can only assume that I hit a glitch in the sourceforge mail system. Signed-off-by: Stephen Rothwell Cc: Kylene Hall Cc: Marcel Selhorst Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f89441b37536fea92b1ed7004e5e2dda011473d Author: Thomas Gleixner Date: Tue May 15 01:41:32 2007 -0700 clocksource: fix lock order in the resume path lockdep complains about the lock nesting of clocksource and watchdog lock in the resume path. Change the resume marker to a bit operation and remove the lock from this path. Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c46bdcaec53eda069a8a9cd60621c7431aa7842 Author: Geert Uytterhoeven Date: Tue May 15 01:41:29 2007 -0700 m68k: implement __clear_user() m68k: implement __clear_user(), which is needed by fs/signalfd.c Since we always let the MMU do all checking, clear_user() and __clear_user() are identical. The old clear_user() is renamed to __clear_user() for consistency. Signed-off-by: Geert Uytterhoeven Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fcdf96ca95f81a0e1fd91a2de16dc67c641c958 Author: Simon Horman Date: Tue May 15 01:41:15 2007 -0700 alpha: fix hard_smp_processor_id compile error "Remove hardcoding of hard_smp_processor_id on UP systems", 2f4dfe206a2fc07099dfad77a8ea2f4b4ae2140f in Linus' tree, moved the definition of hard_smp_processor_id linux/smp.h to asm/smp.h for UP systems. This causes a regression on Alpha. cc1: warnings being treated as errors arch/alpha/kernel/setup.c: In function 'setup_arch': arch/alpha/kernel/setup.c:506: warning: implicit declaration of function 'hard_smp_processor_id' make[1]: *** [arch/alpha/kernel/setup.o] error 1 make: *** [arch/alpha/kernel] error 2 By including asm/smp.h non-conditionally in asm/mmu_context.h the problem appears to be resolved. Cc: Fernando Luis Vazquez Cao Signed-off-by: Simon Horman Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b67405bbbba6bbd28dfd5337b29d5bc5a1140afb Author: Yoshinori Sato Date: Tue May 15 01:41:07 2007 -0700 h8300 atomic.h update add atomic_sub_and_test define. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 218f0aaee8a6b0e5772b95b154dea5b7701b33aa Author: Paul Mundt Date: Tue May 15 01:41:02 2007 -0700 nommu: add ioremap_page_range() lib/ioremap.c is presently only built in if CONFIG_MMU is set. While this is reasonable, platforms that support both CONFIG_MMU=y or n need to be able to call in to this regardless. As none of the current nommu platforms do anything special with ioremap(), we assume that it's always successful. This fixes the SH-4 build with CONFIG_MMU=n. Signed-off-by: Paul Mundt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ee9aabb0520adea5937855a9575c08a97b16e7 Author: Davide Libenzi Date: Tue May 15 01:40:57 2007 -0700 epoll: move kfree inside ep_free Move the kfree() call inside the ep_free() function. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67647d0fb8bc03609d045a9cce85f7ef6d763036 Author: Davide Libenzi Date: Tue May 15 01:40:52 2007 -0700 epoll: fix some comments Fixes some epoll code comments. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7ea76302547f81e4583d0d7c52a1c37c6747f5d Author: Davide Libenzi Date: Tue May 15 01:40:47 2007 -0700 epoll locks changes and cleanups Changes the rwlock to a spinlock, and drops the use-count variable. Operations are always bound by the mutex now, so the use-count is no more needed. For the same reason, the rwlock can become a simple spinlock. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d47de16c7221968d3eab899d7540efa5ba77af5a Author: Davide Libenzi Date: Tue May 15 01:40:41 2007 -0700 fix epoll single pass code and add wait-exclusive flag Fixes the epoll single pass code. During the unlocked event delivery (to userspace) code, the poll callback can re-issue new events, and we must receive them correctly. Since we loop in a lockless fashion, we want to be O(nready), and we don't want to flash on/off the spinlock for every event, we have the poll callback to use a secondary list to queue events while we're inside the event delivery loop. The rw_semaphore has been turned into a mutex. This patch also adds the wait-exclusive flag, as suggested by Davi Arnaut. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0a2b7af27f6d01a443f3af8252fa0b955bf1913 Author: Haavard Skinnemoen Date: Wed Mar 21 18:08:49 2007 +0100 [AVR32] Implement platform hooks for atmel_lcdfb driver This modifies and extends the existing lcdc platform code to support the new atmel_lcdfb driver. The ATSTK1000 board code is set up to use the on-board Samsung LTV350QV LCD panel. Signed-off-by: Haavard Skinnemoen commit c47953cfc6bad91c46272aad202ee33276671608 Author: Tony Luck Date: Fri May 11 15:18:45 2007 -0700 [IA64] s/scalibility/scalability/ Previous spelling patch from Simon Arlott broke one spot that didn't need fixing (reported by Simon within 35 minutes of the patch ... but not until after I'd applied to GIT and pushed :-( Signed-off-by: Tony Luck commit 311f594dec9b0c8693ec7df75b82c251b6b0e7c2 Author: Jay Lan Date: Tue Apr 3 17:53:42 2007 -0700 [IA64] kdump on INIT needs multi-nodes sync-up (v.2) The current implementation of kdump on INIT events would enter kdump processing on DIE_INIT_MONARCH_ENTER and DIE_INIT_SLAVE_ENTER events. Thus, the monarch cpu would go ahead and boot up the kdump On SN shub2 systems, this out-of-sync situation causes some slave cpus on different nodes to enter POD. This patch moves kdump entry points to DIE_INIT_MONARCH_LEAVE and DIE_INIT_SLAVE_LEAVE. It also sets kdump_in_progress variable in the DIE_INIT_MONARCH_PROCESS event to not dump all active stack traces to the console in the case of kdump. I have tested this patch on an SN machine and a HP RX2600. Signed-off-by: Jay Lan Acked-by: Zou Nan hai Signed-off-by: Tony Luck commit ae67e498a54259364f7211e10d9834575b340b21 Author: Tony Luck Date: Mon May 14 15:55:11 2007 -0700 [IA64] wire up {signal,timer,event}fd syscalls Signed-off-by: Tony Luck commit 99fbe1ac217e8b9d4141504e879327cb4e42d4ff Author: Dave Jones Date: Mon May 14 18:27:29 2007 -0400 [CPUFREQ] Correct revision mask for powernow-k8 Mark Langsdorf points out that the correct define for this revision bump is 0x80000. Also to save us having to keep renaming the #define, give it a more meaningful name. Signed-off-by: Dave Jones commit faa8b6c3c2e1454175609167a25ae525d075f045 Author: Linus Torvalds Date: Mon May 14 15:24:24 2007 -0700 Revert "ipmi: add new IPMI nmi watchdog handling" This reverts commit f64da958dfc83335de1d2bef9d3868f30feb4e53. Andi Kleen is unhappy with the changes, and they really do not seem worth it. IPMI could use DIE_NMI_IPI instead of the new callback, even though that ends up having its own set of problems too, mainly because the IPMI code cannot really know the NMI was from IPMI or not. Manually fix up conflicts in arch/x86_64/kernel/traps.c and drivers/char/ipmi/ipmi_watchdog.c. Cc: Andi Kleen Cc: Mathieu Desnoyers Cc: Corey Minyard Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 7c5b9ef8577bfa7b74ea58fc9ff2934ffce13532 Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IPoIB/cm: Optimize stale connection detection In the presence of some running RX connections, we repeat queue_delayed_work calls each 4 RX WRs, which is a waste. It's enough to start stale task when a first passive connection is added, and rerun it every IPOIB_CM_RX_DELAY as long as there are outstanding passive connections. This removes some code from RX data path. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit bd18c112774db5bb887adb981ffbe9bfe00b2f3a Author: Michael S. Tsirkin Date: Mon May 14 17:14:50 2007 +0300 IB/mthca: Set cleaned CQEs back to HW ownership when cleaning CQ mthca_cq_clean() updates the CQ consumer index without moving CQEs back to HW ownership. As a result, the same WRID might get reported twice, resulting in a use-after-free. This was observed in IPoIB CM. Fix by moving all freed CQEs to HW ownership. This fixes Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 3e28c56b9b67347b42ba06f9a9373b408902beee Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IB/mthca: Fix posting >255 recv WRs for Tavor Fix posting lists of > 255 receive WRs for Tavor: rq.next_ind must be updated each doorbell, otherwise the next doorbell will use an incorrect index. Found by Ronni Zimmermann at Mellanox. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 6c719f5c6c823901fac2d46b83db5a69ba7e9152 Author: Sean Hefty Date: Mon May 7 11:49:27 2007 -0700 RDMA/cma: Add check to validate that cm_id is bound to a device Several checks in the rdma_cm check against the state of the cm_id, but only to validate that the cm_id is bound to an underlying transport specific CM and an RDMA device. Make the check explicit in what we're trying to check for, since we're not synchronizing against the cm_id state. This will allow a user to disconnect a cm_id or reject a connection after receiving a device removal event. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit be65f086f2a50c478b2f5ecf4c55a52a4e95059a Author: Sean Hefty Date: Mon May 7 11:49:12 2007 -0700 RDMA/cma: Fix synchronization with device removal in cma_iw_handler The cma_iw_handler needs to validate the state of the rdma_cm_id before processing a new connection request to ensure that a device removal is not already being processed for the same rdma_cm_id. Without the state check, the user can receive simultaneous callbacks for the same cm_id, or a callback after they've destroyed the cm_id. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8aa08602bdd617a9cdd147f19076a8c8a70e03ef Author: Sean Hefty Date: Mon May 7 11:49:00 2007 -0700 RDMA/cma: Simplify device removal handling code Add a new routine and rename another to encapsulate common code for synchronizing with device removal. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e430dcb7b132a4076e533a9d69907acecbe71be Author: Joachim Fenkes Date: Wed May 9 13:48:31 2007 +0200 IB/ehca: Disable scaling code by default, bump version number - Scaling code is still considered experimental, so disable it by default - Increase version to SVNEHCA_0023 Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit bba9b6013e604fadb298191c058149acf1cdfced Author: Joachim Fenkes Date: Wed May 9 13:48:25 2007 +0200 IB/ehca: Beautify sysfs attribute code and fix compiler warnings eHCA's sysfs attributes are now being created via sysfs_create_group(), making the process neatly table-driven. The return value is checked, thus fixing a few compiler warnings. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c7a14939e78e75dd90b54cb0df371019bc6d3e89 Author: Joachim Fenkes Date: Wed May 9 13:48:20 2007 +0200 IB/ehca: Remove _irqsave, move #ifdef - In ehca_process_eq(), we're IRQ safe throughout the whole function, so we don't need another _irqsave in the middle of flight. - take_over_work() is only called by comp_pool_callback(), so it can move into the same #ifdef block. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c55a0ddd8ebdd657224449c2fbfcd427e054c8cc Author: Hoang-Nam Nguyen Date: Wed May 9 13:48:11 2007 +0200 IB/ehca: Fix AQP0/1 QP number AQP0/1 should report qp_num={0|1} and the actual QP# should be stored in struct ehca_qp, not the other way round. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 92761cdaf215599a1bd81d383facb32adabfa620 Author: Joachim Fenkes Date: Wed May 9 13:48:01 2007 +0200 IB/ehca: Correctly set GRH mask bit in ehca_modify_qp() The driver needs to always supply the "GRH present" flag to the hypervisor, whether it's true or false. Not supplying it (i.e. not setting the corresponding mask bit) amounts to a "perhaps", which we don't want. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 5d88278e3bdb6f2e4ed43306659e930ecd715f0c Author: Stefan Roscher Date: Wed May 9 13:47:56 2007 +0200 IB/ehca: Serialize hypervisor calls in ehca_register_mr() Some pSeries hypervisor versions show a race condition in the allocate MR hCall. Serialize this call per adapter to circumvent this problem. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 8f140b407f3be04e7202be9aa0cfef3006d14c9f Author: Arthur Jones Date: Thu May 10 12:10:49 2007 -0700 IB/ipath: Shadow the gpio_mask register Once upon a time, GPIO interrupts were rare. But then a chip bug in the waldo series forced the use of a GPIO interrupt to signal packet reception. This greatly increased the frequency of GPIO interrupts which have the gpio_mask bits set on the waldo chips. Other bits in the gpio_status register are used for I2C clock and data lines, these bits are usually on. An "unlikely" annotation leftover from the old days was improperly applied to these bits, and an unnecessary chip mmio read was being accessed in the interrupt fast path on waldo. Remove the stagnant unlikely annotation in the interrupt handler and keep a shadow copy of the gpio_mask register to avoid the slow mmio read when testing for interruptable GPIO bits. Signed-off-by: Arthur Jones Signed-off-by: Roland Dreier commit 26c6bc7b812b4157ba929035e467c0f4dd165916 Author: Jack Morgenstein Date: Sun May 13 17:18:23 2007 +0300 IB/mlx4: Fix uninitialized spinlock for 32-bit archs uar_lock spinlock was used in mlx4_ib_cq_arm without being initialized (this only affects 32-bit archs, because uar_lock is not used on 64-bit archs and MLX4_INIT_DOORBELL_LOCK() is a NOP). Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 3ec2ab5514dbd6b5c4c3437c6a3cd9e5a90e84ef Merge: 200cfbb... 90e07d9... Author: Linus Torvalds Date: Mon May 14 12:29:14 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response mmc: use assigned major for block device sdhci: handle dma boundary interrupts mmc: au1xmmc command types check from data flags commit 200cfbb36ce360f7943c62b6c09885c215bfc1f5 Merge: 29e0937... d831666... Author: Linus Torvalds Date: Mon May 14 12:28:11 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4] SNMP: Display new statistics at /proc/net/netstat [IPV6]: Reverse sense of promisc tests in ip6_mc_input [NET_SCHED]: prio qdisc boundary condition [IPSEC]: Don't warn if high-order hash resize fails [IPSEC]: Check validity of direction in xfrm_policy_byid commit 29e0937bb693879221f575b01f26314b3f443322 Merge: 140ff8b... be35cf0... Author: Linus Torvalds Date: Mon May 14 12:27:17 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Update defconfig. [VIDEO]: XVR-500 and XVR-2500 need FB=y. [SPARC32]: asm/system.h needs asm/smp.h [SPARC32]: Update defconfig. [SPARC32]: Fix sparc32 kdebug changes. [SPARC64]: Accept ebus_bus_type for generic DMA ops. [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling. [SCSI]: Add help text for SCSI_ESP_CORE. [SPARC] SBUS: display7seg.c needs asm/io.h [SPARC] SBUS: bbc_i2c.c needs asm/io.h [SPARC64]: Be more resiliant with PCI I/O space regs. [SERIAL] SUNHV: Add an ID string. commit 140ff8b0459cac5ade7a42131f561a9ee0fa3cc4 Author: Stephen Rothwell Date: Mon May 14 13:47:47 2007 +1000 Declare another couple of compat syscalls. compat_sys_signalfd and compat_sys_timerfd need declarations before PowerPC can wire them up. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit a34be83a9cfa15d596bfeb498b13380f0544249f Author: Dave Jones Date: Sun May 13 19:07:46 2007 -0400 MAINTAINERS update. I've not really 'maintained' this code for years, and others are doing a much more thorough job these days. Removing myself might stem some of the crazier emails I get. Signed-off-by: Dave Jones Acked-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit d10ff3fb62bd38415c0f7be3d75d107e1f67e59a Author: Thomas Gleixner Date: Mon May 14 11:10:02 2007 +0200 timekeeping fix patch got mis-applied The time keeping code move to kernel/time/timekeeping.c broke the clocksource resume logic patch, which got applied to the old file by a fuzzy application. Fix it up and move the clocksource_resume() call to the appropriate place. Signed-off-by: Thomas Gleixner [ tssk, tssk, everybody should use --fuzz=0 ] Signed-off-by: Linus Torvalds commit 90e07d9f54c61449dd48eff82e2354d0124d4f7e Author: Nicolas Pitre Date: Sun May 13 18:03:08 2007 +0200 pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response ... and make it depend on the response flag instead of the command type. Signed-off-by: Nicolas Pitre Signed-off-by: Pierre Ossman commit fe6b4c8840c5e23fe9b8696450cee8f2e8cebffd Author: Pierre Ossman Date: Mon May 14 17:27:29 2007 +0200 mmc: use assigned major for block device The MMC block devices now have an assigned major. Make sure we actually use it. Signed-off-by: Pierre Ossman commit 6ba736a10e4ae63b38ccfee9f22b3263a6e5d050 Author: Pierre Ossman Date: Sun May 13 22:39:23 2007 +0200 sdhci: handle dma boundary interrupts When the device hits certain memory boundaries, it signals an interrupt and expects to be serviced. We don't need the feature but we need to make sure the device doesn't stall. Signed-off-by: Pierre Ossman commit c0f3b6c777af071063984fdbc4efb6c904f665f4 Author: Yoichi Yuasa Date: Sun May 13 18:23:15 2007 +0200 mmc: au1xmmc command types check from data flags This patch has changed command types check from data flags. MMC_STOP_TRANSMISSION is never passed to au1xmmc_send_command(). SEND_STOP() is used for MMC_STOP_TRANSMISSION. Signed-off-by: Yoichi Yuasa Signed-off-by: Pierre Ossman commit be35cf01a9889e82da3bbda1d7b161f036424225 Author: David S. Miller Date: Mon May 14 04:19:01 2007 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit d0842f40a025521beb48063e02a8cc57ebd075e0 Author: David S. Miller Date: Mon May 14 04:18:38 2007 -0700 [VIDEO]: XVR-500 and XVR-2500 need FB=y. Otherwise the allmodconfig build breaks. Signed-off-by: David S. Miller commit 6e46507d0178ad4b33ed3bfcc72dc6e1e8a17790 Author: David S. Miller Date: Mon May 14 03:53:47 2007 -0700 [SPARC32]: asm/system.h needs asm/smp.h To get hard_smp_processor_id() even on UP builds. Signed-off-by: David S. Miller commit 2b6d868fa62b51500dd95a036229adc4a4a7bdae Author: David S. Miller Date: Mon May 14 03:53:12 2007 -0700 [SPARC32]: Update defconfig. Signed-off-by: David S. Miller commit 19fce2b96655d2b3b758e0f783314678d89b47c5 Author: Robert Reif Date: Mon May 14 03:22:08 2007 -0700 [SPARC32]: Fix sparc32 kdebug changes. Fix recent kdebug changes to compile on sparc32. Signed-off-by: Robert Reif Signed-off-by: David S. Miller commit d831666e98b4f1e19ebdd2349735f47bf37cd293 Author: Mitsuru Chinen Date: Mon May 14 03:07:30 2007 -0700 [IPV4] SNMP: Display new statistics at /proc/net/netstat This displays the statistics specified in the updated IP-MIB RFC (RFC4293) in /proc/net/netstat. The reason why these are not displayed in /proc/net/snmp is that some existing utilities are developed under the assumption which ipstat items in /proc/net/snmp is unchanged. Signed-off-by: Mitsuru Chinen Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit ae7bf20a6316272acfcaef5d265b18aaa54b41e4 Author: Corey Mutter Date: Mon May 14 03:00:27 2007 -0700 [IPV6]: Reverse sense of promisc tests in ip6_mc_input Reverse the sense of the promiscuous-mode tests in ip6_mc_input(). Signed-off-by: Corey Mutter Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 3e5c2d3bdbe2c047b9853c4248f881f5ac645c89 Author: Jamal Hadi Salim Date: Mon May 14 02:57:19 2007 -0700 [NET_SCHED]: prio qdisc boundary condition This fixes an out-of-boundary condition when the classified band equals q->bands. Caught by Alexey Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 9ac6d4a4b85004dbb907f1d3b34412afe16f3758 Author: David S. Miller Date: Mon May 14 02:56:03 2007 -0700 [SPARC64]: Accept ebus_bus_type for generic DMA ops. Based upon a bug report by Meelis Roos. Signed-off-by: David S. Miller commit 6253db055eb62a1bd0a18a1d8489565303b2b1dd Author: Herbert Xu Date: Mon May 14 02:19:11 2007 -0700 [IPSEC]: Don't warn if high-order hash resize fails Multi-page allocations are always likely to fail. Since such failures are expected and non-critical in xfrm_hash_alloc, we shouldn't warn about them. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b5505c6e1071b32176c7548a3aaf0be49f7c763e Author: Herbert Xu Date: Mon May 14 02:15:47 2007 -0700 [IPSEC]: Check validity of direction in xfrm_policy_byid The function xfrm_policy_byid takes a dir argument but finds the policy using the index instead. We only use the dir argument to update the policy count for that direction. Since the user can supply any value for dir, this can corrupt our policy count. I know this is the problem because a few days ago I was deleting policies by hand using indicies and accidentally typed in the wrong direction. It still deleted the policy and at the time I thought that was cool. In retrospect it isn't such a good idea :) I decided against letting it delete the policy anyway just in case we ever remove the connection between indicies and direction. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 17f34f0ec96783851abcabf9878f8237ac67e4e7 Author: David S. Miller Date: Mon May 14 02:01:52 2007 -0700 [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling. Signed-off-by: David S. Miller commit ec6fb1ad84551741c14a05918cc0e04dea928fc0 Author: David S. Miller Date: Sun May 13 23:52:14 2007 -0700 [SCSI]: Add help text for SCSI_ESP_CORE. Signed-off-by: David S. Miller commit 3049f89df13bb8f5ded8737631a6c2dd6209b5ca Author: David S. Miller Date: Sun May 13 22:22:47 2007 -0700 [SPARC] SBUS: display7seg.c needs asm/io.h Signed-off-by: David S. Miller commit 4b5dff76a70cb1d8b935b8b93fe0df0bbe66640d Author: David S. Miller Date: Sun May 13 22:22:13 2007 -0700 [SPARC] SBUS: bbc_i2c.c needs asm/io.h Signed-off-by: David S. Miller commit 49d23cfcec5d36a91e118d28148d353bf8f0bc03 Author: David S. Miller Date: Sun May 13 22:01:18 2007 -0700 [SPARC64]: Be more resiliant with PCI I/O space regs. If we miss on the ranges, just toss the translation up to the parent instead of failing. Signed-off-by: David S. Miller commit 7a05b591a3de20466a775f62369a42ea0fe1345d Author: David S. Miller Date: Sun May 13 21:27:37 2007 -0700 [SERIAL] SUNHV: Add an ID string. The 'compatible' property can be SUNW,sun4v-console as well as 'qcn'. Signed-off-by: David S. Miller commit 51a41e7d39ce0da1198837aaa495fe6dbcc4f802 Author: Paul Mundt Date: Mon May 14 10:15:18 2007 +0900 sh64: Add .gitignore entry for syscalltab. Signed-off-by: Paul Mundt commit 6c645ac72582bacb85b90a1cf88e81a13045aba4 Author: Paul Mundt Date: Mon May 14 09:55:35 2007 +0900 sh64: generic quicklist support. Signed-off-by: Paul Mundt commit e827f20f1d34e91fbbb0df4674ddd8c3aad517da Author: Paul Mundt Date: Mon May 14 09:14:29 2007 +0900 sh64: Update cayman defconfig. Signed-off-by: Paul Mundt commit 2f32834a32dfc289ea73839dbcb98d135742947b Author: Paul Mundt Date: Mon May 14 09:13:54 2007 +0900 sh64: Fixup sh-sci build. sh-sci needs asm/sci.h, borrow this from sh so we can build again. Signed-off-by: Paul Mundt commit c18fe9a0467afaec7de05ec76cd994ae7c866760 Author: Paul Mundt Date: Mon May 14 09:12:39 2007 +0900 sh64: ppoll/pselect6() and restartable syscalls. This patch was hanging around for some time while we were waiting for the compiler situation to improve.. now that all is well again, finally merge it. Signed-off-by: Paul Mundt commit 599c26d32950c33bdd2a5ac6939bfe15ecf057e0 Author: Paul Mundt Date: Mon May 14 09:10:46 2007 +0900 sh64: dma-mapping updates. Follow the noncoherent changes from sh. Signed-off-by: Paul Mundt commit a226d33abccff1959cec911da4143ea06ab22052 Author: Paul Mundt Date: Mon May 14 09:10:01 2007 +0900 sh64: Fixups for the irq_regs changes. A few interrupt handlers were never updated, fix them up. We were missing the irq_regs conversion also, so do that at the same time. Signed-off-by: Paul Mundt commit 6b5d1a0a2ff4fc5a26029f62eef033224ce0fa97 Author: Paul Mundt Date: Mon May 14 09:07:27 2007 +0900 sh64: Wire up many new syscalls. This has suffered a bit of bitrot, so we're a bit behind on the syscalls. There were a few that were wrapped incorrectly as well, caught by the syscall checker. Fix them all up. Signed-off-by: Paul Mundt commit 0a354775af0d3e84158ff87115bdb022b2a517ee Author: Simon Arlott Date: Mon May 14 08:25:48 2007 +0900 spelling fixes: arch/sh64/ Spelling fixes in arch/sh64/. Signed-off-by: Simon Arlott Signed-off-by: Paul Mundt commit 47e77eeecf0b7892bba8a697c228ab846fea7a0f Author: Milind Arun Choudhary Date: Mon May 14 08:24:59 2007 +0900 sh64: ROUND_UP macro cleanup in arch/sh64/kernel/pci_sh5.c ROUND_UP macro cleanup, use ALIGN where ever appropriate. Signed-off-by: Milind Arun Choudhary Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit bbdfff86a8f0c91ad8b6dedf74bc14de4ba39679 Author: Gabriel Mansi Date: Mon May 7 18:55:13 2007 -0300 [AGPGART] Fix wrong ID in via-agp.c there is a wrong id in drivers/char/agp/via-agp.c #define PCI_DEVICE_ID_VIA_CX700 0x8324 It must be 0x0324 Notice that PCI_DEVICE_ID_VIA_CX700 is also used in drivers/i2c/busses/i2c-viapro.c and drivers/ide/pci/via82cxxx.c So, I think that constant must be renamed to avoid conflicting. I attached a proposed patch. Signed-off-by: Dave Jones commit dc2585eb478cfeb45b3d6e235ac7b5918fb859f7 Author: Daniel Drake Date: Wed May 2 23:19:05 2007 +0100 [CPUFREQ] powernow-k7: fix MHz rounding issue with perflib When the PST tables are broken, powernow-k7 uses ACPI's processor_perflib to deduce the available frequency multipliers from the _PSS tables. Upon frequency change, processor_perflib performs some verification on the frequency (checks that it's within allowable bounds). powernow-k7 deals with absolute frequencies in KHz, whereas perflib only deals with MHz values. When performing the above verification, perflib multiplies the MHz values by 1000 to obtain the KHz value. We then end up with situations like the following: - powernow-k7 multiplies the multiplier by the FSB, and obtains a value such as 1266768 KHz - perflib belives the same state has frequency of 1266 MHz - acpi_processor_ppc_notifier calls cpufreq_verify_within_limits to verify that 1266768 is in the allowable range of 0 to 1266000 (i.e. 1266 * 1000) - it's not, so that frequency is rejected - the maximum CPU frequency is not reachable This patch solves the problem by rounding up the MHz values stored in perflib's tables. Additionally it corrects a broken URL. It also fixes http://bugzilla.kernel.org/show_bug.cgi?id=8255 although this case is a bit different: the frequencies in the _PSS tables are wildly wrong, but we get better results if we force ACPI to respect the fsb * multiplier calculations (even though it seems that the multiplier values aren't entirely correct either). Signed-off-by: Daniel Drake Signed-off-by: Dave Jones commit 705962ccc9d21a08b74b6b6e1d3cf10f98968a67 Author: Al Viro Date: Sun May 13 05:52:32 2007 -0400 fix deadlock in loop.c ... doh Jeremy Fitzhardinge noted that the recent loop.c cleanups worked, but cause lockdep to complain. Ouch. OK, the deadlock is real and yes, I'm an idiot. Speaking of which, we probably want to s/lock/pin/ in drivers/base/map.c to avoid such brainos again. And yes, this stuff needs clear documentation. Will try to put one together once I get some sleep... Signed-off-by: Al Viro Cc: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit 30046e5885848fe5c2c66177dca6b277323e31ab Author: Dave Jones Date: Sun May 13 11:55:14 2007 -0400 [CPUFREQ] Support rev H AMD64s in powernow-k8 Reported-by: Calvin Dodge Signed-off-by: Dave Jones commit 20eebcf09c2d329e4dcdd765634c0a524195e16d Author: Roland Dreier Date: Sun May 13 08:54:18 2007 -0700 mlx4_core: Remove unused doorbell_lock struct mlx4_priv.doorbell_lock is never used, so delete it. Signed-off-by: Roland Dreier commit f550d94cf9f86bc54e31dae2aee1a03d678c6e7f Author: Paul Mundt Date: Thu May 10 12:50:28 2007 +0900 net: Trivial MLX4_DEBUG dependency fix. CONFIG_MLX4_DEBUG works out to a def_bool y for those that have CONFIG_EMBEDDED set. Make it depend on MLX4_CORE. Signed-off-by: Paul Mundt Signed-off-by: Roland Dreier commit 78c129b949bdee21dd996ac5f5cfc655cd5bd42e Author: Haavard Skinnemoen Date: Sun May 13 16:33:33 2007 +0200 [AVR32] Wire up signalfd, timerfd and eventfd Signed-off-by: Haavard Skinnemoen commit 9caebec7b8093574fca5a334a1939530872d75e3 Author: Christoph Hellwig Date: Sat May 12 17:56:11 2007 +0200 [AVR32] optimize pagefault path Avoid the costly notifier list in the pagefault path and call the kprobes code directly. The same change went into the 2.6.22 cycle for powerpc, 2s390 and sparc64 already. Signed-off-by: Christoph Hellwig Signed-off-by: Haavard Skinnemoen commit 5d1938c83ca826891a02badef7c9ea8ed57e01a2 Author: Haavard Skinnemoen Date: Sun May 13 16:05:59 2007 +0200 [AVR32] Remove bogus comment in arch/avr32/kernel/irq.c The comment at the top of arch/avr32/kernel/irq.c doesn't really make sense anymore since most of the actual interrupt handling code is elsewhere. Signed-off-by: Haavard Skinnemoen commit 72fdbdce3d52282f8ea95f512e871791256754e6 Author: Simon Arlott Date: Fri May 11 14:55:43 2007 -0700 [IA64] spelling fixes: arch/ia64/ Spelling and apostrophe fixes in arch/ia64/. Signed-off-by: Simon Arlott Signed-off-by: Tony Luck