commit 4480f15b3306f43bbb0310d461142b4e897ca45b Author: Randy Dunlap Date: Sun Oct 12 16:11:58 2008 -0700 MAINTAINERS: remove colon from headings Remove ending ':' from some of the Topic lines for consistency. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit e7839f25df8e3129a1cbbfb9484452982098530f Author: Randy Dunlap Date: Sun Oct 12 16:11:45 2008 -0700 MAINTAINERS: add F: and acronyms Add F: definition since it is being used. Expand acronyms or add them so that users of MAINTAINERS file can find entries more easily. Correct driver spelling. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit e2d1d6c0a5d3fef8da21ed85aa825aa271c62602 Author: Randy Dunlap Date: Sun Oct 12 16:11:31 2008 -0700 MAINTAINERS: alpha sort Sorted case-insensitive (sort -f). Groups that begin with ARM, INTEL, etc. not sorted. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 3280fb313911a80b13de52d9fe37f39668f2138e Merge: f1b2a5a... f319fb8... Author: Linus Torvalds Date: Sun Oct 12 16:10:29 2008 -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 kconfig typo and extra whitespace ext4: fix build failure without procfs ext4: add an option to control error handling on file data jbd2: don't dirty original metadata buffer on abort ext4: add checks for errors from jbd2 jbd2: fix error handling for checkpoint io jbd2: abort when failed to log metadata buffers commit f319fb8bf6899e08bdb8d1e09a4e7a129dfa2312 Author: Jan Engelhardt Date: Sun Oct 12 15:53:01 2008 -0400 ext4: fix kconfig typo and extra whitespace Signed-off-by: Jan Engelhardt Signed-off-by: Theodore Ts'o commit 3244fcb1ae03362e4aa8cb1a9039fbfd61661859 Author: Alexander Beregalov Date: Sun Oct 12 17:27:49 2008 -0400 ext4: fix build failure without procfs fs/ext4/super.c: In function 'ext4_fill_super': fs/ext4/super.c:2226: error: 'ext4_ui_proc_fops' undeclared (first use in this function) fs/ext4/super.c:2226: error: (Each undeclared identifier is reported only once fs/ext4/super.c:2226: error: for each function it appears in.) Signed-off-by: Alexander Beregalov Signed-off-by: Theodore Ts'o commit f1b2a5ace996de339292d4035f9f5b294aecd11e Merge: 5e4c5f4... 14835a3... Author: Linus Torvalds Date: Sun Oct 12 12:42:29 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] cifs: remove pointless lock and unlock of GlobalMid_Lock in header_assemble commit 5e4c5f4c64902870552d4c15325d9e7d1a39884d Author: Linus Torvalds Date: Sun Oct 12 12:37:16 2008 -0700 Fix Kconfig dependency for WM97xx battery driver It needs the WM97xx touchscreen driver to be compiled in, not as a module. And it cannot itself be a module, due to some unfortunate interactions with platform data. Reported-by: Herbert Xu Acked-by: Mark Brown Signed-off-by: Linus Torvalds commit 807f4f8cdd5b65a8a5fcfda266c074f6a23818dd Merge: 1a2217a... 8daf14c... Author: Linus Torvalds Date: Sun Oct 12 12:04:59 2008 -0700 Merge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip This merges in: x86/build, x86/microcode, x86/spinlocks, x86/memory-corruption-check, x86/early-printk, x86/xsave, x86/quirks, x86/setup, x86/signal, core/signal, x86/urgent, x86/xen * 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (142 commits) x86: make processor type select depend on CONFIG_EMBEDDED x86: extend processor type select help text x86, amd-iommu: propagate PCI device enabling error warnings: fix arch/x86/kernel/io_apic_64.c warnings: fix arch/x86/kernel/early_printk.c x86, fpu: check __clear_user() return value x86: memory corruption check - cleanup x86: ioperm user_regset xen: do not reserve 2 pages of padding between hypervisor and fixmap. xen: use spin_lock_nest_lock when pinning a pagetable x86: xsave: set FP, SSE bits in the xsave header in the user sigcontext x86: xsave: fix error condition in save_i387_xstate() x86: SB450: deprioritize DMI quirks x86: SB450: skip IRQ0 override if it is not routed to INT2 of IOAPIC x86: replace a magic number with a named constant in the VESA boot code x86 setup: remove IMAGE_OFFSET x86 setup: remove DEF_INITSEG and DEF_SETUPSEG Revert "x86: fix ghost EDD devices in /sys again" x86 setup: fix ghost entries under /sys/firmware/edd take 3 x86: signal: remove indent in restore_sigcontext() ... commit 1a2217a9516b134e0a0e54cb4629e1e075d97b17 Merge: 46b5e34... 6eb3ebe... Author: Linus Torvalds Date: Sun Oct 12 12:00:23 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: Fix build failures in board code avr32: Allow selecting multiple pins at once avr32: Minor pm_power_off cleanup avr32: Implement {read,write}[bwl]_be avr32: Replace static clock list with dynamic linked list avr32: Use platform_driver_probe for pdc platform driver avr32: Use platform_driver_probe for pio platform driver avr32: Provide a way to deselect pins in the portmux ngw100: export J15 through sysfs avr32: Allow fine-grained control over LCDC pins avr32: added mem kernel command line option support Add kernel support for oprofile callgraphs on AVR32 avr32: use the new byteorder headers commit 46b5e34029fef7a042f3ff16e319e737257e5c7b Merge: 94a9f8a... 6ee6c6a... Author: Linus Torvalds Date: Sun Oct 12 11:51:57 2008 -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: (24 commits) MMC: Use timeout values from CSR MMC: CSD and CID timeout values sdhci: 'scratch' may be used uninitialized mmc: explicitly mention SDIO support in Kconfig mmc: remove redundant "depends on" Fix comment in include/linux/mmc/host.h sdio: high-speed support mmc_block: hard code 512 byte block size sdhci: force high speed capability on some controllers mmc_block: filter out PC requests mmc_block: indicate strict ordering mmc_block: inform block layer about sector count restriction sdio: give sdio irq thread a host specific name sdio: make sleep on error interruptable sdhci: reduce card detection delay sdhci: let the controller wait for busy state to end atmel-mci: Add missing flush_dcache_page() in PIO transfer code atmel-mci: Don't overwrite error bits when NOTBUSY is set atmel-mci: Add experimental DMA support atmel-mci: support multiple mmc slots ... commit 94a9f8ad337aec011da2ca901ef89ae7e885f24c Merge: cbf7e94... 6d0f0df... Author: Linus Torvalds Date: Sun Oct 12 11:51:32 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] orion5x_wdt.c: add spinlocking [WATCHDOG] Orion: add hardware watchdog support [WATCHDOG] omap_wdt.c: cleanup a bit omap_wdt.c [WATCHDOG] omap_wdt.c: another ioremap() fix [WATCHDOG] omap_wdt.c: sync linux-omap changes [WATCHDOG] Add AT91SAM9X watchdog [WATCHDOG] Add driver for winbond w83697ug/uf watchdog feature [WATCHDOG] add watchdog driver IT8716 IT8726 IT8712J/K commit cbf7e9490ea3d1680362b4be3a7809042d493617 Merge: 06270d5... cb58ffc... Author: Linus Torvalds Date: Sun Oct 12 11:50:37 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix early panic on amd64 due to typo in supported CPU section x86, early_ioremap: fix fencepost error x86: avoid dereferencing beyond stack + THREAD_SIZE commit 06270d5d6aefb46b88bf44a7c5b1b9b3ef352c48 Author: Adrian Bunk Date: Sun Oct 12 07:15:19 2008 +0300 provide generic_block_fiemap() only with BLOCK=y This fixes the following compile error with CONFIG_BLOCK=n caused by commit 68c9d702bb72f367f3b148963ec6cf5e07ff7f65 ("generic block based fiemap implementation"): CC fs/ioctl.o fs/ioctl.c: In function 'generic_block_fiemap': fs/ioctl.c:249: error: storage size of 'tmp' isn't known fs/ioctl.c:272: error: invalid application of 'sizeof' to incomplete type 'struct buffer_head' fs/ioctl.c:280: error: implicit declaration of function 'buffer_mapped' fs/ioctl.c:249: warning: unused variable 'tmp' make[2]: *** [fs/ioctl.o] Error 1 Signed-off-by: Adrian Bunk Acked-by: Josef Bacik Signed-off-by: Linus Torvalds commit 0dab9cfa17179d1f5b067a32a3bca06cd31a3149 Author: Adrian Bunk Date: Sun Oct 12 07:10:50 2008 +0300 add key_revoke() dummy for KEYS=n This fixes the following build error with CONFIG_KEYS=n, caused by commit dfd15c46a6c2cafb006183c0c14f07e59eee4ac0 ("cifs: explicitly revoke SPNEGO key after session setup"): CC [M] fs/cifs/sess.o fs/cifs/sess.c: In function 'CIFS_SessSetup': fs/cifs/sess.c:628: error: implicit declaration of function 'key_revoke' make[3]: *** [fs/cifs/sess.o] Error 1 Signed-off-by: Adrian Bunk Acked-by: Jeff Layton Signed-off-by: Linus Torvalds commit 07104839597803ccd9b2c4f543ee4651522b4aa1 Merge: 589acce... 56c5d90... Author: Linus Torvalds Date: Sun Oct 12 11:40:55 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (180 commits) leo: disable cursor when leaving graphics mode cg6: disable cursor when leaving graphics mode sparc32: sun4m interrupt mask cleanup drivers/rtc/Kconfig: don't build rtc-cmos.o on sparc32 sparc: arch/sparc/kernel/pmc.c -- extra #include? sparc32: Add more extensive documentation of sun4m interrupts. sparc32: Kill irq_rcvreg from sun4m_irq.c sparc32: Delete master_l10_limit. sparc32: Use PROM device probing for sun4c timers. sparc32: Use PROM device probing for sun4c interrupt register. sparc32: Delete claim_ticker14(). sparc32: Stop calling claim_ticker14() from sun4c_irq.c sparc32: Kill clear_profile_irq btfixup entry. sparc32: Call sun4m_clear_profile_irq() directly from sun4m_smp.c sparc32: Remove #if 0'd code from sun4c_irq.c sparc32: Remove some SMP ifdefs in sun4d_irq.c sparc32: Use PROM infrastructure for probing and mapping sun4d timers. sparc32: Use PROM device probing for sun4m irq registers. sparc32: Use PROM device probing for sun4m timer registers. sparc: Fix user_regset 'n' field values. ... commit 589acce53e235055806e81e330af1e8f115bfcc2 Merge: 1efd325... f3073ac... Author: Linus Torvalds Date: Sun Oct 12 11:40:34 2008 -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: smc911x: Fix external PHY detection e1000: allow VLAN devices to use TSO and CSUM offload gre: Initialise rtnl_link tunnel parameters properly ipvs: Add proper dependencies on IP_VS, and fix description header line. commit 1efd325fbadc02c1338e0ef676f0a6669b251c7a Author: Linus Torvalds Date: Sun Oct 12 11:30:08 2008 -0700 Fix RTC wakealarm sysfs interface breakage. Commit ed458df4d2470adc02762a87a9ad665d0b1a2bd4 ("PnP: move pnpacpi/pnpbios_init to after PCI init") moved the PnP RTC discovery later, and now the ACPI RTC glue code doesn't find it any more, breaking the RTC wakealarm sysfs interfaces, as reported by Rafael. This really is fairly messy, and we have several annoying ordering constraints here - the PnP code that sets up the RTC resources wants to run after the PCI resources have to be registered, which in turn needs to run after ACPI has at least enumerated the root PCI buses etc. Our initcall ordering is not fine-grained enough to make this all painless. So this moves the ACPI RTC glue ("acpi_rtc_init()") down to a regular module call, which fixes the problem Rafael has. The reason this isn't wonderful is that we really should do acpi_rtc_init before we do the rtc_cmos init, and now those two are in the same module_init() section. Which happens to work, but only because drivers/rtc is linked after drivers/acpi. In other words, we still have a very subtle ordering issue here. Grr. Reported-and-tested-by: Rafael J. Wysocki Acked-by: David Brownell Signed-off-by: Linus Torvalds commit 6eb3ebe04da4c8f31d776217b0b76ca3d00f20b1 Author: Haavard Skinnemoen Date: Sun Oct 12 16:02:46 2008 +0200 avr32: Fix build failures in board code Fix a few instances of board code breakage introduced by the atmel-mci platform interface changes. Signed-off-by: Haavard Skinnemoen commit caf18f19eefc0cf5539b4e82b8aa8df6a78391a6 Author: Julien May Date: Wed Sep 24 10:30:47 2008 +0200 avr32: Allow selecting multiple pins at once at32_select_periph() now takes an u32 bitmask rather than a single pin. This allows to set multiple pins at once. Signed-off-by: Alex Raimondi Signed-off-by: Haavard Skinnemoen commit 8daf14cf56816303d64d1a705fcbc389211ba36e Merge: 1db5fff... eceb138... 28f7e66... fd1452e... 7aa413d... 46eaa67... 45e96f2... 9f48280... 325af5f... acbaa41... 2407390... Author: Ingo Molnar Date: Sun Oct 12 15:50:02 2008 +0200 Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2 commit 0d62950125241a6e6db8e8f14271f098ec7a2da4 Merge: b3bc2c5... 5e7184a... Author: Haavard Skinnemoen Date: Sun Oct 12 15:44:33 2008 +0200 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28 commit 1db5fff9aeab18566eb380e354629fdbbe7792f0 Author: Ingo Molnar Date: Sun Oct 12 15:40:45 2008 +0200 x86: make processor type select depend on CONFIG_EMBEDDED deselecting one of the CPU type CONFIG_CPU_SUP_* config options can render a kernel unbootable. Make sure this option is only available if CONFIG_EMBEDDED is enabled. Signed-off-by: Ingo Molnar commit b7b3a42533e1e41297fe517533375f9f8f7b92d0 Author: Ingo Molnar Date: Sun Oct 12 15:36:24 2008 +0200 x86: extend processor type select help text extend the help text of the CONFIG_CPU_SUP_* config options to express what it does and what effects it has. Signed-off-by: Ingo Molnar commit 14835a3325c1f84c3ae6eaf81102a3917e84809e Author: Jeff Layton Date: Sun Oct 12 13:34:11 2008 +0000 [CIFS] cifs: remove pointless lock and unlock of GlobalMid_Lock in header_assemble We lock GlobalMid_Lock in header_assemble and then immediately unlock it again without doing anything. Not sure what this was intended to do, but remove it. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 8a66712ba0969aea5580b9e312badfc2490fc614 Author: Ingo Molnar Date: Sun Oct 12 15:24:53 2008 +0200 x86, amd-iommu: propagate PCI device enabling error propagate an error in enabling the PCI device. Also eliminates this warning: arch/x86/kernel/amd_iommu_init.c: In function ‘init_iommu_one’: arch/x86/kernel/amd_iommu_init.c:726: warning: ignoring return value of ‘pci_enable_device’, declared with attribute warn_unused_result Signed-off-by: Ingo Molnar commit d562353a4533c4671af683499191707c9a77c406 Author: Ingo Molnar Date: Sun Oct 12 15:22:22 2008 +0200 warnings: fix arch/x86/kernel/io_apic_64.c fix: arch/x86/kernel/io_apic_64.c: In function ‘print_local_APIC’: arch/x86/kernel/io_apic_64.c:1284: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘long unsigned int’ arch/x86/kernel/io_apic_64.c:1285: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘long unsigned int’ We want to print the two halves of 'icr' at 32 bit width. Signed-off-by: Ingo Molnar commit 45e96f26f257bd873017c6244a6cafd27f6f5439 Author: Ingo Molnar Date: Wed Aug 27 10:37:14 2008 +0200 warnings: fix arch/x86/kernel/early_printk.c fix warning: arch/x86/kernel/early_printk.c:993: warning: ‘enable_debug_console’ defined but not used Eliminate dead code. Signed-off-by: Ingo Molnar commit 9f482807a6bd7e2aa1ed0d8cfc48463ec4ca3568 Author: Ingo Molnar Date: Mon Aug 18 12:59:32 2008 +0200 x86, fpu: check __clear_user() return value fix warning: arch/x86/kernel/xsave.c: In function ‘save_i387_xstate’: arch/x86/kernel/xsave.c:98: warning: ignoring return value of ‘__clear_user’, declared with attribute warn_unused_result check the return value and act on it. We should not be ignoring faults at this point. Signed-off-by: Ingo Molnar commit 620f2efcdc5c7a2db68da41bc3df3cf9a718024e Merge: 04944b7... fd04808... Author: Ingo Molnar Date: Sun Oct 12 15:17:14 2008 +0200 Merge branch 'linus' into x86/xsave commit 46eaa6702016e3ac9a188172a2c309d6ca1be1cd Author: Ingo Molnar Date: Sun Oct 12 15:06:29 2008 +0200 x86: memory corruption check - cleanup Move the prototypes from the generic kernel.h header to the more appropriate include/asm-x86/bios_ebda.h header file. Also, remove the check from the power management code - this is a pure x86 matter for now. Signed-off-by: Ingo Molnar commit a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 Merge: a8b71a2... fd04808... Author: Ingo Molnar Date: Sun Oct 12 15:05:39 2008 +0200 Merge branch 'linus' into x86/memory-corruption-check commit eceb1383361c6327cef4de01d278cd6722ebceeb Merge: 365d46d... 84e9c95... 4c7145a... Author: Ingo Molnar Date: Sun Oct 12 13:20:25 2008 +0200 Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen Conflicts: include/asm-x86/spinlock.h commit 84e9c95ad92f7afcd960342b6012b0a1b039e21b Merge: 206855c... 1389ac4... Author: Ingo Molnar Date: Sun Oct 12 13:17:07 2008 +0200 Merge branch 'x86/signal' into core/signal commit 1389ac4b976abdc0555280dfc1aa2c3abcc19641 Merge: 69e13ad... fd04808... Author: Ingo Molnar Date: Sun Oct 12 12:49:27 2008 +0200 Merge branch 'linus' into x86/signal Conflicts: arch/x86/kernel/signal_64.c commit acbaa41a780490c791492c41144c774c04875af1 Merge: 8d89adf... fd04808... Author: Ingo Molnar Date: Sun Oct 12 12:43:21 2008 +0200 Merge branch 'linus' into x86/quirks Conflicts: arch/x86/kernel/early-quirks.c commit 4c7145a1ec1bb789d5f07e47510e8bda546a7c4a Merge: 74e9160... fd04808... Author: Ingo Molnar Date: Sun Oct 12 12:39:30 2008 +0200 Merge branch 'linus' into x86/spinlocks Done to prevent this failure of an Octopus merge: Added arch/arm/include/asm/byteorder.h in both, but differently. ERROR: Merge conflict in arch/arm/include/asm/byteorder.h Auto-merging include/asm-x86/spinlock.h ERROR: Merge conflict in include/asm-x86/spinlock.h fatal: merge program failed commit 365d46dc9be9b3c833990a06f3994b1987eda578 Merge: 5dc64a3... fd04808... Author: Ingo Molnar Date: Sun Oct 12 12:35:23 2008 +0200 Merge branch 'linus' into x86/xen Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/process_64.c arch/x86/xen/enlighten.c commit 325af5fb1418c79953db0954556de048e061d8b6 Author: Roland McGrath Date: Fri Aug 8 15:58:39 2008 -0700 x86: ioperm user_regset This adds a user_regset type for the x86 io permissions bitmap. This makes it appear in core dumps (when ioperm has been used). It will also make it visible to debuggers in the future. Signed-off-by: Roland McGrath Signed-off-by: H. Peter Anvin [conflict resolutions: Signed-off-by: Ingo Molnar ] commit 206855c321adee56db3946ca09a5887cddb9d598 Merge: e8d3f45... cb58ffc... Author: Ingo Molnar Date: Sun Oct 12 11:32:17 2008 +0200 Merge branch 'x86/urgent' into core/signal Conflicts: arch/x86/kernel/signal_64.c commit cb58ffc3889f0545628f138f849e759a331b8ddc Author: Petr Vandrovec Date: Sun Oct 12 10:51:03 2008 +0200 x86: fix early panic on amd64 due to typo in supported CPU section Do not crash when enumerating supported CPU architectures SECURITY_INIT somehow ended up in x86_cpu_dev.init section. That caused printk in code which prints supported architectures to hit #GP due to non-canonical address being used. Signed-off-by: Petr Vandrovec Cc: thomas.petazzoni@free-electrons.com Signed-off-by: Ingo Molnar commit c613ec1a7ff3714da11c7c48a13bab03beb5c376 Author: Alan Cox Date: Fri Oct 10 10:46:45 2008 +0100 x86, early_ioremap: fix fencepost error The x86 implementation of early_ioremap has an off by one error. If we get an object which ends on the first byte of a page we undermap by one page and this causes a crash on boot with the ASUS P5QL whose DMI table happens to fit this alignment. The size computation is currently last_addr = phys_addr + size - 1; npages = (PAGE_ALIGN(last_addr) - phys_addr) (Consider a request for 1 byte at alignment 0...) Closes #11693 Debugging work by Ian Campbell/Felix Geyer Signed-off-by: Alan Cox Cc: Signed-off-by: Ingo Molnar commit e1e23bb0513520035ec934fa3483507cb6648b7c Author: David Rientjes Date: Tue Oct 7 14:15:11 2008 -0700 x86: avoid dereferencing beyond stack + THREAD_SIZE It's possible for get_wchan() to dereference past task->stack + THREAD_SIZE while iterating through instruction pointers if fp equals the upper boundary, causing a kernel panic. Signed-off-by: David Rientjes Signed-off-by: Ingo Molnar commit 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e Merge: 162350e... 5e7184a... Author: Pierre Ossman Date: Sun Oct 12 11:08:46 2008 +0200 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28 Conflicts: drivers/mmc/host/atmel-mci.c commit 162350eb75fcb81ec0ea34f042f1deddb759aea8 Author: Matthew Fleming Date: Thu Oct 2 12:21:42 2008 +0100 MMC: Use timeout values from CSR Hard-coded timeout values of 250ms for writes and 100ms for reads are currently used for MMC transactions over SPI. The spec states that the timeout values from the card should be used. Signed-off-by: Matthew Fleming Signed-off-by: Pierre Ossman commit 0d3e0460f307e84904968aad6cff97bd688583d8 Author: Matthew Fleming Date: Thu Oct 2 12:24:05 2008 +0100 MMC: CSD and CID timeout values The MMC spec states that the timeout for accessing the CSD and CID registers is 64 clock cycles. Signed-off-by: Matthew Fleming Signed-off-by: Pierre Ossman commit 7244b85bd17313d7d300ee93ec7bfbca1f4ccf3d Author: Steven Noonan Date: Wed Oct 1 01:50:25 2008 -0700 sdhci: 'scratch' may be used uninitialized The variable 'scratch' is always initialized before it's used. The conditional which is responsible for initialization of 'scratch' will always evaluate 'true' when the first loop iteration occurs, and thus, it's properly initialized. GCC doesn't see this, of course, so using the uninitialized_var() macro seems to work for silencing this case. Signed-off-by: Steven Noonan Signed-off-by: Pierre Ossman commit 57105737f6a0b39305a85ac176cc9fd4a236d8c2 Author: Pierre Ossman Date: Sun Sep 7 13:16:58 2008 +0200 mmc: explicitly mention SDIO support in Kconfig Signed-off-by: Pierre Ossman commit 1ea4f444f3a9721babd5d22cbd15092f9da6b51a Author: Pierre Ossman Date: Sun Sep 7 13:07:57 2008 +0200 mmc: remove redundant "depends on" Signed-off-by: Pierre Ossman commit ee63a7d2287c677ed022bf3f584f5a187b6c402f Author: Thomas Petazzoni Date: Tue Sep 2 10:14:13 2008 +0200 Fix comment in include/linux/mmc/host.h In include/linux/mmc/host.h, it is mentionned that the callback to know if a card is present or not is get_ro(). But it's get_cd(). Signed-off-by: Thomas Petazzoni Signed-off-by: Pierre Ossman commit d16f57700475f670ca2828c150a34fa7102a05fc Author: Pierre Ossman Date: Sun Aug 31 17:22:46 2008 +0200 sdio: high-speed support Signed-off-by: Pierre Ossman commit 08846698703dedae6c6915eb4b4d0a36188c5635 Author: Pierre Ossman Date: Sun Aug 31 14:10:08 2008 +0200 mmc_block: hard code 512 byte block size We use 512 byte blocks on all cards, and newer cards support nothing else, so hard code it and make the code less complex. Signed-off-by: Pierre Ossman commit a4b76193774b463b922cab2f92450efb20d29ef0 Author: Pierre Ossman Date: Sat Aug 16 20:43:04 2008 +0200 sdhci: force high speed capability on some controllers Some high speed capable controllers forget to set the high speed capability bit. Make sure we enable the functionality anyway. Signed-off-by: Pierre Ossman commit d6d8de33415ca7598fe66d933b6556fa8f89afe2 Author: Pierre Ossman Date: Sat Aug 16 20:43:48 2008 +0200 mmc_block: filter out PC requests We do not support PC (SCSI) commands, so don't pretend we do by letting them through. Signed-off-by: Pierre Ossman commit 91028954119e464ae42350658d46c204d781b484 Author: Pierre Ossman Date: Sat Aug 16 21:15:50 2008 +0200 mmc_block: indicate strict ordering The MMC block driver services requests one at a time and in strict order. Indicate this to the block layer so that it can handle barriers in an efficient manner. Signed-off-by: Pierre Ossman commit f3eb0aaa0211fd804057070bee1fd067cd65cb13 Author: Pierre Ossman Date: Sat Aug 16 21:34:02 2008 +0200 mmc_block: inform block layer about sector count restriction Make sure we consider the maximum block count when we tell the block layer about the maximum sector count. That way we don't have to chop up the request ourselves. Signed-off-by: Pierre Ossman commit 6501ff604a5ae18697c9b4cd40a7738d3a68e7fe Author: Pierre Ossman Date: Sun Aug 31 13:42:00 2008 +0200 sdio: give sdio irq thread a host specific name There is one thread per host controller so make sure they all get unique names. Signed-off-by: Pierre Ossman commit e633b7bcec8e26991d489a11615acf7674efbaf4 Author: Pierre Ossman Date: Sun Aug 31 13:38:54 2008 +0200 sdio: make sleep on error interruptable Make sure we can be woken from the forced sleep that is done on errors. Removing a card often results in -ENOMEDIUM or -EILSEQ so we previously locked up the removal process for a second. We could completely exit on -ENOMEDIUM, but it might be a transient glitch so treat it like any other error. Signed-off-by: Pierre Ossman commit 04cf585d2902404ed06861c6dc27897100340dba Author: Pierre Ossman Date: Mon Aug 18 22:18:14 2008 +0200 sdhci: reduce card detection delay The card detection delay was added early when the behaviour of the card interrupt was still very much unknown (i.e. before there was a public specification). As it is now known that it is a debounced signal, reduce the delay to something more sensible. Signed-off-by: Pierre Ossman commit e809517f6fa5803a5a1cd56026f0e2190fc13d5c Author: Pierre Ossman Date: Fri Jul 25 01:09:08 2008 +0200 sdhci: let the controller wait for busy state to end The sdhci controllers can interrupt us when the busy state from the card has ended, saving CPU cycles and power. Signed-off-by: Pierre Ossman commit f3073ac76755abd63b1d4c3d145f4c15b65b5355 Author: Guennadi Liakhovetski Date: Sat Oct 11 15:07:16 2008 -0700 smc911x: Fix external PHY detection If an external PHY is found the driver falls through to the default case in the switch and overwrites the PHY ID. Add the missing break. Signed-off-by: Guennadi Liakhovetski Signed-off-by: David S. Miller commit fd048088306656824958e7783ffcee27e241b361 Merge: 5c3c4d9... 03010a3... Author: Linus Torvalds Date: Sat Oct 11 13:23:48 2008 -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: (43 commits) ext4: Rename ext4dev to ext4 ext4: Avoid double dirtying of super block in ext4_put_super() Update ext4 MAINTAINERS file Hook ext4 to the vfs fiemap interface. generic block based fiemap implementation ocfs2: fiemap support vfs: vfs-level fiemap interface ext4: fix xattr deadlock jbd2: Fix buffer head leak when writing the commit block ext4: Add debugging markers that can be used by systemtap jbd2: abort instead of waiting for nonexistent transaction ext4: fix initialization of UNINIT bitmap blocks ext4: Remove old legacy block allocator ext4: Use readahead when reading an inode from the inode table ext4: Improve the documentation for ext4's /proc tunables ext4: Combine proc file handling into a single set of functions ext4: move /proc setup and teardown out of mballoc.c ext4: Don't use 'struct dentry' for internal lookups ext4/jbd2: Avoid WARN() messages when failing to write to the superblock ext4: use percpu data structures for lg_prealloc_list ... commit 5c3c4d9b5810c9aabd8c05219c62ca088aa83eb0 Merge: ead9d23... 92f1f8f... Author: Linus Torvalds Date: Sat Oct 11 13:22:33 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (71 commits) ide: Remove ide_spin_wait_hwgroup() and use special requests instead ide: move IDE{FLOPPY,TAPE}_WAIT_CMD defines to ide: add ide_do_test_unit_ready() helper ide: add ide_do_start_stop() helper ide: add ide_set_media_lock() helper ide-floppy: move floppy ioctls handling to ide-floppy_ioctl.c ide-floppy: ->{srfp,wp} -> IDE_AFLAG_{SRFP,WP} ide: add ide_queue_pc_tail() helper ide: add ide_queue_pc_head() helper ide: add ide_init_pc() helper ide-tape: add ide_tape_set_media_lock() helper ide-floppy: add ide_floppy_set_media_lock() helper ide: add ide_io_buffers() helper ide-scsi: cleanup ide_scsi_io_buffers() ide-floppy: remove MODE_SENSE_* defines ide-{floppy,tape}: remove packet command stack ide-{floppy,tape}: remove request stack ide-generic: handle probing of legacy io-ports v5 ide-floppy: use scatterlists for pio transfers ide-tape: remove idetape_init_rq() ... commit 56c5d900dbb8e042bfad035d18433476931d8f93 Merge: 4dd95b6... ead9d23... Author: David S. Miller Date: Sat Oct 11 12:39:35 2008 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: sound/core/memalloc.c commit 20501a69818827884b4381cdcedefdb5e7892915 Author: Patrick McHardy Date: Sat Oct 11 12:25:59 2008 -0700 e1000: allow VLAN devices to use TSO and CSUM offload This patch changes e1000 to set vlan_features so TSO and CSUM offload can be used by VLAN devices, similar as with the other Intel drivers. Signed-off-by: Patrick McHardy Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7bb82d924536cfa62db73dd381b07d9e9b084ffa Author: Herbert Xu Date: Sat Oct 11 12:20:15 2008 -0700 gre: Initialise rtnl_link tunnel parameters properly Brown paper bag error of calling memset with sizeof(p) instead of sizeof(*p). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f901b64472fdabc72eca2b9426fa4e96972b64c4 Author: David S. Miller Date: Sat Oct 11 12:18:04 2008 -0700 ipvs: Add proper dependencies on IP_VS, and fix description header line. Linus noted a build failure case: net/netfilter/ipvs/ip_vs_xmit.c: In function 'ip_vs_tunnel_xmit': net/netfilter/ipvs/ip_vs_xmit.c:616: error: implicit declaration of function 'ip_select_ident' The proper include file (net/ip.h) is being included in ip_vs_xmit.c to get that declaration. So the only possible case where this can happen is if CONFIG_INET is not enabled. This seems to be purely a missing dependency in the ipvs/Kconfig file IP_VS entry. Also, while we're here, remove the out of date "EXPERIMENTAL" string in the IP_VS config help header line. IP_VS no longer depends upon CONFIG_EXPERIMENTAL Signed-off-by: David S. Miller commit ead9d23d803ea3a73766c3cb27bf7563ac8d7266 Merge: bf6f51e... 0afe2db... Author: Linus Torvalds Date: Sat Oct 11 11:47:30 2008 -0700 Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-v28-for-linus-phase4-D' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (186 commits) x86, debug: print more information about unknown CPUs x86 setup: handle more than 8 CPU flag words x86: cpuid, fix typo x86: move transmeta cap read to early_init_transmeta() x86: identify_cpu_without_cpuid v2 x86: extended "flags" to show virtualization HW feature in /proc/cpuinfo x86: move VMX MSRs to msr-index.h x86: centaur_64.c remove duplicated setting of CONSTANT_TSC x86: intel.c put workaround for old cpus together x86: let intel 64-bit use intel.c x86: make intel_64.c the same as intel.c x86: make intel.c have 64-bit support code x86: little clean up of intel.c/intel_64.c x86: make 64 bit to use amd.c x86: make amd_64 have 32 bit code x86: make amd.c have 64bit support code x86: merge header in amd_64.c x86: add srat_detect_node for amd64 x86: remove duplicated force_mwait x86: cpu make amd.c more like amd_64.c v2 ... commit 0afe2db21394820d32646a695eccf3fbfe6ab5c7 Merge: d847059... 43603c8... Author: Ingo Molnar Date: Sat Oct 11 20:23:20 2008 +0200 Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/signal_64.c include/asm-x86/cpufeature.h commit d84705969f898f294bc3fc32eca33580f14105bd Merge: 725c258... 11494547... Author: Ingo Molnar Date: Fri Oct 10 19:50:00 2008 +0200 Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B Conflicts: arch/x86/kernel/apic_32.c arch/x86/kernel/apic_64.c arch/x86/kernel/setup.c drivers/pci/intel-iommu.c include/asm-x86/cpufeature.h include/asm-x86/dma-mapping.h commit bf6f51e3a46f6a602853d3cbacd05864bc6e2a37 Merge: ec8deff... 725c258... Author: Linus Torvalds Date: Sat Oct 11 11:03:09 2008 -0700 Merge phase #3 (IOMMU) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-v28-for-linus-phase3-B' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits) AMD IOMMU: use iommu_device_max_index, fix AMD IOMMU: use iommu_device_max_index x86: add PCI IDs for AMD Barcelona PCI devices x86/iommu: use __GFP_ZERO instead of memset for GART x86/iommu: convert GART need_flush to bool x86/iommu: make GART driver checkpatch clean x86 gart: remove unnecessary initialization x86: restore old GART alloc_coherent behavior revert "x86: make GART to respect device's dma_mask about virtual mappings" x86: export pci-nommu's alloc_coherent iommu: remove fullflush and nofullflush in IOMMU generic option x86: remove set_bit_string() iommu: export iommu_area_reserve helper function AMD IOMMU: use coherent_dma_mask in alloc_coherent add AMD IOMMU tree to MAINTAINERS file AMD IOMMU: use cmd_buf_size when freeing the command buffer AMD IOMMU: calculate IVHD size with a function AMD IOMMU: remove unnecessary cast to u64 in the init code AMD IOMMU: free domain bitmap with its allocation order AMD IOMMU: simplify dma_mask_to_pages ... commit ec8deffa33757286ba59e71d3d98173c37638b37 Merge: 7cc4e87... 3dd392a... Author: Linus Torvalds Date: Sat Oct 11 10:59:00 2008 -0700 Merge phase #2 (PAT updates) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-v28-for-linus-phase2-B' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits) x86, cpa: make the kernel physical mapping initialization a two pass sequence, fix x86, pat: cleanups x86: fix pagetable init 64-bit breakage x86: track memtype for RAM in page struct x86, cpa: srlz cpa(), global flush tlb after splitting big page and before doing cpa x86, cpa: remove cpa pool code x86, cpa: no need to check alias for __set_pages_p/__set_pages_np x86, cpa: dont use large pages for kernel identity mapping with DEBUG_PAGEALLOC x86, cpa: make the kernel physical mapping initialization a two pass sequence x86, cpa: remove USER permission from the very early identity mapping attribute x86, cpa: rename PTE attribute macros for kernel direct mapping in early boot x86: make sure the CPA test code's use of _PAGE_UNUSED1 is obvious linux-next: fix x86 tree build failure x86: have set_memory_array_{uc,wb} coalesce memtypes, fix agp: enable optimized agp_alloc_pages methods x86: have set_memory_array_{uc,wb} coalesce memtypes. x86: {reverve,free}_memtype() take a physical address x86: fix pageattr-test agp: add agp_generic_destroy_pages() agp: generic_alloc_pages() ... commit 7cc4e87f912bbefa440a51856b8d076e5d1f554a Merge: 5ba2f67... 69fc7ee... Author: Linus Torvalds Date: Sat Oct 11 10:09:45 2008 -0700 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits) [ARM] 5300/1: fixup spitz reset during boot [ARM] 5295/1: make ZONE_DMA optional [ARM] 5239/1: Palm Zire 72 power management support [ARM] 5298/1: Drop desc_handle_irq() [ARM] 5297/1: [KS8695] Fix two compile-time warnings [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores. [ARM] pxa: allow multi-machine PCMCIA builds [ARM] pxa: add preliminary CPUFREQ support for PXA3xx [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c [ARM] pxa/zylonite: add support for USB OHCI [ARM] ohci-pxa27x: use ioremap() and offset for register access [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph() [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c [ARM] pxa: simplify DMA register definitions [ARM] pxa: make additional DCSR bits valid for PXA3xx [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c ... Fixed up conflicts in arch/arm/mach-versatile/core.c sound/soc/pxa/pxa2xx-ac97.c sound/soc/pxa/pxa2xx-i2s.c manually. commit 5ba2f67afb02c5302b2898949ed6fc3b3d37dcf1 Author: Arjan van de Ven Date: Fri Oct 10 21:16:12 2008 -0700 security: avoid calling a NULL function pointer in drivers/video/tvaudio.c NULL function pointers are very bad security wise. This one got caught by kerneloops.org quite a few times, so it's happening in the field.... Fix is simple, check the function pointer for NULL, like 6 other places in the same function are already doing. Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 64f1b65382054f8bfd528f2c4253297c232816eb Author: Linus Torvalds Date: Sat Oct 11 09:46:24 2008 -0700 net: fix dummy 'nf_conntrack_event_cache()' The dummy version of 'nf_conntrack_event_cache()' (used when the NF_CONNTRACK_EVENTS config option is not enabled) had not been updated when the calling convention changed. This was introduced by commit a71996fccce4b2086a26036aa3c915365ca36926 ("netfilter: netns nf_conntrack: pass conntrack to nf_conntrack_event_cache() not skb") Tssk. Cc: Alexey Dobriyan Cc: Patrick McHardy Cc: David Miller Signed-off-by: Linus Torvalds commit 4dd9ec4946b4651a295d3bc8df9c15ac692a8f4e Merge: 86ed5a9... 6861ff3... Author: Linus Torvalds Date: Sat Oct 11 09:33:18 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1075 commits) myri10ge: update driver version number to 1.4.3-1.369 r8169: add shutdown handler r8169: preliminary 8168d support r8169: support additional 8168cp chipset r8169: change default behavior for mildly identified 8168c chipsets r8169: add a new 8168cp flavor r8169: add a new 8168c flavor (bis) r8169: add a new 8168c flavor r8169: sync existing 8168 device hardware start sequences with vendor driver r8169: 8168b Tx performance tweak r8169: make room for more specific 8168 hardware start procedure r8169: shuffle some registers handling around (8168 operation only) r8169: new phy init parameters for the 8168b r8169: update phy init parameters r8169: wake up the PHY of the 8168 af_key: fix SADB_X_SPDDELETE response ath9k: Fix return code when ath9k_hw_setpower() fails on reset ath9k: remove nasty FAIL macro from ath9k_hw_reset() gre: minor cleanups in netlink interface gre: fix copy and paste error ... commit 86ed5a93b8b56e4e0877b914af0e10883a196384 Merge: 835a1c0... b77d753... Author: Linus Torvalds Date: Sat Oct 11 09:31:53 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Check that last search entry resume key is valid [CIFS] make sure we have the right resume info before calling CIFSFindNext [CIFS] clean up error handling in cifs_unlink [CIFS] fix some settings of cifsAttrs after calling SetFileInfo and SetPathInfo cifs: explicitly revoke SPNEGO key after session setup cifs: Convert cifs to new aops. [CIFS] update DOS attributes in cifsInode if we successfully changed them cifs: remove NULL termination from rename target in CIFSSMBRenameOpenFIle cifs: work around samba returning -ENOENT on SetFileDisposition call cifs: fix inverted NULL check after kmalloc [CIFS] clean up upcall handling for dns_resolver keys [CIFS] fix busy-file renames and refactor cifs_rename logic cifs: add function to set file disposition [CIFS] add constants for string lengths of keynames in SPNEGO upcall string cifs: move rename and delete-on-close logic into helper function cifs: have find_writeable_file prefer filehandles opened by same task cifs: don't use GFP_KERNEL with GFP_NOFS [CIFS] use common code for turning off ATTR_READONLY in cifs_unlink cifs: clean up variables in cifs_unlink commit 835a1c092432b3293ba6c4dec45ee6869c6f61fd Merge: d3570a5... 9609e74... Author: Linus Torvalds Date: Sat Oct 11 09:19:02 2008 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (49 commits) MIPS: RB532: provide GPIO_BUILTIN_NR and irq_to_gpio/gpio_to_irq MIPS: Move ptrace prototypes to ptrace.h MIPS: Ptrace support for HARDWARE_WATCHPOINTS MIPS: Scheduler support for HARDWARE_WATCHPOINTS. MIPS: Watch exception handling for HARDWARE_WATCHPOINTS. MIPS: Probe watch registers and report configuration. MIPS: Add HARDWARE_WATCHPOINTS definitions and support code. MIPS: Add HARDWARE_WATCHPOINTS configure option. MIPS: Replace use of with native implementations. MIPS: TXx9: Add TX4939 ATA support (v2) MIPS: Rewrite spinlocks to ticket locks. MIPS: IP checksums: Optimize adjust of sum on buffers of odd alignment. MIPS: IP checksums: Remove unncessary .set pseudos MIPS: IP checksums: Remove unncessary folding of sum to 16 bit. MIPS: Move headfiles to new location below arch/mips/include MIPS: Alchemy: rename directory MIPS: Optimize get_user and put_user for 64-bit MIPS: TXx9: Implement prom_free_prom_memory MIPS: TXx9: Add RBTX4939 board support MIPS: TXx9: Add TX4939 SoC support ... commit d3570a5a7b8d0604fa012129f92637dc1534f62c Merge: 37d9869... 72474be... Author: Linus Torvalds Date: Sat Oct 11 09:16:54 2008 -0700 Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel * 'for-linus' of git://git.alsa-project.org/alsa-kernel: (258 commits) ALSA: hda: VREF powerdown for headphones ALSA: hda: STAC_HP_M4 ALSA: ASoC: Check for machine type in GTA01 machine driver ALSA: mtpav - Fix race in probe ALSA: usb-audio: dynamic detection of MIDI interfaces in uaxx-quirk ALSA: Add a note on dependency of RTC stuff ALSA: ASoC: add new param mux to dapm_mux_update_power ALSA: Increase components array size ALSA: ASoC: Correct inverted Mic PGA Switch control in wm8510 driver ALSA: hda: comment typo fix ALSA: hda: comment typo fix ALSA: hda - Fix PCI SSID for ASROCK K18N78FullHD-hSLI ALSA: snd-usb-audio: support for Edirol UA-4FX device ALSA: usb - Fix possible Oops at USB-MIDI disconnection ALSA: hda - Fix another ALC889A (rev 0x100101) ALSA: hda: add more board-specific information for Realtek ALC662 rev1 ALSA: Correct Vladimir Barinov's e-mail address ALSA: cs46xx: Add PCI IDs for TerraTec and Hercules cards ALSA: hda: SPDIF stream muting support ALSA: hda: appletv support ... commit 37d9869ed928268409b48f52c57449918c0fd307 Merge: 098ef21... 89d4984... Author: Linus Torvalds Date: Sat Oct 11 08:50:01 2008 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (27 commits) [S390] Fix checkstack for s390 [S390] fix initialization of stp [S390] 3215: Remove tasklet. [S390] console flush on panic / reboot [S390] introduce dirty bit for kvm live migration [S390] Add ioctl support for EMC Symmetrix Subsystem Control I/O [S390] xpram: per device block request queues. [S390] dasd: fix message flood for unsolicited interrupts [S390] Move private simple udelay function to arch/s390/lib/delay.c. [S390] dcssblk: add >2G DCSSs support and stacked contiguous DCSSs support. [S390] ptrace changes [S390] s390: use sys_pause for 31bit pause entry point [S390] qdio enhanced SIGA (iqdio) support. [S390] cio: fix cio_tpi. [S390] cio: Correct use of ! and & [S390] cio: inline assembly cleanup [S390] bus_id -> dev_set_name() for css and ccw busses [S390] bus_id ->dev_name() conversions in qdio [S390] Use s390_root_dev_* in kvm_virtio. [S390] more bus_id -> dev_name conversions ... commit 098ef215b1e87cff51f983bae4e4e1358b932ec9 Merge: b922df7... 4f6e6b9... Author: Linus Torvalds Date: Sat Oct 11 08:49:34 2008 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] Fix BUG: using smp_processor_id() in preemptible code [CPUFREQ] Don't export governors for default governor [CPUFREQ][6/6] cpufreq: Add idle microaccounting in ondemand governor [CPUFREQ][5/6] cpufreq: Changes to get_cpu_idle_time_us(), used by ondemand governor [CPUFREQ][4/6] cpufreq_ondemand: Parameterize down differential [CPUFREQ][3/6] cpufreq: get_cpu_idle_time() changes in ondemand for idle-microaccounting [CPUFREQ][2/6] cpufreq: Change load calculation in ondemand for software coordination [CPUFREQ][1/6] cpufreq: Add cpu number parameter to __cpufreq_driver_getavg() [CPUFREQ] use deferrable delayed work init in conservative governor [CPUFREQ] drivers/cpufreq/cpufreq.c: Adjust error handling code involving cpufreq_cpu_put [CPUFREQ] add error handling for cpufreq_register_governor() error [CPUFREQ] acpi-cpufreq: add error handling for cpufreq_register_driver() error [CPUFREQ] Coding style fixes to arch/x86/kernel/cpu/cpufreq/powernow-k6.c [CPUFREQ] Coding style fixes to arch/x86/kernel/cpu/cpufreq/elanfreq.c commit 9609e74093abd9f61fb1d20a8915a8ea87c77d5a Author: Florian Fainelli Date: Thu Sep 11 17:48:00 2008 +0200 MIPS: RB532: provide GPIO_BUILTIN_NR and irq_to_gpio/gpio_to_irq This patchs defines the number of built-in the GPIOs present on the SoC as Documentation/gpio.txt recommends to do. Define irq_to_gpio/gpio_to_irq to return the right values so that it fixes a compilation error on drivers/gpio/gpiolib.c when enabling debugfs. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit d302d05cf4d25f4fbbec0f9338fac13ee0c0ad89 Author: Ralf Baechle Date: Sat Oct 11 16:18:57 2008 +0100 MIPS: Move ptrace prototypes to ptrace.h Signed-off-by: Ralf Baechle commit 0926bf953ee79b8f139741b442e5a18520f81705 Author: David Daney Date: Tue Sep 23 00:11:26 2008 -0700 MIPS: Ptrace support for HARDWARE_WATCHPOINTS This is the final part of the watch register patch. Here we hook up ptrace so that the user space debugger (gdb), can set and read the registers. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 2c708cbaa6031b73be6b992adb3ec1811f91cdb1 Author: David Daney Date: Tue Sep 23 00:09:51 2008 -0700 MIPS: Scheduler support for HARDWARE_WATCHPOINTS. Here we hook up the scheduler. Whenever we switch to a new process, we check to see if the watch registers should be installed, and do it if needed. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit b67b2b703047bfaf62687ca64c9486599b609ef0 Author: David Daney Date: Tue Sep 23 00:08:45 2008 -0700 MIPS: Watch exception handling for HARDWARE_WATCHPOINTS. Here we hook up the watch exception handler so that it sends SIGTRAP when the hardware watch registers are triggered. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 654f57bfb467996fb730eae96dc30ea4de989fdc Author: David Daney Date: Tue Sep 23 00:07:16 2008 -0700 MIPS: Probe watch registers and report configuration. Probe for watch register characteristics, and report them in /proc/cpuinfo. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 6aa3524c182c01b8b8b7c21c4da20c742a9b4d86 Author: David Daney Date: Tue Sep 23 00:05:54 2008 -0700 MIPS: Add HARDWARE_WATCHPOINTS definitions and support code. This is the main support code for the patch. Here we just add the code, the following patches hook it up. Signed-off-by: David Daney Signed-off-by: Ralf Baechle create mode 100644 arch/mips/include/asm/watch.h create mode 100644 arch/mips/kernel/watch.c commit 8192c9ea9ac44213d1266ecb64615519443979b3 Author: David Daney Date: Tue Sep 23 00:04:26 2008 -0700 MIPS: Add HARDWARE_WATCHPOINTS configure option. This is automatically set for all MIPS32 and MIPS64 processors. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 71ec6ccfdc2706e767189d40016fc802305067bb Author: Ralf Baechle Date: Tue Oct 31 02:52:56 2006 +0000 MIPS: Replace use of with native implementations. Signed-off-by: Ralf Baechle commit 4bacc68766b11c191ee1567f54103f109c002f4f Author: Atsushi Nemoto Date: Thu Sep 18 00:13:58 2008 +0900 MIPS: TXx9: Add TX4939 ATA support (v2) Add a helper routine to register tx4939ide driver and use it on RBTX4939 board. Signed-off-by: Atsushi Nemoto Acked-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit 2a31b03335e570dce5fdd082e0d71d48b2cb4290 Author: Ralf Baechle Date: Thu Aug 28 15:17:49 2008 +0100 MIPS: Rewrite spinlocks to ticket locks. Based on patch by Chad Reese of Cavium Networks. Signed-off-by: Ralf Baechle commit b65a75b8c91c0f05047399401407371678fe9549 Author: Ralf Baechle Date: Sat Oct 11 16:18:53 2008 +0100 MIPS: IP checksums: Optimize adjust of sum on buffers of odd alignment. Signed-off-by: Ralf Baechle commit 60724ca59eda766a30be57aec6b49bc3e2bead91 Author: Ralf Baechle Date: Sat Oct 11 16:18:53 2008 +0100 MIPS: IP checksums: Remove unncessary .set pseudos They possibly silence meaningful warnings ... Signed-off-by: Ralf Baechle commit d86a8123b11a9a40d850f6e88b89c948c2477da3 Author: Ralf Baechle Date: Sat Oct 11 16:18:53 2008 +0100 MIPS: IP checksums: Remove unncessary folding of sum to 16 bit. Signed-off-by: Ralf Baechle commit 384740dc49ea651ba350704d13ff6be9976e37fe Author: Ralf Baechle Date: Tue Sep 16 19:48:51 2008 +0200 MIPS: Move headfiles to new location below arch/mips/include Signed-off-by: Ralf Baechle commit e8c7c482347574ecdd45c43e32c332d5fc2ece61 Author: Ralf Baechle Date: Tue Sep 16 19:12:16 2008 +0200 MIPS: Alchemy: rename directory It's more than the au1000 these days. Signed-off-by: Ralf Baechle commit 8d2d91e86b4153cc2305ec86fe908048f459ff7f Author: Ralf Baechle Date: Sat Oct 11 16:18:50 2008 +0100 MIPS: Optimize get_user and put_user for 64-bit A long for the error value leads to unnecessary sign extensions. This patch shrinks an ip27_defconfig kernel build with gcc 4.3.0 by 2256 bytes. Signed-off-by: Ralf Baechle commit b6263ff2d6e58cc2fe615219ab2a06778b5e6cef Author: Atsushi Nemoto Date: Mon Sep 1 22:22:41 2008 +0900 MIPS: TXx9: Implement prom_free_prom_memory Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b27311e1cace4e296ace786c886d22f7a8ec78d6 Author: Atsushi Nemoto Date: Mon Sep 1 22:22:40 2008 +0900 MIPS: TXx9: Add RBTX4939 board support Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle create mode 100644 arch/mips/txx9/rbtx4939/Makefile create mode 100644 arch/mips/txx9/rbtx4939/irq.c create mode 100644 arch/mips/txx9/rbtx4939/prom.c create mode 100644 arch/mips/txx9/rbtx4939/setup.c create mode 100644 include/asm-mips/txx9/rbtx4939.h commit 0dcdbe6add26719e956299eb519542f7d2f7d0a8 Author: Atsushi Nemoto Date: Mon Sep 1 22:22:39 2008 +0900 MIPS: TXx9: Add TX4939 SoC support Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle create mode 100644 arch/mips/pci/pci-tx4939.c create mode 100644 arch/mips/txx9/generic/irq_tx4939.c create mode 100644 arch/mips/txx9/generic/setup_tx4939.c create mode 100644 include/asm-mips/txx9/tx4939.h commit ae027ead87b13cff99b4f48da7696aa4fe75393b Author: Atsushi Nemoto Date: Mon Sep 1 22:22:38 2008 +0900 MIPS: TXx9: IOC LED support Add leds-gpio platform device for controlling LEDs connected to IOC on RBTX49XX and JMR3927 board. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 21e77df215e58523a755b5dd006cb17610616f20 Author: Atsushi Nemoto Date: Mon Sep 1 22:22:37 2008 +0900 MIPS: TXx9: Microoptimize interrupt handlers The IOC interrupt status register on RBTX49XX only have 8 bits. Use 8-bit version of __fls() to optimize interrupt handlers. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f6d9831bb11eb465f95fb1736b866d405d9c7cbf Author: Atsushi Nemoto Date: Mon Sep 1 22:22:36 2008 +0900 MIPS: TXx9: stop_unused_modules TXx9 SoCs have pin multiplex. Stop some controller modules which can not be used due to pin configurations. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 9bed90c6a46f10c2d3052c0585057a5cb7392b92 Author: Florian Fainelli Date: Sat Aug 23 18:54:37 2008 +0200 Documentation: Document the RB532 specific kmac tag The Routerboard 532 bootloader passes the korina ethernet MAC adapter address to the kernel on the command line. Document this in the kernel-parameters file. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit d888e25b8dd1b501ac75b0c6587c043a394319c3 Author: Florian Fainelli Date: Sat Aug 23 18:54:34 2008 +0200 MIPS: RB532: Convert to GPIO lib This patch converts the rb532 code to use gpio library and register its gpio chip. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 09b7dcf220a37245b16fd4a716923d75bf6edf8b Author: Florian Fainelli Date: Sat Aug 23 18:54:04 2008 +0200 MIPS: RB532: Remove unused rc32434_sync_delay and rc32434_sync_udelay This patch removes these two unused functions : rc32434_sync_delay and rc32434_sync_udelay Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 606a083b1e1a357cb66454e4581b80f1a67d8368 Author: Florian Fainelli Date: Sat Aug 23 18:53:50 2008 +0200 MIPS: RB532: Cleanup the headers again This patch cleans up headers and regroups informations to where they should reside. While moving, try to have a consistant naming for defines. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit deeb45ac4a32c8271b022ecba73913bc1112e8e6 Author: Florian Fainelli Date: Sat Aug 23 18:53:24 2008 +0200 MIPS: RB532: Remove obsolute reference to setup_serial_port We are no longer using setup_serial_port. So just remove it from the prom code. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit b6e2f58a503b56e154f90dc516647c93c5fe873d Author: Florian Fainelli Date: Fri Aug 22 17:03:03 2008 +0200 MIPS: RB532: Fix id usage in platform devices When there is only platform device of the same type, id = -1 should be used, fix this. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit c76befc3429354909d3242d11b8d3bcb3bea4b03 Author: Florian Fainelli Date: Fri Aug 22 17:02:03 2008 +0200 MIPS: RB532: replace raw volatile read with a readl This patch replaces a raw read using volatiles with a readl. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 49afa0a15180c22c8836ef36edd6aa48ab7b2915 Author: Florian Fainelli Date: Fri Aug 22 17:01:31 2008 +0200 MIPS: RB532: Remove gpio bootup state We are no longer using gpio bootup state, so do not export it and do not parse the kernel command line tag for it. Instead we provide gpio-keys for the button the gpio bootup state was checking. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 3c8cf8caa5b217fbb17d0dce7f6bbec1d7da7249 Author: Florian Fainelli Date: Fri Aug 22 17:01:03 2008 +0200 MIPS: RB532: Use physical addresses for gpio and device controller registers This patch fixes the misuse of virtual addresses for the GPIO and third device controller which would lead to problems while accessing ioremap'd registers. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 3cd4e067a3e548a56a8b5e202552dcd18a2783a9 Author: Florian Fainelli Date: Fri Aug 22 17:00:22 2008 +0200 MIPS: RB532: Cleanup and group definitions to their right places This patch moves GPIO related definitions to gpio.h and IRQ related to irq.h Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 021635280d4572b9d9bb5481b00afea8a66b295f Author: Atsushi Nemoto Date: Tue Aug 19 22:55:18 2008 +0900 MIPS: TXx9: Declare smsc_fdc37m81x_config_get() in smsc_fdc37m81x.h Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit ee25d33f87348fd9e0ea148c4a25a3e7415fb5ba Author: Atsushi Nemoto Date: Tue Aug 19 22:55:17 2008 +0900 MIPS: TXx9: Add __init tag for tx4938_pcic1_map_irq. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit ce8e74112b1b1215aa5bbe261ed751498ce65434 Author: Atsushi Nemoto Date: Tue Aug 19 22:55:16 2008 +0900 MIPS: TXx9: Add board_be_init for TX4927/TX4938 Setup default board_be_handler for TX4927/TX4938. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 496a3b5c2c188e8af07261792b3d4e6cf1c1dab9 Author: Atsushi Nemoto Date: Tue Aug 19 22:55:15 2008 +0900 MIPS: TXx9: Default machine_restart using watchdog reset Add default machine_restart routine using watchdog reset of TX4927 and TX4938. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d75a40e90e9eb08c2159e719a90a7922dab231d3 Author: Atsushi Nemoto Date: Tue Aug 19 22:55:14 2008 +0900 MIPS: TXx9: Make spi_eeprom.c more generic Helper routines in txx9/rbtx4938/spi_eeprom.c is not TX4938 specific. Move it to txx9/generic/ directory and make it works with SPI bus number other than 0. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle create mode 100644 arch/mips/txx9/generic/spi_eeprom.c delete mode 100644 arch/mips/txx9/rbtx4938/spi_eeprom.c commit e6332374770ae5aa370af5792115261edbad05c1 Author: Atsushi Nemoto Date: Tue Aug 19 22:55:13 2008 +0900 MIPS: RBTX4938: Add TOSHIBA_RBTX4938_MPLEX_KEEP Add TOSHIBA_RBTX4938_MPLEX_KEEP to keep MPLEX settings by firmware. Also replace some printk with pr_info. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 74894363499942a76f2c20e41e8bfebc9fdc267a Author: Atsushi Nemoto Date: Tue Aug 19 22:55:12 2008 +0900 MIPS: TXx9: Raise priority of interrupts for errors, timers, SIO Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 51f607c76e1e7bd089dcad97b6b0a58649be06a3 Author: Atsushi Nemoto Date: Tue Aug 19 22:55:11 2008 +0900 MIPS: TXx9: Add mtd support Add helper routines to register physmap-flash platform devices for NOR flashes. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit c7b95bcb38ea492fd025008ef99501a2b90aa237 Author: Atsushi Nemoto Date: Tue Aug 19 22:55:10 2008 +0900 MIPS: TXx9: Runtime configuration of timeout-error Add kernel options to control bus timeout error. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d10e025f0e4ba4b96d7b5786d232ac5b0b232b11 Author: Atsushi Nemoto Date: Tue Aug 19 22:55:09 2008 +0900 MIPS: TXx9: Cache fixup TX39/TX49 can enable/disable I/D cache at runtime. Add kernel options to control them. This is useful to debug some cache-related issues, such as aliasing or I/D coherency. Also enable CWF bit for TX49 SoCs. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 860e546c19d88c21819c7f0861c505debd2d6eed Author: Atsushi Nemoto Date: Tue Aug 19 22:55:08 2008 +0900 MIPS: TXx9: Early command-line preprocessing * Select board by command-line option or firmware environment variable. * Handle "masterclk=" option. * Add boards.h to centerize board_vec declaration. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle create mode 100644 include/asm-mips/txx9/boards.h commit 265b89db1058124ddbf0091ba3f8c020e3a5ae9d Author: Atsushi Nemoto Date: Tue Aug 19 22:55:07 2008 +0900 MIPS: TXx9: Add prom_getenv Add prom_getenv() which can be used for YAMON. This assumes other firmware should pass NULL for fw_arg2. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit e0dfb20c2b77c6626a24578240266ace928cd2e7 Author: Atsushi Nemoto Date: Tue Aug 19 22:55:06 2008 +0900 MIPS: TXx9: Improve handling of built-in and command-line args * Make prom_init_cmdline() static and be called from prom_init. * Append built-in args if the first character was '+'. * Drop command-line args if the first character of built-in was '-'. * Enclose args include spaces by quotes. * TX4938_NAND_BOOT is no longer needed. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f96a3383cfede841cdf80a5927f14478981ed78c Author: Atsushi Nemoto Date: Tue Aug 19 22:55:05 2008 +0900 MIPS: RBTX4927: More explicit initialization * Make sure all interrupts cleared on startup * Initialize some GPIOs Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 9fa32c6b0275ab1e8b19f74fbfa3ed8411345db6 Author: Patrick Glass Date: Mon Aug 18 14:41:30 2008 -0700 MIPS: PMC MSP71XX gpio drivers This new gpio driver for PMC-Sierra's MSP71xx SoC allows standard api calls for access to the general and extended gpio's. Signed-off-by: Patrick Glass Signed-off-by: Ralf Baechle create mode 100755 arch/mips/pmc-sierra/msp71xx/gpio.c create mode 100755 arch/mips/pmc-sierra/msp71xx/gpio_extended.c create mode 100755 include/asm-mips/pmc-sierra/msp71xx/gpio.h commit 5d9a76cd0ed367d01b0b237253adb7607e86a277 Author: Thomas Bogendoerfer Date: Sun Aug 17 16:49:25 2008 +0200 MIPS: Use compat_sys_ptrace This replaces mips's sys_ptrace32 with a compat_arch_ptrace and enables the new generic definition of compat_sys_ptrace instead. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 69fc7eed5f56bce15b239e5110de2575a6970df4 Author: Dmitry Baryshkov Date: Thu Oct 9 16:58:13 2008 +0100 [ARM] 5300/1: fixup spitz reset during boot Some machines don't have the pullup/down on their reset pin, so configuring the reset generating pin as input makes them reset immediately. Fix that by making reset pin direction configurable. Signed-off-by: Dmitry Baryshkov Signed-off-by: Russell King commit 5bf5683a33f3584da6eced480967c4f7e11515a8 Author: Hidehiro Kawai Date: Fri Oct 10 22:12:43 2008 -0400 ext4: add an option to control error handling on file data If the journal doesn't abort when it gets an IO error in file data blocks, the file data corruption will spread silently. Because most of applications and commands do buffered writes without fsync(), they don't notice the IO error. It's scary for mission critical systems. On the other hand, if the journal aborts whenever it gets an IO error in file data blocks, the system will easily become inoperable. So this patch introduces a filesystem option to determine whether it aborts the journal or just call printk() when it gets an IO error in file data. If you mount an ext4 fs with data_err=abort option, it aborts on file data write error. If you mount it with data_err=ignore, it doesn't abort, just call printk(). data_err=ignore is the default. Here is the corresponding patch of the ext3 version: http://kerneltrap.org/mailarchive/linux-kernel/2008/9/9/3239374 Signed-off-by: Hidehiro Kawai Signed-off-by: Theodore Ts'o commit 7ad7445f60fe4d46c4c9d2a9463db180d2a3b270 Author: Hidehiro Kawai Date: Fri Oct 10 20:29:31 2008 -0400 jbd2: don't dirty original metadata buffer on abort Currently, original metadata buffers are dirtied when they are unfiled whether the journal has aborted or not. Eventually these buffers will be written-back to the filesystem by pdflush. This means some metadata buffers are written to the filesystem without journaling if the journal aborts. So if both journal abort and system crash happen at the same time, the filesystem would become inconsistent state. Additionally, replaying journaled metadata can overwrite the latest metadata on the filesystem partly. Because, if the journal gets aborted, journaled metadata are preserved and replayed during the next mount not to lose uncheckpointed metadata. This would also break the consistency of the filesystem. This patch prevents original metadata buffers from being dirtied on abort by clearing BH_JBDDirty flag from those buffers. Thus, no metadata buffers are written to the filesystem without journaling. Signed-off-by: Hidehiro Kawai Signed-off-by: Theodore Ts'o commit 7ffe1ea8949c75ecffb7a4d988bb881a9fa62fbe Author: Hidehiro Kawai Date: Fri Oct 10 20:29:21 2008 -0400 ext4: add checks for errors from jbd2 If the journal has aborted due to a checkpointing failure, we have to keep the contents of the journal space. Otherwise, the filesystem will lose uncheckpointed metadata completely and become inconsistent. To avoid this, we need to keep needs_recovery flag if checkpoint has failed. With this patch, ext4_put_super() detects a checkpointing failure from the return value of journal_destroy(), then it invokes ext4_abort() to make the filesystem read only and keep needs_recovery flag. Errors from jbd2_journal_flush() are also handled by this patch in some places. Signed-off-by: Hidehiro Kawai Signed-off-by: Theodore Ts'o commit 44519faf22ad6ce924ad0352d3dc200d9e0b66e8 Author: Hidehiro Kawai Date: Fri Oct 10 20:29:13 2008 -0400 jbd2: fix error handling for checkpoint io When a checkpointing IO fails, current JBD2 code doesn't check the error and continue journaling. This means latest metadata can be lost from both the journal and filesystem. This patch leaves the failed metadata blocks in the journal space and aborts journaling in the case of jbd2_log_do_checkpoint(). To achieve this, we need to do: 1. don't remove the failed buffer from the checkpoint list where in the case of __try_to_free_cp_buf() because it may be released or overwritten by a later transaction 2. jbd2_log_do_checkpoint() is the last chance, remove the failed buffer from the checkpoint list and abort the journal 3. when checkpointing fails, don't update the journal super block to prevent the journaled contents from being cleaned. For safety, don't update j_tail and j_tail_sequence either 4. when checkpointing fails, notify this error to the ext4 layer so that ext4 don't clear the needs_recovery flag, otherwise the journaled contents are ignored and cleaned in the recovery phase 5. if the recovery fails, keep the needs_recovery flag 6. prevent jbd2_cleanup_journal_tail() from being called between __jbd2_journal_drop_transaction() and jbd2_journal_abort() (a possible race issue between jbd2_log_do_checkpoint()s called by jbd2_journal_flush() and __jbd2_log_wait_for_space()) Signed-off-by: Hidehiro Kawai Signed-off-by: Theodore Ts'o commit 77e841de8abac4755cc83ca224fdf71418d65380 Author: Hidehiro Kawai Date: Sun Oct 12 16:39:16 2008 -0400 jbd2: abort when failed to log metadata buffers If we failed to write metadata buffers to the journal space and succeeded to write the commit record, stale data can be written back to the filesystem as metadata in the recovery phase. To avoid this, when we failed to write out metadata buffers, abort the journal before writing the commit record. We can also avoid this kind of corruption by using the journal checksum feature because it can detect invalid metadata blocks in the journal and avoid them from being replayed. So we don't need to care about asynchronous commit record writeout with a checksum. Signed-off-by: Hidehiro Kawai Signed-off-by: Theodore Ts'o commit 03010a3350301baac2154fa66de925ae2981b7e3 Author: Theodore Ts'o Date: Fri Oct 10 20:02:48 2008 -0400 ext4: Rename ext4dev to ext4 The ext4 filesystem is getting stable enough that it's time to drop the "dev" prefix. Also remove the requirement for the TEST_FILESYS flag. Signed-off-by: "Theodore Ts'o" commit 6861ff35ec5b60fafaf8651754c9a75142bfa9a4 Merge: 2ef3783... 1765f95... Author: David S. Miller Date: Fri Oct 10 14:43:54 2008 -0700 Merge branch 'r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 commit 2ef3783608668a32e497a16cb8696cee9b0aa47c Author: Brice Goglin Date: Fri Oct 10 14:33:37 2008 -0700 myri10ge: update driver version number to 1.4.3-1.369 Update myri10ge driver version number to 1.4.3-1.369. Signed-off-by: Brice Goglin Signed-off-by: David S. Miller commit 1765f95d2db0a516b5816e016fdf459c4bb5affb Author: Francois Romieu Date: Sat Sep 13 17:21:40 2008 +0200 r8169: add shutdown handler Signed-off-by: Francois Romieu Cc: Edward Hsu commit 5b538df9dedb3469b688b93ffab2a7efb64c88e3 Author: Francois Romieu Date: Sun Jul 20 16:22:45 2008 +0200 r8169: preliminary 8168d support Taken from Realtek's 8.007.00 r8168 driver. Signed-off-by: Francois Romieu Fixed-by: Ivan Vecera Cc: Edward Hsu commit 7f3e3d3a69da262016db6eec803881603c61ddf6 Author: Francois Romieu Date: Sun Jul 20 18:53:20 2008 +0200 r8169: support additional 8168cp chipset Taken from Realtek's 8.007.00 r8168 driver. Signed-off-by: Francois Romieu Fixed-by: Ivan Vecera Cc: Edward Hsu commit ef808d502cc3b18b2d823bbe8c03c0b8ea0df1b5 Author: Francois Romieu Date: Sun Jun 29 13:10:54 2008 +0200 r8169: change default behavior for mildly identified 8168c chipsets The addition of a new device has so far implied a specialization of these masks. While they identify 8168c devices, they can be expected to be further refined as they have been by Realtek so far. The change should bring the driver closer to the version 8.006.00 of Realtek's 8168 driver. Signed-off-by: Francois Romieu Cc: Edward Hsu commit ef3386f00fcd18a40343047329ec7ed2eb98bbe8 Author: Francois Romieu Date: Sun Jun 29 12:24:30 2008 +0200 r8169: add a new 8168cp flavor Taken from Realtek's 8.006.00 r8168 driver. I have left some bits related to jumbo frame aside for now. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 6fb07058d2b6c748c308e4ee453035433d34ca93 Author: Francois Romieu Date: Sun Jun 29 11:54:28 2008 +0200 r8169: add a new 8168c flavor (bis) Taken from Realtek's 8.006.00 r8168 driver. I have left some bits related to jumbo frame aside for now. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 197ff761dbf9fa5de9a4684a51ee5cb534cbb852 Author: Francois Romieu Date: Sat Jun 28 13:16:02 2008 +0200 r8169: add a new 8168c flavor Taken from Realtek's 8.006.00 r8168 driver. Signed-off-by: Francois Romieu Cc: Edward Hsu commit b726e493e8dc13537d1d7f8cd66bcd28516606c3 Author: Francois Romieu Date: Sat Jun 28 12:22:59 2008 +0200 r8169: sync existing 8168 device hardware start sequences with vendor driver This part of the driver should be reasonably in line with Realtek's 8.006.00 driver. I have left some bits related to jumbo frame and optional features aside for now. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 2e68ae44309bfadccdb5ddd68b9c38d2a1efeb94 Author: Francois Romieu Date: Sat Jun 28 12:00:55 2008 +0200 r8169: 8168b Tx performance tweak Signed-off-by: Francois Romieu Cc: Edward Hsu commit 219a1e9d46dcc21f279c428941ded2328f1a5ee5 Author: Francois Romieu Date: Sat Jun 28 11:58:39 2008 +0200 r8169: make room for more specific 8168 hardware start procedure Broadly speaking the 8168c* share some common code which will be factored in __rtl_hw_start_8168cp. The 8168b* share some code too but it will be a bit different. Any change of behavior should be confined to the currently unidentified 8168 chipsets. They will not be applied the Tx performance tweak and will emit a warning instead. Signed-off-by: Francois Romieu Cc: Edward Hsu commit b8363901596f64ef74db906df0c4a95daea47464 Author: Francois Romieu Date: Sun Jun 1 12:31:57 2008 +0200 r8169: shuffle some registers handling around (8168 operation only) I can not argue strongly for (or against) a specific ordering on a purely technical ground but the patch avoids to swallow Realtek's changes in one big, hard-to-read gulp. Let aside the way the RxConfig register is written (see rtl_set_rx_tx_config_registers / RxConfig / rtl_set_rx_mode), this change brings the registers write ordering closer with Realtek's driver one (version 8.006.00) for the 8168 chipsets. More 8168 specific code which touches the Configx registers will be added in the section covered by Cfg9346_UnLock / Cfg9346_Lock. This code should not be the cause of regression for 810x and 8110 users. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 236b8082aa239e91c3cd9cb466d0527a735e54db Author: Francois Romieu Date: Fri May 30 16:11:48 2008 +0200 r8169: new phy init parameters for the 8168b The new parameters are synced with Realtek's driver version 8.006.00. Signed-off-by: Francois Romieu Cc: Edward Hsu commit f50d4275422415cfb2a5b94bad3b2b229d0ec1aa Author: Francois Romieu Date: Fri May 30 16:07:07 2008 +0200 r8169: update phy init parameters The modified parameters are synced with Realtek's driver version 8.006.00. The change should only be noticeable with some 8168c. Signed-off-by: Francois Romieu Cc: Edward Hsu commit a2de6b89b74b28052e293fdb39975a5a03c432e0 Author: Francois Romieu Date: Thu Sep 4 00:17:12 2008 +0200 r8169: wake up the PHY of the 8168 This is typically needed when some other OS puts the PHY to sleep due to the disabling of WOL options in the BIOS of the system. Signed-off-by: Francois Romieu Tested-by: Chiaki Ishikawa Cc: Edward Hsu Cc: RyanKao commit 1839faab9a2747bcd30ee14e50575a39bf6735d4 Author: Tobias Brunner Date: Fri Oct 10 14:07:03 2008 -0700 af_key: fix SADB_X_SPDDELETE response When deleting an SPD entry using SADB_X_SPDDELETE, c.data.byid is not initialized to zero in pfkey_spddelete(). Thus, key_notify_policy() responds with a PF_KEY message of type SADB_X_SPDDELETE2 instead of SADB_X_SPDDELETE. Signed-off-by: Tobias Brunner Signed-off-by: David S. Miller commit 92f1f8fd8040e7b50a67a850a935509bb01201bb Author: Elias Oltmanns Date: Fri Oct 10 22:39:40 2008 +0200 ide: Remove ide_spin_wait_hwgroup() and use special requests instead Use a special request for serialisation purposes and get rid of the awkward ide_spin_wait_hwgroup(). This also involves converting the ide_devset structure so it can be shared by the /proc and the ioctl code. Signed-off-by: Elias Oltmanns [bart: use rq->cmd[] directly] Signed-off-by: Bartlomiej Zolnierkiewicz commit d6e2955a6b82d2312b5ff885ce13c8ab54d59d96 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:39 2008 +0200 ide: move IDE{FLOPPY,TAPE}_WAIT_CMD defines to While at it: * IDE{FLOPPY,TAPE}_WAIT_CMD -> WAIT_{FLOPPY,TAPE}_CMD * Use enum for WAIT_* defines. There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit de699ad595fb45022d1b049ed91ffd06fdd16c13 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:39 2008 +0200 ide: add ide_do_test_unit_ready() helper * Add ide_do_test_unit_ready() helper and convert ide-{floppy,tape}.c to use it. * Remove no longer used idetape_create_test_unit_ready_cmd(). There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 0c8a6c7aead1d3be85ce53e3aaacd52e38ede03e Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:39 2008 +0200 ide: add ide_do_start_stop() helper * Add ide_do_start_stop() helper and convert ide-{floppy,tape}.c to use it. * Remove no longer used idefloppy_create_start_stop_cmd() and idetape_create_load_unload_cmd(). There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 0578042db3191e1ac76b53d213f2a691c3e1eaed Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:38 2008 +0200 ide: add ide_set_media_lock() helper * Set IDE_AFLAG_NO_DOORLOCK in idetape_get_mode_sense_result(), check it in ide_tape_set_media_lock() and cleanup idetape_create_prevent_cmd(). * Set IDE_AFLAG_NO_DOORLOCK in ide_floppy_create_read_capacity_cmd() and check it instead of IDE_AFLAG_CLIK_DRIVE in ide_floppy_set_media_lock(). * Add ide_set_media_lock() helper and convert ide-{floppy,tape}.c to use it. * Remove no longer used ide*_create_prevent_cmd()/ide*_set_media_lock(). * Update comment in accordingly. Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 0127854d7c96612a454bed6de242e28f8021fa7f Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:38 2008 +0200 ide-floppy: move floppy ioctls handling to ide-floppy_ioctl.c While at it: - idefloppy_create_read_capacity_cmd() -> ide_floppy_create_read_capacity_cmd() - idefloppy_create_mode_sense_cmd() -> ide_floppy_create_mode_sense_cmd() - idefloppy_create_request_sense_cmd() -> ide_floppy_create_request_sense_cmd() - idefloppy_create_format_unit_cmd() -> ide_floppy_create_format_unit_cmd() - idefloppy_get_sfrp_bit() -> ide_floppy_get_sfrp_bit() Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 49cac39e71bd6bbcf934c6ba837e21503902c088 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:38 2008 +0200 ide-floppy: ->{srfp,wp} -> IDE_AFLAG_{SRFP,WP} Add IDE_AFLAG_{SRFP,WP} drive->atapi_flags and use them instead of ->{srfp,wp} struct ide_floppy_obj fields. There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2ac07d920604eeee8966d52e70161f9b31fe90a3 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:38 2008 +0200 ide: add ide_queue_pc_tail() helper * Add ide_queue_pc_tail() and convert ide-{floppy,tape}.c to use it instead of ide*_queue_pc_tail(). * Remove no longer used ide*_queue_pc_tail(). There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 7645c1514c7d34ebdf3ea0e8ee3a935c08abceb2 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:37 2008 +0200 ide: add ide_queue_pc_head() helper * Move REQ_IDETAPE_* enums to . * Add ide_queue_pc_head() and convert ide-{floppy,tape}.c to use it instead of ide*_queue_pc_head(). * Remove no longer used ide*_queue_pc_head(). There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 7bf7420a318978cd6042e5a5da34b7cfa18ae559 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:37 2008 +0200 ide: add ide_init_pc() helper * Add IDE_PC_BUFFER_SIZE define. * Add ide_init_pc() and convert ide-{floppy,tape}.c to use it instead of ide*_init_pc(). * Remove no longer used IDE*_PC_BUFFER_SIZE and ide*_init_pc(). There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 385a4b8787c70b708688bee65139f15b0f79f144 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:37 2008 +0200 ide-tape: add ide_tape_set_media_lock() helper Add ide_tape_set_media_lock() helper and convert idetape_mtioctop(), idetape_chrdev_open() and idetape_chrdev_release() to use it. There should be no functional changes caused by this patch (it is OK to modify ->door_locked if idetape_create_prevent_cmd() fails). Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit e996fc8ae96a822f037e25463cb8dac5b93839f7 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:37 2008 +0200 ide-floppy: add ide_floppy_set_media_lock() helper Add ide_floppy_set_media_lock() helper and convert idefloppy_open(), idefloppy_release() and ide_floppy_lockdoor() to use it. There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit acaa0f5f675ccf6b8a3a11a933419068b1ea1f46 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:36 2008 +0200 ide: add ide_io_buffers() helper * Make ->io_buffers method return number of bytes transferred. * Use ide_end_request() instead of idefloppy_end_request() in ide_floppy_io_buffers() and then move the call out to ide_pc_intr(). * Add ide_io_buffers() helper and convert ide-{floppy,scsi}.c to use it instead of ide*_io_buffers(). There should be no functional changes caused by this patch. Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit c860f955681ebd83df4a03089f1910fc4b54651f Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:36 2008 +0200 ide-scsi: cleanup ide_scsi_io_buffers() Preparation for ide_{floppy,scsi}_io_buffers() unification. Acked-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4de4b9e1405aef41d199dd20dbce7e9a5dbbf7bf Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:36 2008 +0200 ide-floppy: remove MODE_SENSE_* defines Only MODE_SENSE_CURRENT (0x00) is ever used so just remove these defines and then drop no longer needed 'type' argument from idefloppy_create_mode_sense_cmd(). Cc: Borislav Petkov Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2e8a6f89de69d149bde135c2dc89daa9127984a9 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:36 2008 +0200 ide-{floppy,tape}: remove packet command stack * Add 'struct ide_atapi_pc queued_pc' to struct ide_{floppy,tape}_obj and switch ide*_do_request() to use it (there can be only one active request for a given device). * Add 'struct ide_atapi_pc request_sense_pc' to struct ide_*_obj and switch ide*_retry_pc() to use it. * Remove needless {floppy,tape}->pc assignment from ide*_setup(). * Remove no longer needed ide*_next_pc_storage(), pc_stack[], rq_stack_index, IDE*_PC_STACK and DBG_PC_STACK. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 394a4c2101f43bfb5fea7b5d1f5789a14ac018d7 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:35 2008 +0200 ide-{floppy,tape}: remove request stack * Add 'struct request request_sense_rq' to struct ide_{floppy,tape}_obj and switch ide*_retry_pc() to use it (there can be only one REQUEST SENSE request active for a given device). * Remove no longer needed ide*_next_rq_storage(), rq_stack[] and rq_stack_index. * DBG_PCRQ_STACK -> DBG_PC_STACK * Update comments for IDE*_PC_STACK and idetape_queue_pc_{head,tail}(). There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 20df429dd6671804999493baf2952f82582869fa Author: Borislav Petkov Date: Fri Oct 10 22:39:35 2008 +0200 ide-generic: handle probing of legacy io-ports v5 Avoid probing the io-ports in case an IDE PCI controller is present and it uses the legacy iobases. If we still want to enforce the probing, we do ide_generic.probe_mask=0x3f on the kernel command line. The iobase checking code is adapted from drivers/ata/pata_legacy.c after converting hex pci ids into their corresponding macros in . Also, check only BAR0/2 resources since those are guaranteed by the workaround in drivers/pci/probe.c:pci_setup_device(). Signed-off-by: Borislav Petkov Acked-by: Sergei Shtylyov Cc: Alan Cox [bart: trivial printk() fixups] Signed-off-by: Bartlomiej Zolnierkiewicz commit b98b3409abb697321d1b53e3e96a14243fe9fc79 Author: Borislav Petkov Date: Fri Oct 10 22:39:35 2008 +0200 ide-floppy: use scatterlists for pio transfers Use hwif->sg_table for pio transfers instead of fumbling with block layer internals in the driver. Also, make debug statements more informative in .._do_request() while at it. Signed-off-by: Borislav Petkov [bart: fixup pc->b_count in idefloppy_blockpc_cmd()] [bart: add missing include (noticed by Stephen Rothwell)] [bart: map hwif->sg_{table,nents} on pc->{sg,sg_cnt} (multi-IRQs-per-sg fix)] Signed-off-by: Bartlomiej Zolnierkiewicz commit f025ffdcc3450ae66c9d5df368d97f07e7fcf489 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:34 2008 +0200 ide-tape: remove idetape_init_rq() idetape_init_rq() is only used in idetape_queue_pc_head() so inline it there. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit d56c99e26b0ff45009bdf85556abee60591507cb Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:34 2008 +0200 ide-floppy: add ide_floppy_format_ioctl() helper * Factor out IDEFLOPPY_IOCTL_FORMAT_* ioctls handling from idefloppy_ioctl() to ide_floppy_format_ioctl(). While at it: * Pass 'drive' instead of 'floppy' to ide_floppy_format_unit(). * idefloppy_get_format_progress() -> ide_floppy_get_format_progress() There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit e3faa2481e832568d13dfa3a52d17525b322cb8f Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:34 2008 +0200 ide-floppy: remove needless parens Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 51509eec34debffec3c6f481f7371c9aeb6c63c1 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:34 2008 +0200 ide: add ide_check_atapi_device() helper * Add ide_check_atapi_device() to ide-atapi.c and convert ide-{floppy,tape}.c to use it instead of ide*_identify_device(). While at it: * Add DRV_NAME defines to ide-{floppy,tape}.c. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 05236ea6df7419f0f37cf9603cfee265cfce5832 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:33 2008 +0200 ide: move ioctls handling to ide-ioctls.c * Move ioctls handling to ide-ioctls.c (except HDIO_DRIVE_TASKFILE for now). * Make ide_{cmd,task}() static. Signed-off-by: Bartlomiej Zolnierkiewicz commit 170dc5b085e688639aa2b7acd1b907e2e1c7a48a Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:33 2008 +0200 ide: cleanup generic_ide_ioctl() * Fix intendation for the main 'switch ()'. * 'switch ()' -> 'if ()' for HDIO_DRIVE_TASKFILE case. * Move HDIO_SET_NICE case under HDIO_GET_NICE one. Signed-off-by: Bartlomiej Zolnierkiewicz commit aa7687738af3332470e02ac1060f6c046d83c9a3 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:33 2008 +0200 ide: add ide_setting_ioctl() helper * Add struct ide_ioctl_devset representing ioctl device setting. * Add ide_setting_ioctl() helper for matching given ioctl and its parameters against table of ioctl device settings. * Convert ide_setting_ioctl() and idedisk_ioctl() to use ide_setting_ioctl(). * Un-export ide_setting_mtx. While at it: * {get,set}_lba_addressing() -> {get,set}_addressing() There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 9232c14bff36d65de254f34386c00b732c5b6099 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:33 2008 +0200 ide: remove ->bus_state field from ide_hwif_t It is always set to BUSSTATE_ON. Signed-off-by: Bartlomiej Zolnierkiewicz commit feb22b7f8e62b1b987a3a1dbad95af767a1df832 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:32 2008 +0200 ide: add proper PCI PM support (v2) * Keep pointer to ->init_chipset method also in struct ide_host and set it in ide_host_alloc_all(). * Add ide_pci_suspend() and ide_pci_resume() helpers (default ->suspend and ->resume implementations). * ->init_chipset can no longer be marked __devinit. * Add proper PCI PM support to IDE PCI host drivers (rz1000.c and tc86c001.c are skipped for now since they need to be converted from using ->init_hwif to use ->init_chipset instead). v2: * Cleanup CONFIG_PM #ifdef-s per akpm's suggestion. Cc: Andrew Morton Cc: "Rafael J. Wysocki" Signed-off-by: Bartlomiej Zolnierkiewicz commit 1785192b5310ee25165768f5bb80f13146788e3e Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:32 2008 +0200 hpt366: add hpt3xx_disable_fast_irq() helper * Factor out disabling of "fast interrupt" prediction from init_hwif_hpt366() to hpt3xx_disable_fast_irq() helper. * Use hpt3xx_disable_fast_irq() in ->init_chipset instead of ->init_hwif method. This is a preparation for adding proper PCI PM support. While at it: * Cache chip type in chip_type variable in hpt3xx_disable_fast_irq(). There should be no functional changes caused by this patch. Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit a02227c9774b3bff08c7f557d06247e0a03ac435 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:31 2008 +0200 ide: lba_capacity_is_ok() -> ata_id_is_lba_capacity_ok() Rename lba_capacity_is_ok() to ata_id_is_lba_capacity_ok() and move it to (remove needless parens while at it). Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 93734a234447a3c091f76d76f7351af9d4dde518 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:31 2008 +0200 ide: ide_id_to_hd_driveid() -> ata_id_to_hd_driveid() Rename ide_id_to_hd_driveid() to ata_id_to_hd_driveid() and move it to . Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 718c72e83da295efc9c8625b6f380ef10352d955 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:31 2008 +0200 ide: use ata_id_is_cfa() Use ata_id_is_cfa() in do_identify() instead of open-coding check for CompactFlash devices (the inline helper also takes care of detecting CFs advertising themselves as ATA disks). Signed-off-by: Bartlomiej Zolnierkiewicz commit ff2779b568e70822e0ef2cc7afeeefbe7c607652 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:31 2008 +0200 ide: ide_id_has_flush_cache_ext() -> ata_id_flush_ext_enabled() * Add ata_id_flush_ext_enabled() inline helper to . * ide_id_has_flush_cache_ext() -> ata_id_flush_ext_enabled() The latter one also checks if the command is marked as supported in word 83 and validity of words 83 & 86. Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 4b58f17d7c45a8e5f4acda641bec388398b9c0fa Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:30 2008 +0200 ide: ide_id_has_flush_cache() -> ata_id_flush_enabled() * Add ata_id_flush_enabled() inline helper to . * ide_id_has_flush_cache() -> ata_id_flush_enabled() The latter one also checks if the command is marked as supported in word 83 and validity of words 83 & 86. Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 1a4e4d4d2cceb72be70526a485914abd638c7de1 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:30 2008 +0200 ide: check only for CACHE FLUSH command support in ide_id_has_flush_cache() All devices supporting CACHE FLUSH EXT command should also support CACHE FLUSH command so it is sufficient to check only for CACHE FLUSH in ide_id_has_flush_cache(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 942dcd85bf8edf38cdc3745306ca250684d99a61 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:30 2008 +0200 ide: idedisk_supports_lba48() -> ata_id_lba48_enabled() * Add ata_id_lba48_enabled() inline helper to . * idedisk_supports_lba48() -> ata_id_lba48_enabled() The latter one also checks validity of words 83 & 86. Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 367d7e78dd48cf6ad35182a99d97abb5486e040e Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:30 2008 +0200 ide: ide_dev_is_sata() -> ata_id_is_sata() * Use optimized ATA version check from Sergei in ata_id_is_sata(). * ide_dev_is_sata() -> ata_id_is_sata() Cc: Jeff Garzik Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5d5870f0a26e2304c4a82592870c5bc88017f7c9 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:29 2008 +0200 ide: ide_dev_has_iordy() -> ata_id_has_iordy() * Remove (id[ATA_ID_FIELD_VALID] & 2) check from ide_dev_has_iordy() (it is for validity of words 64-70, IORDY is in word 49). * ide_dev_has_iordy() -> ata_id_has_iordy() Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 9fa295e12d490fd571c614b221defaa9212c20dc Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:29 2008 +0200 ide: factor out HDIO_*_NICE ioctl handling to ide_*_nice_ioctl() Factor out HDIO_{GET,SET}_NICE ioctl handling from generic_ide_ioctl() to ide_{get,set}_nice_ioctl(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 02d599a365d04658bc9ea71762ed17c895079927 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:29 2008 +0200 ide: remove ->supports_dsc_overlap field from ide_driver_t * Use drive->media and drive->scsi to check if ->dsc_overlap can be set by HDIO_SET_NICE ioctl in generic_ide_ioctl(). * Remove unused ->supports_dsc_overlap field from ide_driver_t. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit ebc6be520673f65aef188abde43972f9cd2162e9 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:29 2008 +0200 ide: remove read-only ->atapi_overlap field from ide_drive_t Signed-off-by: Bartlomiej Zolnierkiewicz commit af5dfe8cf07b6f4fbd6b7d8ff1aeda718fdd0166 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:28 2008 +0200 cmd640: add __set_prefetch_mode() Factor out the common code from check_prefetch() and set_prefetch_mode() to __set_prefetch_mode(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 151a670186a0f8441798f90c8701647adb7a1589 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:28 2008 +0200 ide: remove SECTOR_WORDS define Just use SECTOR_SIZE instead. Signed-off-by: Bartlomiej Zolnierkiewicz commit 8185d5aa93e0a5c111adc4952a5b87193a68ae5b Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:28 2008 +0200 ide: /proc/ide/hd*/settings rework * Add struct ide_devset, S_* flags, *DEVSET() & ide*_devset_*() macros. * Add 'const struct ide_devset **settings' to ide_driver_t. * Use 'const struct ide_devset **settings' in ide_drive_t instead of 'struct ide_settings_s *settings'. Then convert core code and device drivers to use struct ide_devset and co.: - device settings are no longer allocated dynamically for each device but instead there is an unique struct ide_devset instance per setting - device driver keeps the pointer to the table of pointers to its settings in ide_driver_t.settings - generic settings are kept in ide_generic_setting[] - ide_proc_[un]register_driver(), ide_find_setting_by_name(), ide_{read,write}_setting() and proc_ide_{read,write}_settings() are updated accordingly - ide*_add_settings() are removed * Remove no longer used __ide_add_setting(), ide_add_setting(), __ide_remove_setting() and auto_remove_settings(). * Remove no longer used TYPE_*, SETTING_*, ide_procset_t and ide_settings_t. * ->keep_settings, ->using_dma, ->unmask, ->noflush, ->dsc_overlap, ->nice1, ->addressing, ->wcache and ->nowerr ide_drive_t fields can now be bitfield flags. While at it: * Rename ide_find_setting_by_name() to ide_find_setting(). * Rename write_wcache() to set_wcache(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 263138a0ad6e38de7f6526b7de037ed4511308ef Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:27 2008 +0200 ide: preparations for /proc/ide/hd*/settings rework After rework settings will be no longer created dynamically for each device so we need to make some fixups first. * Use set_[ksettings,unmaskirq]() as a set function for ["keepsettings","unmaskirq"] setting. * Allow writes to ["io_32bit","unmaskirq"] settings also when drive->no_[io_32bit,unmask] is set (this is checked later inside set_[io_32bit,unmaskirq]() anywyay and keeps consistency with the corresponding HDIO_SET_[32BIT,UNMASKINTR] ioctls). * Use max possible multi sectors value (16) as an allowed max for "multcount" setting. set_multcount() set function checks against device's max possbile value anyway and it makes the proc setting consistent with the corresponding HDIO_SET_MULTCOUNT ioctl. Signed-off-by: Bartlomiej Zolnierkiewicz commit 1e874f448365b80e69b8a60b8b575b17f00811f3 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:27 2008 +0200 ide: call ide_proc_register_driver() later Call ide_proc_register_driver() in ide*_setup() (just before ide*_add_settings() call) instead of in ->probe method. Despite being basically a preparation for /proc/ide/hd*/settings rework this is a nice cleanup in itself. Signed-off-by: Bartlomiej Zolnierkiewicz commit 3ceca727fe3a38dd8d7a3adf938fefda83eee8af Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:27 2008 +0200 ide: include only when needed * Include directly in instead of through . * Include only when needed. Cc: Christoph Hellwig Signed-off-by: Bartlomiej Zolnierkiewicz commit 7c51c17e0431d2f26bc23ee07de12eafb125ce83 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:26 2008 +0200 ide: remove CONFIG_IDEDISK_MULTI_MODE Use multi PIO by default when available and remove no longer needed CONFIG_IDEDISK_MULTI_MODE (it should be safe nowadays, despite to what help entry has been saying). Signed-off-by: Bartlomiej Zolnierkiewicz commit 7e59ea21aab1a91ca31bc64c7d3035ebdbd336d1 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:26 2008 +0200 ide: check drive->present in ide_get_paired_drive() * Change ide_get_paired_drive() to return NULL if peer device is not present and update all users accordingly. While at it: * ide_get_paired_drive() -> ide_get_pair_dev() * Use ide_get_pair_dev() in cs5530.c, sc1200.c and via82cxxx.c. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2a924662b646fa25cb491d50aa1202a94aa4ac55 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:24 2008 +0200 ide: remove needless drive->present checks from device drivers Remove needless drive->present checks from ->probe methods (device model takes care of that). Signed-off-by: Bartlomiej Zolnierkiewicz commit 3cd5f1eae093a7d6ff8a63c746eba9d6f689ba91 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:24 2008 +0200 ide: remove unused _IDE_C and _IDE_DISK defines Signed-off-by: Bartlomiej Zolnierkiewicz commit a2cdee5a9a93360165d0576bbc7e9ccb3127afee Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:24 2008 +0200 ide: remove IDE_CHIPSET_* macros They just obfuscate the code. Signed-off-by: Bartlomiej Zolnierkiewicz commit 7c199a5496d0579d388636ee34a954e2e566d2fb Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:23 2008 +0200 ide: remove no longer needed BUG_ON()-s from init_irq() init_irq() is now called only during initial host registration so these BUG_ON()-s are no loner needed (+ the last one was done too late anyway). Signed-off-by: Bartlomiej Zolnierkiewicz commit b163f46d5ecf48d883ce156e5e5a21a1a9a125c7 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:23 2008 +0200 ide: enhance ide_busy_sleep() * Make ide_busy_sleep() take timeout value as a parameter and also allow use of AltStatus Register if requested with altstatus parameter. Update existing users accordingly. * Convert ide_driveid_update() and actual_try_to_identify() to use ide_busy_sleep(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit c36a7e98846a7a4a1c09b7f148395089bce512d8 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:23 2008 +0200 ide: fix EXABYTENEST handling in probe_for_drive() Fix EXABYTENEST handling in probe_for_drive() (so drive->present is checked for "nested" device) and cleanup enable_nest(). Signed-off-by: Bartlomiej Zolnierkiewicz commit efa402d59e99b7940501ead18a11b3d6604ad720 Author: FUJITA Tomonori Date: Fri Oct 10 22:39:22 2008 +0200 ide-cd: use the new object_is_in_stack() helper Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Cc: Thomas Bogendoerfer Cc: Tejun Heo Cc: Jens Axboe Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 1a7809e3499921a016d203b9ee51a77d3cc1dc98 Author: Linus Torvalds Date: Fri Oct 10 22:39:22 2008 +0200 ide: re-code ide_fixstring() loop to be less evil On Friday 25 July 2008, Linus Torvalds wrote: > > On Fri, 25 Jul 2008, Ben Dooks wrote: > > > > personally, i would much prefer to see the loop being less evil > > like: > > > > for (p = s; p < end; p += 2) > > be16_to_cpus((u16 *)p); > > Well, in this case, the code actually depends on 'p' being back at the > start of the buffer by the end of it all, so it would need some more > changes than that. > > But yes, I applied David's patch, but I _also_ suspect that we would be > better off without code that does horrid things like casts and assignments > inside the function arguments. > > So it would be nice to re-code that loop to be more readable. But due to > the reliance of 'p' being 's' after the loop, the minimal patch would be > something like the appended. > > Bartlomiej - take this or not, I'm not going to commit it - I haven't > tested it, nor do I even have any machines that would trigger it. So this > is more a "maybe something like this" than anything else. From: Linus Torvalds CC: Ben Dooks Cc: David Miller Cc: harvey.harrison@gmail.com Signed-off-by: Bartlomiej Zolnierkiewicz commit 3c619ffd48d7fdb3b17f0df67c4eb4b0bd80e253 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:22 2008 +0200 ide: remove no longer needed ide_drive_t fields Remove ->remap_0_to_1 and ->sect0 (they are always zero now). Signed-off-by: Bartlomiej Zolnierkiewicz commit 3a7d24841ad794ae64c90d7d00d62a83741912aa Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:21 2008 +0200 ide: use ATA_* defines instead of *_STAT and *_ERR ones * ERR_STAT -> ATA_ERR * INDEX_STAT -> ATA_IDX * ECC_STAT -> ATA_CORR * DRQ_STAT -> ATA_DRQ * SEEK_STAT -> ATA_DSC * WRERR_STAT -> ATA_DF * READY_STAT -> ATA_DRDY * BUSY_STAT -> ATA_BUSY * MARK_ERR -> ATA_AMNF * TRK0_ERR -> ATA_TRK0NF * ABRT_ERR -> ATA_ABORTED * MCR_ERR -> ATA_MCR * ID_ERR -> ATA_IDNF * MC_ERR -> ATA_MC * ECC_ERR -> ATA_UNC * ICRC_ERR -> ATA_ICRC * BBD_ERR -> ATA_BBK Also: * ILI_ERR -> ATAPI_ILI * EOM_ERR -> ATAPI_EOM * LFS_ERR -> ATAPI_LFS * CD -> ATAPI_COD * IO -> ATAPI_IO Signed-off-by: Bartlomiej Zolnierkiewicz commit f26b3d75959e9a0e43a2e1e1148c075592746c3d Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:21 2008 +0200 hd: WIN_* -> ATA_CMD_* * Use ATA_CMD_* defines instead of WIN_* ones. * Include directly instead of through . Signed-off-by: Bartlomiej Zolnierkiewicz commit aaaade3f059fa1b57283d4a7c8351a42ec747bf0 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:21 2008 +0200 ide: WIN_* -> ATA_CMD_* * Use ATA_CMD_* defines instead of WIN_* ones. While at it: * EXABYTE_ENABLE_NEXT -> ATA_EXABYTE_ENABLE_NEST * SETFEATURES_{EN,DIS}_WCACHE -> SETFEATURES_WC_{ON,OFF} * SETFEATURES_{EN,DIS}_AAM -> SETFEATURES_AAM_{ON,OFF} * SMART_* -> ATA_SMART_* * Remove stale comment from ide-proc.c. Partially based on earlier work by Chris Wedgwood. Acked-by: Chris Wedgwood Signed-off-by: Bartlomiej Zolnierkiewicz commit a4f19040a3a6cd431efe0a10b9d2e8d5e3904865 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:20 2008 +0200 libata: WIN_* -> ATA_CMD_* Acked-by: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit f41891c134ccdd07583ebd8d4af7fed883375672 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:20 2008 +0200 ide-disk: use ata_id_hpa_enabled() idedisk_supports_hpa() -> ata_id_hpa_enabled(). The latter one also checks validity of words 82 & 85. Signed-off-by: Bartlomiej Zolnierkiewicz commit 8a089c6679a9f1c0a00b7e08554e90b507ec527a Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:20 2008 +0200 ide-disk: use ata_id_wcache_enabled() Replace open-coded check by ata_id_wcache_enabled() (which also checks validity of word 85). Signed-off-by: Bartlomiej Zolnierkiewicz commit dd8f46f64ae66659df3358fad73ed7699aa729dd Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:19 2008 +0200 ide: use ata_id_current_chs_valid() Replace open-coded checks by ata_id_current_chs_valid(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 48fb2688aa67baba373531cc4ed2d9e695983c3f Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:19 2008 +0200 ide: remove drive->driveid * Factor out HDIO_[OBSOLETE,GET]_IDENTITY ioctls handling to ide_get_identity_ioctl(). * Use temporary buffer in ide_get_identity_ioctl() instead of accessing drive->id directly. * Add ide_id_to_hd_driveid() inline to convert raw id into struct hd_driveid format (needed on big-endian). * Use ide_id_to_hd_driveid() in ide_get_identity_ioctl(), cleanup ide_fix_driveid() and switch ide to use use raw id. * Remove no longer needed drive->driveid. This leaves us with 3 users of struct hd_driveid in tree: - arch/um/drivers/ubd_kern.c - drivers/block/xsysace.c - drivers/usb/storage/isd200.c While at it: * Use ata_id_u{32,64}() and ata_id_has_{dma,lba,iordy}() macros. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 4dde4492d850a4c9bcaa92e5bd7f4eebe3e2f5ab Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:19 2008 +0200 ide: make drive->id an union (take 2) Make drive->id an unnamed union so id can be accessed either by using 'u16 *id' or 'struct hd_driveid *driveid'. Then convert all existing drive->id users accordingly (using 'u16 *id' when possible). This is an intermediate step to make ide 'struct hd_driveid'-free. While at it: - Add missing KERN_CONTs in it821x.c. - Use ATA_ID_WORDS and ATA_ID_*_LEN defines. - Remove unnecessary checks for drive->id. - s/drive_table/table/ in ide_in_drive_list(). - Cleanup ide_config_drive_speed() a bit. - s/drive1/dev1/ & s/drive0/dev0/ in ide_undecoded_slave(). v2: Fix typo in drivers/ide/ppc/pmac.c. (From Stephen Rothwell) There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 5b90e990928919ae411a68b865e8a6ecac09a603 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:18 2008 +0200 ide: cleanup ide_fix_driveid() Do all __le16_to_cpu() swapping in one loop. Signed-off-by: Bartlomiej Zolnierkiewicz commit df1f8378c2fd898fa08be5d72283d68c77f519e9 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:18 2008 +0200 ide: cleanup ide_disk_init_mult_count() * Remove superfluous checks for drive->mult_req. * No need to zero drive's fields. * Move the common code out of #ifdef scope. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit f8881000d7cc6b8b520e8fcba95177d2cde1ae36 Author: Bartlomiej Zolnierkiewicz Date: Fri Oct 10 22:39:18 2008 +0200 ide: remove superfluous check from ide_disk_special() This condition is checked by both ide_disk_init_mult_count() and set_multcount() so no need to do it again in ide_disk_special(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 730616b2026838c4535c1daf9b91b118fd7caecf Author: Mark de Wever Date: Fri Oct 10 22:39:17 2008 +0200 ide-tape: Buildfix when IDETAPE_DEBUG_LOG is set to 1. The format specifier for rq->sector didn't specify the proper size and signedness. Borislav Petkov discovered that the signedness for rq->nr_sectors and rq->current_nr_sectors also were incorrect. Signed-off-by: Mark de Wever Acked-by: Borislav Petkov [bart: remove trailing whitespace]