commit 14b395e35d1afdd8019d11b92e28041fad591b71 Merge: 734b397... 5108b27... Author: Linus Torvalds Date: Sun Jul 20 21:21:46 2008 -0700 Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux * 'for-2.6.27' of git://linux-nfs.org/~bfields/linux: (51 commits) nfsd: nfs4xdr.c do-while is not a compound statement nfsd: Use C99 initializers in fs/nfsd/nfs4xdr.c lockd: Pass "struct sockaddr *" to new failover-by-IP function lockd: get host reference in nlmsvc_create_block() instead of callers lockd: minor svclock.c style fixes lockd: eliminate duplicate nlmsvc_lookup_host call from nlmsvc_lock lockd: eliminate duplicate nlmsvc_lookup_host call from nlmsvc_testlock lockd: nlm_release_host() checks for NULL, caller needn't file lock: reorder struct file_lock to save space on 64 bit builds nfsd: take file and mnt write in nfs4_upgrade_open nfsd: document open share bit tracking nfsd: tabulate nfs4 xdr encoding functions nfsd: dprint operation names svcrdma: Change WR context get/put to use the kmem cache svcrdma: Create a kmem cache for the WR contexts svcrdma: Add flush_scheduled_work to module exit function svcrdma: Limit ORD based on client's advertised IRD svcrdma: Remove unused wait q from svcrdma_xprt structure svcrdma: Remove unneeded spin locks from __svc_rdma_free svcrdma: Add dma map count and WARN_ON ... commit 734b397cd14f3340394a8dd3266bec97d01f034b Merge: 702beb8... e6b5163... Author: Linus Torvalds Date: Sun Jul 20 21:19:17 2008 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: gpu: re-order GPU subdirectory vs char for AGP vs DRM startup. commit 702beb87d6b4e08cca394b210679e5d7c2ac9383 Author: David Miller Date: Sun Jul 20 18:17:02 2008 -0700 ipv6: Fix warning in addrconf code. Reported by Linus. Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds commit d1671a9c15f55a1475d41269494518e348880c33 Merge: ae0645a... 3a682fb... Author: Linus Torvalds Date: Sun Jul 20 21:17:20 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: pkt_sched: Fix build with NET_SCHED disabled. commit ae0645a451b02ad35c520b01177b70ebd59c91ab Merge: f894d18... 99cdb0c... Author: Linus Torvalds Date: Sun Jul 20 21:16:27 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: let asic3 use mem resource instead of bus_shift mfd: remove DS1WM register definitions from asic3.h mfd: add ASIC3_CONFIG_GPIO templates mfd: fix the asic3 irq demux code mfd: asic3 should depend on gpiolib mfd: fix asic3 config array initialisation mfd: move asic3 probe functions into __init section mfd: Use uppercase only for asic3 macros and defines mfd: use dev_* macros for asic3 debugging mfd: New asic3 gpio configuration code mfd: asic3 children platform data removal mfd: asic3 gpiolib support commit f894d18380e7e7ff05f6622ccb75d2881922c6e9 Merge: d13ff05... d20b274... Author: Linus Torvalds Date: Sun Jul 20 21:14:42 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (277 commits) V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms. V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on" V4L/DVB (8390): videodev: add comment and remove magic number. V4L/DVB (8389): videodev: simplify get_index() V4L/DVB (8387): Some cosmetic changes V4L/DVB (8381): ov7670: fix compile warnings V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name. V4L/DVB (8379): saa7127: Make device detection optional V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver. ... commit d13ff0559fea73f237a01669887d2c10e11d7662 Merge: f076ab8... cb7f39d... Author: Linus Torvalds Date: Sun Jul 20 21:14:00 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: (21 commits) [MIPS] Remove unused maltasmp.h. [MIPS] Remove unused saa9730_uart.h. [MIPS] Rename MIPS sys_pipe syscall entry point to something MIPS-specific. [MIPS] 32-bit compat: Delete unused sys_truncate64 and sys_ftruncate64. [MIPS] TXx9: Fix some sparse warnings [MIPS] TXx9: Add 64-bit support [MIPS] TXx9: Cleanups for 64-bit support [MIPS] Cobalt: Fix I/O port resource range [MIPS] don't leak setup_early_printk() in userspace header [MIPS] Remove include/asm-mips/mips-boards/sead{,int}.h [MIPS] Remove asm-mips/mips-boards/atlas{,int}.h [MIPS] mips/sgi-ip22/ip28-berr.c: fix the build [MIPS] TXx9: Miscellaneous build fixes [MIPS] Routerboard 532: Support for base system [MIPS] IP32: Use common SGI button driver [MIPS] IP22: Use common SGI button driver [MIPS] IP22, IP28: Fix merge bug [MIPS] Tinker with constraints in to fix build error. [MIPS] Add missing prototypes to asm/page.h [MIPS] Fix missing prototypes in asm/fpu.h ... commit f076ab8d048f152b968bb1c6313fed88abb037fe Merge: db6d8c7... 597a5f5... Author: Linus Torvalds Date: Sun Jul 20 21:13:26 2008 -0700 Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (70 commits) KVM: Adjust smp_call_function_mask() callers to new requirements KVM: MMU: Fix potential race setting upper shadow ptes on nonpae hosts KVM: x86 emulator: emulate clflush KVM: MMU: improve invalid shadow root page handling KVM: MMU: nuke shadowed pgtable pages and ptes on memslot destruction KVM: Prefix some x86 low level function with kvm_, to avoid namespace issues KVM: check injected pic irq within valid pic irqs KVM: x86 emulator: Fix HLT instruction KVM: Apply the kernel sigmask to vcpus blocked due to being uninitialized KVM: VMX: Add ept_sync_context in flush_tlb KVM: mmu_shrink: kvm_mmu_zap_page requires slots_lock to be held x86: KVM guest: make kvm_smp_prepare_boot_cpu() static KVM: SVM: fix suspend/resume support KVM: s390: rename private structures KVM: s390: Set guest storage limit and offset to sane values KVM: Fix memory leak on guest exit KVM: s390: dont allocate dirty bitmap KVM: move slots_lock acquision down to vapic_exit KVM: VMX: Fake emulate Intel perfctr MSRs KVM: VMX: Fix a wrong usage of vmcs_config ... commit 3a682fbd732d3d27bec722a923952b0938e8a404 Author: David S. Miller Date: Sun Jul 20 18:13:01 2008 -0700 pkt_sched: Fix build with NET_SCHED disabled. The stab bits can't be referenced uniless the full packet scheduler layer is enabled. Reported by Stephen Rothwell. Signed-off-by: David S. Miller commit db6d8c7a4027b48d797b369a53f8470aaeed7063 Merge: 3a53337... fb65a7c... Author: Linus Torvalds Date: Sun Jul 20 17:43:29 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: (1232 commits) iucv: Fix bad merging. net_sched: Add size table for qdiscs net_sched: Add accessor function for packet length for qdiscs net_sched: Add qdisc_enqueue wrapper highmem: Export totalhigh_pages. ipv6 mcast: Omit redundant address family checks in ip6_mc_source(). net: Use standard structures for generic socket address structures. ipv6 netns: Make several "global" sysctl variables namespace aware. netns: Use net_eq() to compare net-namespaces for optimization. ipv6: remove unused macros from net/ipv6.h ipv6: remove unused parameter from ip6_ra_control tcp: fix kernel panic with listening_get_next tcp: Remove redundant checks when setting eff_sacks tcp: options clean up tcp: Fix MD5 signatures for non-linear skbs sctp: Update sctp global memory limit allocations. sctp: remove unnecessary byteshifting, calculate directly in big-endian sctp: Allow only 1 listening socket with SO_REUSEADDR sctp: Do not leak memory on multiple listen() calls sctp: Support ipv6only AF_INET6 sockets. ... commit 3a533374283aea50eab3976d8a6d30532175f009 Merge: fb6624e... d17ffb4... Author: Linus Torvalds Date: Sun Jul 20 17:37:46 2008 -0700 Merge branch 'for-linus' of git://www.jni.nu/cris * 'for-linus' of git://www.jni.nu/cris: [CRISv10] Clean up compressed/misc.c [CRISv10] Correct whitespace damage. [CRIS] Correct definition of subdirs for install_headers. [CRIS] Correct image makefiles to allow using a separate OBJ-directory. [CRIS] Build fixes for compressed and rescue images for v10 and v32: It looks at least odd to apply spin_unlock to a mutex. cris: compile fixes for 2.6.26-rc5 commit fb6624ebd912e3d6907ca6490248e73368223da9 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:36 2008 +0200 initrd: Fix virtual/physical mix-up in overwrite test On recent kernels, I get the following error when using an initrd: | initrd overwritten (0x00b78000 < 0x07668000) - disabling it. My Amiga 4000 has 12 MiB of RAM at physical address 0x07400000 (virtual 0x00000000). The initrd is located at the end of RAM: 0x00b78000 - 0x00c00000 (virtual). The overwrite test compares the (virtual) initrd location to the (physical) first available memory location, which fails. This patch converts initrd_start to a page frame number, so it can safely be compared with min_low_pfn. Before the introduction of discontiguous memory support on m68k (12d810c1b8c2b913d48e629e2b5c01d105029839), min_low_pfn was just left untouched by the m68k-specific code (zero, I guess), and everything worked fine. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 18c993629a5a5938a032f04a698d15122550593d Author: Akinobu Mita Date: Thu Jul 17 21:16:35 2008 +0200 dio: use dio_match_device() in dio_bus_match() dio_bus_match() can use dio_match_device(). Signed-off-by: Akinobu Mita Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 93026e217b46b70f9719caf69e716fa3bbe1d20c Author: Julia Lawall Date: Thu Jul 17 21:16:34 2008 +0200 arch/m68k/mm/sun3mmu.c: Eliminate NULL test and memset after alloc_bootmem As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E - memset(E,0,E1); // Signed-off-by: Julia Lawall Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 7b6b948fc0d60a704c15b1cd72345a98e759dd62 Author: Julia Lawall Date: Thu Jul 17 21:16:33 2008 +0200 arch/m68k/mm/motorola.c: Eliminate NULL test and memset after alloc_bootmem As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E - memset(E,0,E1); // Signed-off-by: Julia Lawall Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 3fadd06ebcbff9b0a7c90f68d81250f39bf31db1 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:32 2008 +0200 m68k/Apollo: remove the unused APOLLO_ELPLUS option Looking at older kernel sources the APOLLO_ELPLUS option was added somewhere during kernel 2.1, but even kernel 2.2.0 does not contain any driver that would be enabled through it... Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 7ccaee5cadd7a771773bbb878e139697511ebdde Author: Adrian Bunk Date: Thu Jul 17 21:16:31 2008 +0200 m68k/Atari: remove the dead ATARI_SCC{,_DMA} options It seems the driver was removed back in kernel 2.3 but the options were forgotten. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 62bc654e794feb5242c31a59dcc36bab64f7d917 Author: Adrian Bunk Date: Thu Jul 17 21:16:30 2008 +0200 m68k/Mac: remove the unused ADB_KEYBOARD option When the driver was removed back in 2002 the option was forgotten. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 635c0a217425f6f37422b85bcc88a7af9efc457c Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:29 2008 +0200 m68k/apollo: Add missing call to apollo_parse_bootinfo() Add the missing call to apollo_parse_bootinfo(), which had been lost from a big Apollo support patch by Peter De Schrijver in 1999. Thanks to Adrian Bunk for noticing! Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a594409a2160070b2185e77b33232cf73a9151a5 Author: Adrian Bunk Date: Thu Jul 17 21:16:28 2008 +0200 m68k: remove stale ARCH_SUN4 #define m68k: remove stale ARCH_SUN4 #define Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 07b8125949de66b6552966de8d4280c3a8620359 Author: Adrian Bunk Date: Thu Jul 17 21:16:27 2008 +0200 m68k/sun3/: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global code static: - config.c: sun3_bootmem_alloc() - config.c: sun3_sched_init() - dvma.c: dvma_page() - idprom.c: struct Sun_Machines[] - mmu_emu.c: struct ctx_alloc[] - sun3dvma.c: iommu_use[] - sun3ints.c: led_pattern[] - remove the unused sbus.c Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 22deb527ce5d13e07652f81a53032aa0214ea8c3 Author: Adrian Bunk Date: Thu Jul 17 21:16:26 2008 +0200 m68k/q40/config.c: make functions static This patch makes the following needlessly global functions static: - q40_reset() - q40_halt() - q40_disable_irqs() - q40_gettimeoffset() - q40_hwclk() - q40_get_ss() - q40_set_clock_mmss() Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8dfbdf4abad6e5a7bbd097bf7e2c0ec41e0c54b4 Author: Adrian Bunk Date: Thu Jul 17 21:16:25 2008 +0200 m68k/mac/: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global code (always) static: - baboon.c: struct baboon - baboon.c: baboon_irq() - config.c: mac_orig_videoaddr - config.c: mac_identify() - config.c: mac_report_hardware() - config.c: mac_debug_console_write() - config.c: mac_sccb_console_write() - config.c: mac_scca_console_write() - config.c: mac_init_scc_port() - oss.c: oss_irq() - oss.c: oss_nubus_irq() - psc.c: psc_debug_dump() - psc.c: psc_dma_die_die_die() - via.c: rbv_clear - remove the unused bootparse.c - #if 0 the following unused functions: - config.c: mac_debugging_short() - config.c: mac_debugging_long() - remove the following unused code: - config.c: mac_bisize - config.c: mac_env - config.c: mac_SCC_init_done - config.c: mac_SCC_reset_done - config.c: mac_init_scca_port() - config.c: mac_init_sccb_port() Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 5575d0a3c9676b2886adad67dd4b2ac126a49f1f Author: Adrian Bunk Date: Thu Jul 17 21:16:24 2008 +0200 m68k/atari/debug.c: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global functions (always) static: - atari_mfp_console_write() - atari_scc_console_write() - atari_midi_console_write() - atari_init_mfp_port() - atari_init_scc_port() - atari_init_midi_port() - #if 0 the following unused functions: - atari_mfp_console_wait_key() - atari_scc_console_wait_key() - atari_midi_console_wait_key() - remove the following unused variables: - atari_MFP_init_done - atari_SCC_init_done Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 0795dbcc4c4c93a929463957993c04cf5fec346c Author: Adrian Bunk Date: Thu Jul 17 21:16:23 2008 +0200 m68k/amiga/: possible cleanups This patch contains the following possible cleanups: - amiints.c: add a proper prototype for amiga_init_IRQ() in include/asm-m68k/amigaints.h - make the following needlessly global code static: - config.c: amiga_model - config.c: amiga_psfreq - config.c: amiga_serial_console_write() - #if 0 the following unused functions: - config.c: amiga_serial_puts() - config.c: amiga_serial_console_wait_key() - config.c: amiga_serial_gets() - remove the following unused variable: - config.c: amiga_masterclock Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 880e5e212ec5ab12411e40c78bd5ac501e9caeed Author: Adrian Bunk Date: Thu Jul 17 21:16:22 2008 +0200 export c2p This patch fixes the following build error: <-- snip --> .. Building modules, stage 2. MODPOST 1203 modules ERROR: "c2p" [drivers/video/amifb.ko] undefined! .. make[2]: *** [__modpost] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8468afc039f03837066132be14cdd9e5fa726f0b Author: Adrian Bunk Date: Thu Jul 17 21:16:21 2008 +0200 export amiga_vblank This patch fixes the following build error: <-- snip --> .. Building modules, stage 2. MODPOST 1203 modules ERROR: "amiga_vblank" [drivers/video/amifb.ko] undefined! .. make[2]: *** [__modpost] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8b54b6135a3e6d6e7c7967de7b408fd89afb0333 Author: Adrian Bunk Date: Thu Jul 17 21:16:20 2008 +0200 drivers/video/c2p.c: add MODULE_LICENSE This patch adds the missing MODULE_LICENSE("GPL"). Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit da8513c9b84317d1a2071644b6ccf734463d4849 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:19 2008 +0200 atafb: Register Atari-specific video modes with sysfs Register the Atari-specific video modes with sysfs, so you can see them in /sys/class/graphics/fb0/modes and change the video mode by writing to /sys/class/graphics/fb0/mode. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit db3e5289f51b5d02767fa2951d5f0375efdba35c Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:18 2008 +0200 amifb: Register Amiga-specific video modes with sysfs Register the Amiga-specific video modes with sysfs, so you can see them in /sys/class/graphics/fb0/modes and change the video mode by writing to /sys/class/graphics/fb0/mode. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit fa7f28939634c2ea36817a0c3dbd8d84972c1488 Author: akinobu.mita@gmail.com Date: Thu Jul 17 21:16:17 2008 +0200 zorro: use memory_read_from_buffer zorro: use memory_read_from_buffer Signed-off-by: Akinobu Mita Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a6a26a3e652671a783563f1e9697c68bd19c40fc Author: Robert P. J. Day Date: Thu Jul 17 21:16:16 2008 +0200 ZORRO: Replace deprecated __initcall with equivalent device_initcall. ZORRO: Replace deprecated __initcall with equivalent device_initcall. Signed-off-by: Robert P. J. Day Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit d33b4432e634246eef00ef4d425939c253f70dd6 Author: Adrian Bunk Date: Thu Jul 17 21:16:15 2008 +0200 m68k: remove AP1000 code Unless I miss something that's code for a sparc machine even the sparc code no longer supports that got copied to m68k when these files were copied. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit b739912efc02f80cc4dc5eaef07e5bc7eafee1b0 Author: Adrian Bunk Date: Thu Jul 17 21:16:14 2008 +0200 m68k: make multi_defconfig the default defconfig It seems to match the intention behind multi_defconfig to make it the default defconfig. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a0c14d28df8fcf939a8efd9332ace164e9f931fb Author: Mathieu Desnoyers Date: Thu Jul 17 21:16:13 2008 +0200 Stringify support commas > This is a no-no for those archs that still use -traditional. > > I dunno if this is a problem for you at the moment and the > > right fix is anyway to nuke -traditional. > > > > Sam Signed-off-by: Mathieu Desnoyers Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit edfd92f67eec1bdd905dd7841416eaf945a5b92f Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:12 2008 +0200 m68k: Allow no CPU/platform type for allnoconfig Allow no CPU/platform type for allnoconfig - Provide a dummy value for FPSTATESIZE if no CPU type was selected - Provide a dummy value for NR_IRQS if no platform type was selected - Warn the user if no CPU or platform type was selected Note: you still cannot build an allnoconfig kernel, as CONFIG_SWAP=n doesn't build and we cannot easily fix that (http://groups.google.com/group/linux.kernel/browse_thread/thread/d430c78b07e1827b) Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 97d26e73d729c8d967bc5eb9086321956c444dd4 Author: Cyrill Gorcunov Date: Thu Jul 17 21:16:11 2008 +0200 m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro This patch includes page.h header into linker script that allow us to use PAGE_SIZE macro instead of numeric constant Signed-off-by: Cyrill Gorcunov Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit e945b568e28b42de893ef24989372f0219501d32 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:10 2008 +0200 m68k: Return -ENODEV if no device is found According to the tests in do_initcalls(), the proper error code in case no device is found is -ENODEV, not -ENXIO or -EIO. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 038eddd9acf34e8202b31af3ee9eb48179114323 Author: Paulius Zaleckas Date: Thu Jul 17 21:16:09 2008 +0200 ariadne: use netstats in net_device structure Use net_device_stats from net_device structure instead of local. Signed-off-by: Paulius Zaleckas Signed-off-by: Geert Uytterhoeven Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit f30828a6745281edda735f642b5f814e1123ecd3 Author: Adrian Bunk Date: Thu Jul 17 21:16:08 2008 +0200 m68k: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit f7df406dce01dfd30d7e0c570a928bcfeff03142 Merge: 5e248ac... a6795e9... Author: Linus Torvalds Date: Sun Jul 20 17:17:52 2008 -0700 Merge branch 'configfs-fixup-ptr-error' of git://oss.oracle.com/git/jlbec/linux-2.6 * 'configfs-fixup-ptr-error' of git://oss.oracle.com/git/jlbec/linux-2.6: configfs: Allow ->make_item() and ->make_group() to return detailed errors. Revert "configfs: Allow ->make_item() and ->make_group() to return detailed errors." commit 5e248ac9a5c465b356b936030d5a2e80887eb266 Author: Thomas Gleixner Date: Fri Jul 18 02:07:02 2008 +0200 APCI: revert another duplicated patch commit d1857056904d5f313f11184fcfa624652ff9620a ("ACPI: don't walk tables if ACPI was disabled") is another superfluous duplicate commit caused by git -> quilt -> git conversion. Revert it. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 392798a17b6afba5928bc577aeb7bc83a1585534 Author: Thomas Gleixner Date: Fri Jul 18 01:11:38 2008 +0200 APCI: revert duplicated patch commit 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 ("dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.") was merged between 2.6.26-rc8 and -rc9) Due to rebasing the ACPI tree via quilt the same patch got applied again via commit cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca ("dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.") Revert it, as it is obviously bogus. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 4e4f64da58bc71a139722bb5013adda0f7ca4e78 Author: Alan Cox Date: Wed Jul 16 21:57:28 2008 +0100 Fix strip driver back up for ldisc/tty changes Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 44b7d1b37f786c61d0e382b6f72f605f73de284b Author: Alan Cox Date: Wed Jul 16 21:57:18 2008 +0100 tty: add more tty_port fields Move more bits into the tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 593573bc55c9e1999b9679da4e477c0220a6fbbd Author: Alan Cox Date: Wed Jul 16 21:57:10 2008 +0100 termios: Termios defines for other platforms Fix up the termios of the people who have not yet got with the program Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 77451e53e0a509a98eda272567869cfe96431ba9 Author: Alan Cox Date: Wed Jul 16 21:57:02 2008 +0100 cyclades: use tty_port Switch cyclades to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit ae67751785dae388beb31fc24d14870d0d4669d9 Author: Alan Cox Date: Wed Jul 16 21:56:54 2008 +0100 tty: Clean up tiocmset Reverse the order of one test and it gets much more readable Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8fb06c771399b8d51d724756411108e9abe2a85a Author: Alan Cox Date: Wed Jul 16 21:56:46 2008 +0100 synclink: use tty_port Switch the synclink ports to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f8ae47641611fcdf175ab8bbe89054731b16971d Author: Alan Cox Date: Wed Jul 16 21:56:37 2008 +0100 stallion: use tty_port Switch the stallion driver to use the tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b1d1619b4a53072f19e41b1def71fd223fc5d780 Author: Haavard Skinnemoen Date: Wed Jul 16 21:56:29 2008 +0100 atmel_serial: Fix tty_port breakage The tty pointer has been moved into a tty_port field, so we need to use ->info->port.tty instead of just ->info->tty. Fixes these build errors: David Brownell wrote: > drivers/serial/atmel_serial.c: In function 'atmel_rx_from_ring': > drivers/serial/atmel_serial.c:665: error: 'struct uart_info' has no member named 'tty' > drivers/serial/atmel_serial.c: In function 'atmel_rx_from_dma': > drivers/serial/atmel_serial.c:672: error: 'struct uart_info' has no member named 'tty' > drivers/serial/atmel_serial.c: In function 'atmel_startup': > drivers/serial/atmel_serial.c:797: error: 'struct uart_info' has no member named 'tty' > make[2]: *** [drivers/serial/atmel_serial.o] Error 1 Signed-off-by: Haavard Skinnemoen Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e60a10844879794c7b592acf123cbf9ea0e2c0e7 Author: Alan Cox Date: Wed Jul 16 21:56:18 2008 +0100 rocket: use tty_port Switch the rocketport to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0ad9e7d1d6bf7829912be50d24d4f3f473006326 Author: Alan Cox Date: Wed Jul 16 21:56:10 2008 +0100 mxser: use tty_port Switch mxser to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9de6a51fee08f9e7020074738150441305e83af2 Author: Alan Cox Date: Wed Jul 16 21:56:02 2008 +0100 moxa: use tty_port Switch MOXA to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b02f5ad6a3ff5a1ee2a7b8ec6eee338de553b060 Author: Alan Cox Date: Wed Jul 16 21:55:53 2008 +0100 istallion: use tty_port Switch istallion to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f1d03228ea85877584d41bccf62841e7ca47043c Author: Alan Cox Date: Wed Jul 16 21:55:45 2008 +0100 isicom: use tty_port Switch isicom to use a tty_port structure for some fields Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d99101fda034922d5ecaa735910e9930f076325f Author: Alan Cox Date: Wed Jul 16 21:55:37 2008 +0100 riscom8: remove bogus checks Chris Malley posted a patch removing a NULL check in the riscom8 driver. Further analysis shows that even more of the tests are irrelevant so we can delete lots of stuff Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 85f8f81052eeb3eac1242731a8777caacfef0aa9 Author: Alan Cox Date: Wed Jul 16 21:55:29 2008 +0100 riscom8: use tty_port Switch riscom8 to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b5391e29f428d11755ca2c91074c6db6f5c69d7c Author: Alan Cox Date: Wed Jul 16 21:55:20 2008 +0100 gs: use tty_port Switch drivers using the old "generic serial" driver to use the tty_port structures Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 4982d6b37a5ccebe6c2af79970c7a15c1939243a Author: Alan Cox Date: Wed Jul 16 21:55:11 2008 +0100 esp: use tty_port Switch esp to use the new tty_port structures Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 52d417388d154f68f8ab753de03b1fba1814de81 Author: Alan Cox Date: Wed Jul 16 21:55:02 2008 +0100 epca: use tty_port Switch the EPCA driver to include and begin using a tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 7a4d29f426f17479395980ded8fa5e3bdd6d94e4 Author: Alan Cox Date: Wed Jul 16 21:54:54 2008 +0100 tty.h: clean up Coding style clean up and white space tidy Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a88487c79bfefb715030c5baa68fbedc1b8732e8 Author: Takashi Iwai Date: Wed Jul 16 21:54:42 2008 +0100 Fix compile errors in SGI console drivers (linux-next tree) The below is the patch to replace blindly all possible places, including Jack's fixes. Signed-off-by: Takashi Iwai (Reviewed and checked rather than blindly added) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b1ca7e7a0b35874b2a9cae60f8f5b78df575faa7 Author: Jack Steiner Date: Wed Jul 16 21:54:31 2008 +0100 - Fix compile errors in SGI console drivers (linux-next tree) Fix compile errors in SGI console drivers caused by changes to the tty_port structures in the linux-next tree. Signed-off-by: Jack Steiner Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 87c25ef0a41ad7a8249cd3009bf65deb700d4ee3 Author: Stephen Rothwell Date: Wed Jul 16 21:54:22 2008 +0100 ttydev: fix pamc_zilog for tty pointer move Today's linux-next build (powerpc allyesconfig) failed like this: drivers/serial/pmac_zilog.c: In function 'pmz_receive_chars': drivers/serial/pmac_zilog.c:245: error: 'struct uart_info' has no member named 'tty' drivers/serial/pmac_zilog.c:250: error: 'struct uart_info' has no member named 'tty' I applied the patch below (which builds but may, or may not, be correct). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ Signed-off-by: Stephen Rothwell Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 2f7a697a13a189a7ef43a9b6bfc3fc6e359d96fb Author: Stephen Rothwell Date: Wed Jul 16 21:54:11 2008 +0100 ttydev: fix pamc_zilog for tty pointer move Today's linux-next build (sparc64 defconfig) failed like this: drivers/serial/sunhv.c: In function `receive_chars': drivers/serial/sunhv.c:188: error: structure has no member named `tty' drivers/serial/sunsu.c: In function `receive_chars': drivers/serial/sunsu.c:314: error: structure has no member named `tty' drivers/serial/sunsab.c: In function `receive_chars': drivers/serial/sunsab.c:121: error: structure has no member named `tty' I applied the following patch (which, again, may not be correct). Signed-off-by: Stephen Rothwell Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 34492b5834ede63d896c93ccba9a4657a8435dc2 Author: David Howells Date: Wed Jul 16 21:54:01 2008 +0100 MN10300: Fix MN10300's serial port driver to get at its tty_struct Fix MN10300's serial port driver to get at its tty_struct as this moved from struct uart_info into struct tty_port in patch: Signed-off-by: David Howells Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit df4f4dd429870f435f8d5d9d561db029a29f063b Author: Alan Cox Date: Wed Jul 16 21:53:50 2008 +0100 serial: use tty_port Switch the serial_core based drivers to use the new tty_port structure. We can't quite use all of it yet because of the dynamically allocated extras in the serial_core layer. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 6f67048cd010afe19d79d821f16055d9c704c6f0 Author: Alan Cox Date: Wed Jul 16 21:53:41 2008 +0100 tty: Introduce a tty_port common structure Every tty driver has its own concept of a port structure and because they all differ we cannot extract commonality. Begin fixing this by creating a structure drivers can elect to use so that over time we can push fields into this and create commonality and then introduce common methods. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d87a6d951c6c09d191d9c10903deb3cc353fcd2c Author: Adrian Bunk Date: Wed Jul 16 21:53:31 2008 +0100 drivers/serial/: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time in comments, printk's and MODULE_DESCRIPTION's (no printk's or MODULE_DESCRIPTION's are completely removed). While doing this I also found and fixed a missing \n in a printk in m32r_sio.c Signed-off-by: Adrian Bunk Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 59247ca2fdca9691a6a7df532a830e3a133d9962 Author: Adrian Bunk Date: Wed Jul 16 21:53:22 2008 +0100 drivers/char/rio/: remove VCS tags This patch removes ancient VCS tags (either protected by #ifdef SCCS_LABELS or commented out). Signed-off-by: Adrian Bunk Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a352def21a642133758b868c71bee12ab34ad5c5 Author: Alan Cox Date: Wed Jul 16 21:53:12 2008 +0100 tty: Ldisc revamp Move the line disciplines towards a conventional ->ops arrangement. For the moment the actual 'tty_ldisc' struct in the tty is kept as part of the tty struct but this can then be changed if it turns out that when it all settles down we want to refcount ldiscs separately to the tty. Pull the ldisc code out of /proc and put it with our ldisc code. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e1e5770bb63fb9d71619a68f52cb0ba4b2ae58a6 Author: Jiri Slaby Date: Wed Jul 16 21:52:56 2008 +0100 tty: isicom, enable/disable pci device Don't forget to enable and disable PCI devices. The device might be unusable without that. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9afd561acabe5059ff16d163a176e2350269aba5 Author: Haavard Skinnemoen Date: Wed Jul 16 21:52:46 2008 +0100 Subject: [PATCH 2/2] atmel_serial: Implement flush_buffer() hook Avoid dumping garbage to the serial port when the tty is flushed. This tends to happen when rebooting from a serial console. Signed-off-by: Haavard Skinnemoen Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 6bb0e3a59a089e23eecc0af3b6f6012b2a9affba Author: Haavard Skinnemoen Date: Wed Jul 16 21:52:36 2008 +0100 Subject: [PATCH 1/2] serial: Add flush_buffer() operation to uart_ops Serial drivers using DMA (like the atmel_serial driver) tend to get very confused when the xmit buffer is flushed and nobody told them. They also tend to spew a lot of garbage since the DMA engine keeps running after the buffer is flushed and possibly refilled with unrelated data. This patch adds a new flush_buffer operation to the uart_ops struct, along with a call to it from uart_flush_buffer() right after the xmit buffer has been cleared. The driver can implement this in order to syncronize its internal DMA state with the xmit buffer when the buffer is flushed. Signed-off-by: Haavard Skinnemoen Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 15648f154a8faea97cbe931e189cf0a57fd066f4 Author: Alan Cox Date: Wed Jul 16 21:52:25 2008 +0100 simserial: Fix up for ldisc changes Noted by Tony Luck although I've done the patches differently and also removed some other bogus oddments. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e6b51632b3579d96ce5aa1b3efdeceedd2921a2c Author: Dave Airlie Date: Mon Jul 21 08:42:36 2008 +1000 gpu: re-order GPU subdirectory vs char for AGP vs DRM startup. Signed-off-by: Dave Airlie commit 99cdb0c8c5e0e43652d25951a85bac82a1231591 Author: Philipp Zabel Date: Thu Jul 10 02:17:02 2008 +0200 mfd: let asic3 use mem resource instead of bus_shift The bus_shift parameter in platform_data is not needed as we can tell the driver with the IOMEM_RESOURCE whether the ASIC is located on a 16bit or 32bit memory bus. The htc-egpio driver uses a more descriptive bus_width parameter, but for drivers where the register map size fixed, we don't even need this. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 279cac484e55317456900fe3567c7cb5bd46fd5f Author: Philipp Zabel Date: Thu Jul 10 02:16:27 2008 +0200 mfd: remove DS1WM register definitions from asic3.h There is a dedicated ds1wm driver, no need to duplicate this information here. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 4a67b528e0be5d855b1a7bb71ec769d954765f6c Author: Philipp Zabel Date: Thu Jul 3 12:27:32 2008 +0200 mfd: add ASIC3_CONFIG_GPIO templates As ASIC3 GPIO alternate function configuration is expected to be similar for several devices, it is convenient to define descriptive macros. This patch is inspired by the PXA MFP configuration, the alternate functions were observed on hx4700 and blueangel. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit de0d23c12c42317c273919b597f6822af2102e55 Author: Philipp Zabel Date: Thu Jul 3 11:08:27 2008 +0200 mfd: fix the asic3 irq demux code Wrong irq numbers were given to desc->handle_irq, which on some devices caused endless loops (asic3_irq_demux calling itself, basically). Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 30250b457f30ca655d37ad1a1587221ff6eefc91 Author: Samuel Ortiz Date: Tue Jun 24 23:37:09 2008 +0200 mfd: asic3 should depend on gpiolib Now that asic3 implements the gpiolib API, it should depend on it at build time. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 786bef3768a6ea1070526983b20e316c4eacd854 Author: Philipp Zabel Date: Tue Jun 24 01:31:24 2008 +0200 mfd: fix asic3 config array initialisation Our memset length was incorrect. Tested-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 065032f61bd9acdb843766da3149de12eaf87c0b Author: Philipp Zabel Date: Sat Jun 21 00:51:38 2008 +0200 mfd: move asic3 probe functions into __init section Potentially free some memory by moving the _probe functions into __init. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 3b8139f8b1457af7b5295d97050b3f9a2545a17a Author: Samuel Ortiz Date: Fri Jun 20 11:12:21 2008 +0200 mfd: Use uppercase only for asic3 macros and defines Let's be consistent and use uppercase only, for both macro and defines. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 24f4f2eef2714bddd6fdb823be53fc2ee69699e0 Author: Samuel Ortiz Date: Fri Jun 20 11:11:19 2008 +0200 mfd: use dev_* macros for asic3 debugging We replace the various printks, and use the dev_* macros instead. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 3b26bf17226f66bfd6cd4e36ac81f83fe994043a Author: Samuel Ortiz Date: Fri Jun 20 11:09:51 2008 +0200 mfd: New asic3 gpio configuration code The ASIC3 GPIO configuration code is a bit obscure and hardly readable. This patch changes it so that it is now more readable and understandable, by being more explicit. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 1effe5bc6cfbac4506d7944d68dadbd29ad62645 Author: Samuel Ortiz Date: Fri Jun 20 11:07:39 2008 +0200 mfd: asic3 children platform data removal Platform devices should be dynamically allocated, and each supported device should have its own platform data. For now we just remove this buggy code. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 6f2384c4bdd4be3dc1e5d22ed5e6f0c3076fda60 Author: Samuel Ortiz Date: Fri Jun 20 11:02:19 2008 +0200 mfd: asic3 gpiolib support ASIC3 is, among other things, a GPIO extender. We should thus have it supporting the current gpiolib API. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit fb65a7c091529bfffb1262515252c0d0f6241c5c Author: David S. Miller Date: Sun Jul 20 10:18:44 2008 -0700 iucv: Fix bad merging. Noticed by Stephen Rothwell. Signed-off-by: David S. Miller commit cb7f39d2bc5a20615d016dd86fca0fd233c13b5d Author: Yoichi Yuasa Date: Sun Jul 20 22:03:32 2008 +0900 [MIPS] Remove unused maltasmp.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 3d739f2daaed442f5bee9da2164757401ae4a417 Author: Yoichi Yuasa Date: Sun Jul 20 22:01:06 2008 +0900 [MIPS] Remove unused saa9730_uart.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 8213bbf9c1c0009872a3278aa7a83ec8f3508195 Author: Ralf Baechle Date: Sun Jul 20 13:16:46 2008 +0100 [MIPS] Rename MIPS sys_pipe syscall entry point to something MIPS-specific. Signed-off-by: Ralf Baechle commit 4914ad4a9f2d484a68422700ba8493db73c7c411 Author: Ralf Baechle Date: Sun Jul 20 11:34:39 2008 +0100 [MIPS] 32-bit compat: Delete unused sys_truncate64 and sys_ftruncate64. Signed-off-by: Ralf Baechle commit e0eb730757665d7e8ec0e79d9042a9311f3edb7e Author: Atsushi Nemoto Date: Sat Jul 19 01:51:52 2008 +0900 [MIPS] TXx9: Fix some sparse warnings Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 94a4c32939dede9328c6e4face335eb8441fc18d Author: Atsushi Nemoto Date: Sat Jul 19 01:51:47 2008 +0900 [MIPS] TXx9: Add 64-bit support SYS_SUPPORTS_64BIT_KERNEL is enabled for RBTX4927/RBTX4938, but actually it was broken for long time (or from the beginning). Now it should work. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 255033a9bb900a06c9a7798908ce12557d24fb66 Author: Atsushi Nemoto Date: Sat Jul 19 01:51:41 2008 +0900 [MIPS] TXx9: Cleanups for 64-bit support * Unify (and fix) mem_tx4938.c and mem_tx4927.c * Simplify prom_init * Kill volatiles and unused definitions for tx4927.h and tx4938.h Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b5d5accc7a2eb41f43ef346f3b258ba2f6342a1c Author: Yoichi Yuasa Date: Fri Jul 18 23:03:15 2008 +0900 [MIPS] Cobalt: Fix I/O port resource range LCD and buttons don't use I/O port space. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5f15d378763e88c361364c0d0ad256d523f2d72f Author: Adrian Bunk Date: Wed Jul 16 19:26:15 2008 +0300 [MIPS] don't leak setup_early_printk() in userspace header Our userspace headers shouldn't contain prototypes of in-kernel functions. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit f113c5eda22c349a163ea17ba11bc64727a0f799 Author: Adrian Bunk Date: Wed Jul 16 19:25:50 2008 +0300 [MIPS] Remove include/asm-mips/mips-boards/sead{,int}.h include/asm-mips/mips-boards/sead{,int}.h are now obsolete. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit e76812eddcebe06403934c868f3a707fd5bc167d Author: Adrian Bunk Date: Wed Jul 16 19:25:44 2008 +0300 [MIPS] Remove asm-mips/mips-boards/atlas{,int}.h asm-mips/mips-boards/atlas{,int}.h are now obsolete. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit fc22c3571c86cc36f4eb29336ce40c04a666ee98 Author: Adrian Bunk Date: Wed Jul 16 19:25:40 2008 +0300 [MIPS] mips/sgi-ip22/ip28-berr.c: fix the build Commit 3e6ea3b0d7a93550a93a265e732413d3a5aaf0d2 (linux-mips.org) / 52f4f6bbcff5510f662a002ec1219660ea25af62 (kernel.org) ([MIPS] Use kernel-supplied ARRAY_SIZE() macro.) causes the following compile error: <-- snip --> ... CC arch/mips/sgi-ip22/ip28-berr.o /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c: In function 'ip28_be_interrupt': /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: warning: type defaults to 'int' in declaration of 'type name' /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: warning: type defaults to 'int' in declaration of 'type name' make[2]: *** [arch/mips/sgi-ip22/ip28-berr.o] Error 1 <-- snip --> Using ARRAY_SIZE in these places in arch/mips/sgi-ip22/ip28-berr.c was bogus, and therefore gets reverted by this patch. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit 8d795f2a5cf73338a467ac82bdeb73225e987c45 Author: Atsushi Nemoto Date: Fri Jul 18 00:43:48 2008 +0900 [MIPS] TXx9: Miscellaneous build fixes * Fix build if only RBTX4927 or RBTX4938 was selected. * Move gpio helpers to generic part. * Select SOC_TX4938 for RBTX4927/37 board. * Fix parent of rbtx4938_fpga_resource. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 73b4390fb23456964201abda79f1210fe337d01a Author: Ralf Baechle Date: Wed Jul 16 16:12:25 2008 +0100 [MIPS] Routerboard 532: Support for base system Signed-off-by: Phil Sutter Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 36a0a3cd45b49ceff78ac28efef1cbeec413d8c2 Author: Thomas Bogendoerfer Date: Wed Jul 16 15:18:58 2008 +0200 [MIPS] IP32: Use common SGI button driver Use the Indy/O2 button driver. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 5a334fa9240411121f5dda9605fc7fd98429e8c5 Author: Thomas Bogendoerfer Date: Wed Jul 16 15:18:54 2008 +0200 [MIPS] IP22: Use common SGI button driver Use the Indy/O2 button driver. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 36e5c21de51e83bfa17c1e7334050edd2eda3d47 Author: Thomas Bogendoerfer Date: Wed Jul 16 14:06:15 2008 +0200 [MIPS] IP22, IP28: Fix merge bug Instead of one SGI_HAS_HAL2 for IP22 and one for IP28, IP28 got two of them... Let's give IP22 some ALSA sound, too. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle [MIPS] IP22, IP28: Fix merge bug Instead of one SGI_HAS_HAL2 for IP22 and one for IP28, IP28 got two of them... Let's give IP22 some ALSA sound, too. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit d6d8a4635a8451ca3c6fa2aaf9bbf934d8e2097b Author: Ralf Baechle Date: Wed Jul 16 12:07:05 2008 +0100 [MIPS] Tinker with constraints in to fix build error. [...] CC init/main.o include/asm/bitops.h: In function `start_kernel': include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: error: impossible constraint in `asm' include/asm/bitops.h:76: error: impossible constraint in `asm' include/asm/bitops.h:76: error: impossible constraint in `asm' make[1]: *** [init/main.o] Error 1 [...] The build error is caused by the ages old gcc bug where gcc at the time of analyzing the constraints is unable to figure out that an "i" constraint actually can be satisfied and thus will abort unless an "r" is added to the constraint. For the actual code generation gcc will only ever use the "i" constraint. Signed-off-by: Ralf Baechle commit c29d150305f7f655b7002cc31754c605e5c0d1a0 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:32 2008 +0300 [MIPS] Add missing prototypes to asm/page.h This patch fixes the following sparse warnings: >>>>>>>>>>>>>>>>>> arch/mips/mm/page.c:284:16: warning: symbol 'build_clear_page' was not declared. Should it be static? arch/mips/mm/page.c:426:16: warning: symbol 'build_copy_page' was not declared. Should it be static? >>>>>>>>>>>>>>>>>> The fix is to add appropriate prototypes to the header include/asm-mips/page.h. Build-tested against Malta defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit f028b8605613ade67fda554e30d367911d6c7222 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:31 2008 +0300 [MIPS] Fix missing prototypes in asm/fpu.h While building the Malta defconfig, sparse spat the following warnings: >>>>>>>>>>>>>>>>>> arch/mips/math-emu/kernel_linkage.c:31:6: warning: symbol 'fpu_emulator_init_fpu' was not declared. Should it be static? arch/mips/math-emu/kernel_linkage.c:54:5: warning: symbol 'fpu_emulator_save_context' was not declared. Should it be static? arch/mips/math-emu/kernel_linkage.c:68:5: warning: symbol 'fpu_emulator_restore_context' was not declared. Should it be static? >>>>>>>>>>>>>>>>>> This patch fixes these errors by adding the proper prototypes to the include/asm-mips/fpu.h header, and actually using this header in the sparse-spotted source file. Build-tested with Malta defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 3450004a8cec8bab246372a1cabb9c2483b1e6c3 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:30 2008 +0300 [MIPS] PCI: Make the pcibios_max_latency variable static The pcibios_max_latency variable is needlessly defined global, and this patch makes it static. Build-tested using malta_defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 597a5f551ec4cd0aa0966e4fff4684ecc8c31c0d Author: Avi Kivity Date: Sun Jul 20 14:24:22 2008 +0300 KVM: Adjust smp_call_function_mask() callers to new requirements smp_call_function_mask() now complains when called in a preemptible context; adjust its callers accordingly. Signed-off-by: Avi Kivity commit d20b27478d6ccf7c4c8de4f09db2bdbaec82a6c0 Author: Jean-Francois Moine Date: Fri Jul 18 05:52:04 2008 -0300 V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit fac3639d886ae577d74e2da16e6a448620d432c9 Author: Hans Verkuil Date: Fri Jul 18 10:07:10 2008 -0300 V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups Fix a bug in get_index that was introduced earlier. Also fix two error handling lock-ups in videodev and cx18 that where found thanks to that bug. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f19ad390146e7745cbc529f3bef8469cf21f3a6b Author: Hans Verkuil Date: Fri Jul 18 02:02:50 2008 -0300 V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 86751b016ff4eb4741b602933e5e6d74ac6cc377 Author: Hans Verkuil Date: Fri Jul 18 01:35:14 2008 -0300 V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit af8b303e96ed5a6882419c8e632df166bde85d7a Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:36:08 2008 -0300 V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on Signed-off-by: Mauro Carvalho Chehab commit 367394ac5cce83d40e605b5c75ee27dbe3d42d92 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:34:27 2008 -0300 V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C Instead of letting VIDEO_IR_I2C to be selected by VIDEO_IR, if I2C, convert it into a symbol that depends on both VIDEO_IR and I2C. Signed-off-by: Mauro Carvalho Chehab commit 1c22dad8ab86caef7a1f01cf3e9bb446a448aac5 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:31:29 2008 -0300 V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c Currently, saa7134 is dependent of ir-kbd-i2c, since it uses a symbol that is defined there. However, as this symbol is used only on saa7134, there's no sense on keeping it defined there (or on ir-commons). So, let's move it to saa7134 and remove one symbol for being exported. Signed-off-by: Mauro Carvalho Chehab commit 4db16db4f60ce063435bd08b71c82aad1254cd95 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:28:56 2008 -0300 V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places Signed-off-by: Mauro Carvalho Chehab commit 432aa3b64d08f1453e2742d20c5fe6946ca22549 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:27:50 2008 -0300 V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF VIDEOBUF_DVB depends on VIDEOBUF_CORE, not on VIDEOBUF_DMA_SG Signed-off-by: Mauro Carvalho Chehab commit d4216488c0ccf7b659411023903bac7207f0dfb7 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:25:53 2008 -0300 V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on" Signed-off-by: Mauro Carvalho Chehab commit c3fb62bf927cee771c3bcd5053e393e7df518f28 Author: Hans Verkuil Date: Thu Jul 17 17:48:38 2008 -0300 V4L/DVB (8390): videodev: add comment and remove magic number. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8373a3e512c8ea8e93981d42b0d1efb252be17fa Author: Brandon Philips Date: Tue Jun 24 22:58:25 2008 -0300 V4L/DVB (8389): videodev: simplify get_index() Use Hans Verkuil's suggested method of implementing get_index which doesn't depend on class_for_each_device and instead uses the video_device array. This simplifies the code and reduces its memory footprint. Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 2bc93aa304f10bf94c377a487b09df75eaf88ab6 Author: Hans Verkuil Date: Thu Jul 17 16:45:00 2008 -0300 V4L/DVB (8387): Some cosmetic changes Those changes, together with some proper patches, will allow out-of-tree compilation for for kernels < 2.6.19 Signed-off-by: Mauro Carvalho Chehab commit e3bf20de33b016ac73424a5574177ed46c754be3 Author: Hans Verkuil Date: Thu Jul 17 13:29:49 2008 -0300 V4L/DVB (8381): ov7670: fix compile warnings Signed-off-by: Hans Verkuil Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 9edd350f51a1e81f7f01308a99800cad7770e5cd Author: Hans Verkuil Date: Thu Jul 17 13:22:51 2008 -0300 V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name. Having an _auto suffix is less ambiguous than a 'saa711x' identifier. It's also used like this in the saa7127 driver. Thanks to Jean Delvare for suggesting this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5daed07401ed27bb2684e803f3f01e3a424ea282 Author: Jean Delvare Date: Thu Jul 17 13:18:31 2008 -0300 V4L/DVB (8379): saa7127: Make device detection optional The saa7127 driver supports all of SAA7126, SAA7127, SAA7128 and SAA1729 devices. Declare all these devices, so that board drivers can tell which device is present, instead of always relying on auto-detection (which needs to write to the chip, eek!). We still need the detection for ivtv, so a special device name "saa7127_auto" can be used when the caller doesn't know exactly which device is present. Signed-off-by: Jean Delvare Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 03b52c36a38eb72548b9408c497ffabd1519eabe Author: Hans Verkuil Date: Thu Jul 17 12:33:08 2008 -0300 V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup Same issue as for cx25840: this function sets up the standard timings and has nothing to do with VBI setup. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ca130eef2ca185739a440b893e69fe36038b87c9 Author: Hans Verkuil Date: Thu Jul 17 12:26:45 2008 -0300 V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct For several MPEG controls and the volume control the default as returned by VIDIOC_QUERYCTRL was incorrect and did not match the actual initial value. This is now fixed for cx18 and ivtv. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cb5aa1c62df81ba2cdbae7f7ce469b231d43aba6 Author: Hans Verkuil Date: Thu Jul 17 11:08:40 2008 -0300 V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup cx25840_vbi_setup has nothing to do with setting up VBI, but everything with setting up the standard. Move to cx25840-core.c and rename. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5de39b2b1f68253d79f3548ef2d103fd5edae563 Author: Hans de Goede Date: Thu Jul 17 10:34:28 2008 -0300 V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver. The sn9c102 driver claims to support usb-ID 0x0c45:0x6011, which is a sn9c102 with ov6650 sensor, but the sn9c102 driver does not support the ov6650 sensor (tested). Also the sn9c102 driver claims to support usb-ID 0x0c45:0x603f, which is a sn9c102 with CISVF10 sensor, but the sn9c102 driver does not support the CISVF10 sensor (not tested). Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 12ff91264ce3e2f24013d667d44ba786f947506c Author: Hans de Goede Date: Thu Jul 17 10:30:56 2008 -0300 V4L/DVB (8373): gspca: Hue, saturation and contrast controls added for sn9c10x ovxxxx. (does not work with ov6650) Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 722103e390bb0a526f71440f44bf7f891614e1d6 Author: Hans de Goede Date: Thu Jul 17 10:24:47 2008 -0300 V4L/DVB (8372): gspca: Small ov6650 fixes. 1) Don't change the red and blue pre-gain's from their defaults 2) Actually make the powerline freq ctrl available to userspace Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c91256c27b9509624df2619271cfca9ec5436f8f Author: Jean-Francois Moine Date: Thu Jul 17 10:12:55 2008 -0300 V4L/DVB (8371): gspca: Webcam 08ca:2050 added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 100f7f2a34ded88e79ecbeaf9ed46c58fbdf339c Author: Jean-Francois Moine Date: Thu Jul 17 09:41:03 2008 -0300 V4L/DVB (8370): gspca: Webcam 0461:0821 added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 1ff1e48442188b9ae68aef82b66baef89e988cf6 Author: Jean-Francois Moine Date: Thu Jul 17 09:37:57 2008 -0300 V4L/DVB (8369): gspca: Bad initialization of sn9c102 ov7630. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d87616f5a5af028d399f2c3e14c3115c67e415cf Author: Andoni Zubimendi Date: Thu Jul 17 05:35:52 2008 -0300 V4L/DVB (8367): gspca: Light frequency filter / exposure / clean-up for sn9c103 ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a975a5279e39b5bc104cc8329d25a36a25136ad9 Author: Hans de Goede Date: Wed Jul 16 15:29:11 2008 -0300 V4L/DVB (8366): gspca: Better code for ov6650 and ov7630. sonixb: Common code between ov6650 and ov7630. Fix brightness oscillation with ov6650 sensor. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 66f358211d4f8bf1a43e3aef9565c5c1454f73b3 Author: Hans de Goede Date: Wed Jul 16 10:16:28 2008 -0300 V4L/DVB (8364): gspca: Support of powerline frequency for ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 5c6644f305650d3d533b67fc74a96e4a2ea0aa89 Author: Hans de Goede Date: Wed Jul 16 10:00:08 2008 -0300 V4L/DVB (8363): gspca: Bad image size with spca501. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c36260ee27dff9a0236ddaaee0e3524ecd389645 Author: Hans de Goede Date: Wed Jul 16 09:56:07 2008 -0300 V4L/DVB (8362): gspca: Bad offset of the brightness sum in sn9c103 packets. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit b7474cf9f693a83c9a64c8504a08823a34994a2e Author: Andoni Zubimendi Date: Wed Jul 16 08:40:30 2008 -0300 V4L/DVB (8361): gspca: Bad check of i2c write to sn9c10x. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 794af52a4ce5279c52f1467448b9e672a7db37f0 Author: Andoni Zubimendi Date: Wed Jul 16 08:33:14 2008 -0300 V4L/DVB (8360): gspca: Bad initialization of sn9c103 - ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 9a97a2abe44781a13cd2ffc95069a8fd2678da68 Author: Mauro Carvalho Chehab Date: Tue Jul 15 14:23:08 2008 -0300 V4L/DVB (8359): gspca: Adds register aliases for zc03xx registers Thanks to http://zc0302.sourceforge.net/zc0302.php, we have some hints about what each zc3xx register means. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jean-Francois Moine commit 568788a771ee88cc6b5e311a207c09731a6e47f0 Author: Jean-Francois Moine Date: Tue Jul 15 11:46:06 2008 -0300 V4L/DVB (8358): gspca: Better initialization of sn9c120 - ov7660. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit f4d520258d229f093bec6937ec3d632eb95600b4 Author: Hans de Goede Date: Tue Jul 15 09:36:42 2008 -0300 V4L/DVB (8357): gspca: Perfect exposure for sn9c10x, sensor ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 3647fea840c94c04f35215cb75b48613c0af310e Author: Hans de Goede Date: Tue Jul 15 05:36:30 2008 -0300 V4L/DVB (8356): gspca: 352x288 mode fix and source clean-up for Sonix bridges. sonixb: Bad initialization of sensor for 352x288 mode. (from Hans de Goede) sonixj: Clean-up source. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ad5ef80dd79851ea683e2d30ca4ebdc0c043a675 Author: Hans de Goede Date: Mon Jul 14 10:11:42 2008 -0300 V4L/DVB (8354): gspca: Better gain for bridge sn9c10x - sensor ov6650. sonixb: Better gain for ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 4b972d29bbccc86877221164c7f39d52694d4a81 Author: Andoni Zubimendi Date: Mon Jul 14 09:50:26 2008 -0300 V4L/DVB (8353): gspca: 640x480 for bridge sn9c103 / sensor ov7630. sonixb: 640x480 mode for sn9c103 - ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 739570bb218bb4607df1f197282561e97a98e54a Author: Jean-Francois Moine Date: Mon Jul 14 09:38:29 2008 -0300 V4L/DVB (8352): gspca: Buffers for USB exchanges cannot be in the stack. gspca: Protect dq_callback() against simultaneous USB exchanges. Temporary buffer for USB exchanges added in the device struct. (all) Use a temporary buffer for all USB exchanges. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 5b77ae7776183d733ec86727bcc34c52a336afd6 Author: Jean-Francois Moine Date: Sat Jul 12 09:28:04 2008 -0300 V4L/DVB (8350): gspca: Conform to v4l2 spec and mutex unlock fix. gspca: Empty the application queues on streamoff ioctl. streamon/off and qbuf ioctls may be done by any application. Don't handle MJPEG pixel format as JPEG. (thanks to Hans de Goede) Authorize reqbufs ioctl when streaming. Bad mutex unlock in poll() when streaming problem. (thanks to Mauro Carvalho Chehab) Don't handle 'webcam disconnected' in stream off. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 51fc8e3bc03aeddc557d3084d08425eb4cb8ed41 Author: Andoni Zubimendi Date: Thu Jul 10 11:12:24 2008 -0300 V4L/DVB (8349): gspca: SN9C103 OV7630 fixes in sonixb. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit dcef3237b652e1c02093feac0f443485a144f035 Author: Hans de Goede Date: Thu Jul 10 10:40:53 2008 -0300 V4L/DVB (8348): gspca: Add auto gain/exposure to sonixb and tas5110 / ov6650 sensors. sonixb: Do auto gain for tas5110 / ov6650 sensors. pac207: Move the auto_gain function to gspca. gspca: New function gspca_auto_gain_n_exposure(). Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d0d0e39bc5912793405d3f84ffc982fa400e6cc0 Author: Jean-Francois Moine Date: Thu Jul 10 07:06:44 2008 -0300 V4L/DVB (8346): gspca: Bad pixel format of bridge VC0321. vc032x: Light frequency was not initialized. Change the pixel format of bridge VC0321 to V4L2_PIX_FMT_YUV420 ('YU12'). Set a bridge to all webcams. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 326c986207cb2065b9819107caa31efd2bbc48db Author: Magnus Damm Date: Wed Jul 16 23:02:08 2008 -0300 V4L/DVB (8343): soc_camera_platform: Add SoC Camera Platform driver This patch adds a simple platform camera device. Useful for testing cameras with SoC camera host drivers. Only one single pixel format and resolution combination is supported. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 0d3244d6439c8c31d2a29efd587c7aca9042c8aa Author: Magnus Damm Date: Wed Jul 16 22:59:28 2008 -0300 V4L/DVB (8342): sh_mobile_ceu_camera: Add SuperH Mobile CEU driver V3 This is V3 of the SuperH Mobile CEU soc_camera driver. The CEU hardware block is configured in a transparent data fetch mode, frames are captured from the attached camera and written to physically contiguous memory buffers provided by the newly added videobuf-dma-contig queue. Tested on sh7722 and sh7723 processors. Changes since V2: - remove SUPERH Kconfig dependency - move sh_mobile_ceu.h to include/media - add board callback support with enable_camera()/disable_camera() - add support for declare_coherent_memory - rework video memory limit - more verbose error messages Changes since V1: - fixed the CEU driver to work with the newly updated patches Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 2cc45cf25a2c14da6d18b7570a23ec09fb8f439a Author: Magnus Damm Date: Wed Jul 16 21:33:39 2008 -0300 V4L/DVB (8341): videobuf: Add physically contiguous queue code V3 This is V3 of the physically contiguous videobuf queues patch. Useful for hardware such as the SuperH Mobile CEU which doesn't support scatter gatter bus mastering. Since it may be difficult to allocate large chunks of physically contiguous memory after some uptime due to fragmentation, this code allocates memory using dma_alloc_coherent(). Architectures supporting dma_declare_coherent_memory() can easily avoid fragmentation issues by using dma_declare_coherent_memory() to force dma_alloc_coherent() to allocate from a certain pre-allocated memory area. Changes since V2 - use dma_handle for physical address - use "scatter gather" instead of "scatter gatter" Changes since V1: - use dev_err() instead of pr_err() - remember size in struct videobuf_dma_contig_memory - keep struct videobuf_dma_contig_memory in .c file - let videobuf_to_dma_contig() return dma_addr_t - implement __videobuf_sync() - return statements, white space and other minor fixes Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 5d6aaf50e2986d3289d16fc2859c490c66a1be63 Author: Magnus Damm Date: Wed Jul 16 21:27:49 2008 -0300 V4L/DVB (8340): videobuf: Fix gather spelling Use "scatter gather" instead of "scatter gatter". Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit b15cf1fcceb92247051dedb502692d56adaa428d Author: Magnus Damm Date: Fri Jul 11 21:03:25 2008 -0300 V4L/DVB (8339): soc_camera: Add 16-bit bus width support The SuperH Mobile CEU hardware supports 16-bit width bus, so extend the soc_camera code with SOCAM_DATAWIDTH_16. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit a034d1b76b173b37f9a3646aa8f50a2c14a0f3ea Author: Magnus Damm Date: Fri Jul 11 20:59:34 2008 -0300 V4L/DVB (8338): soc_camera: Move spinlocks This patch moves the spinlock handling from soc_camera.c to the actual camera host driver. The spinlock_alloc/free callbacks are replaced with code in init_videobuf(). So far all camera host drivers implement their own spinlock_alloc/free methods anyway, and videobuf_queue_core_init() BUGs on a NULL spinlock argument, so, new camera host drivers will not forget to provide a spinlock when initialising their videobuf queues. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 092d3921195c4553a1818e698cee7a281ab361f4 Author: Paulius Zaleckas Date: Fri Jul 11 20:50:31 2008 -0300 V4L/DVB (8337): soc_camera: make videobuf independent Makes SoC camera videobuf independent. Includes all necessary changes for PXA camera driver (currently the only driver using soc_camera in the mainline). These changes are important for the future soc_camera based drivers. Signed-off-by: Paulius Zaleckas Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 439d0e4250b6fc9df3fc9183db38cf8a23d4ad93 Author: Oliver Endriss Date: Tue Jul 15 19:52:22 2008 -0300 V4L/DVB (8335): dvb-ttpci: Fix build with CONFIG_INPUT_EVDEV=n (Bug #11042) Fix build with CONFIG_INPUT_EVDEV=n (Bug #11042). Thanks to Toralf Förster for reporting. Thanks-to: Toralf Förster Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 4ee48c4257d842a29c032a32a19a3fcdd004b83f Author: Oliver Endriss Date: Tue Jul 15 19:36:46 2008 -0300 V4L/DVB (8334): tda10023: Fix typo in tda10023_attach dummy routine Fix compiler warning caused by a typo in the tda10023_attach dummy routine. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 02fa272fcb6edda9059d6dbaab20dfe919f4f4d2 Author: Andy Walls Date: Sun Jul 13 19:30:15 2008 -0300 V4L/DVB (8332): cx18: Suport external reset of the Z8F0811 IR controller on HVR-1600 for lirc cx18: added in cx18_ir_reset_gpio function for lirc_pvr150 like module. Also added the ability to reset the IR chip via ioctl like ivtv. This needs the mutex to protect gpio_dir and gpio_val in struct cx18 as gpio changes can come from a few different asynchronous sources now. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 8abdd00dcc6a58cab3afe6a23a0ce819dc08049a Author: Andy Walls Date: Sun Jul 13 19:05:25 2008 -0300 V4L/DVB (8331): cx18: Add locking for struct cx18 GPIO state variables cx18: Add locking for struct cx18 GPIO state variables in anticpation of adding IR microcontroller reset support for use by external IR modules. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 2c6a37bb076b9718c6362d4ffa1c7e58fdb1a0e9 Author: Michael Krufky Date: Sat Jul 12 22:58:24 2008 -0300 V4L/DVB (8326): sms1xxx: fix missing #include Fix the build error: smscoreapi.c:689: error: 'uintptr_t' undeclared Thanks to Peter Schlaf for reporting this. Cc: Peter Schlaf Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f1f74aa2cf7f109b2eaf3502b8bd13bf40bf6633 Author: Michael Krufky Date: Sat Jul 12 00:37:08 2008 -0300 V4L/DVB (8322): sms1xxx: fix improper usage of asm/foo.h Fix the following warnings generated by checkpatch.pl: WARNING: Use #include instead of 251: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:30: +#include WARNING: Use #include instead of 1566: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:29: +#include Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0b17d0edbc22eda3d0407f98ce4f16ceefb9a97f Author: Hermann Pitton Date: Sat Jul 12 12:27:59 2008 -0300 V4L/DVB (8319): saa7134: Add support for analog only ASUSTeK P7131 saa7134: add a separate entry for the ASUSTeK P7131 analog only and do some eeprom detection to escape from the TVFM7135 with the same PCI subsystem on auto detection. Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab commit cd257a6f4dd908d94e504d2431710f0fcfe62036 Author: Daniel Drake Date: Mon Jun 30 20:57:39 2008 -0300 V4L/DVB (8318): OV7670: don't reject unsupported settings For VIDIOC_G_FMT/VIDIOC_TRY_FMT, the V4L2 API spec states: "Drivers should not return an error code unless the input is ambiguous" "Very simple, inflexible devices may even ignore all input and always return the default parameters." "When the requested buffer type is not supported drivers return an EINVAL error code." i.e. returning errors for unsupported fields is bad, and it's ok to unconditionally overwrite user-requested settings This patch makes ov7670 meet that behaviour, and brings it in line with other drivers e.g. stk-webcam. It also fixes compatibility with (unpatched) gstreamer. Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 3f8d6f73da4332b4ff4150b9bae8e5f680bcbbde Author: Dean Anderson Date: Mon Jun 30 21:28:34 2008 -0300 V4L/DVB (8317): Sensoray 2255 V4l driver checkpatch fixes This patch fixes some coding style issues. It also fixes a NULL de-reference on driver unload. The permissions for the module parameters were changed to 0644. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 91a1d912f61b91e44336efe100a2bd0821777e24 Author: Jean Delvare Date: Wed Jul 2 16:01:21 2008 -0300 V4L/DVB (8316): bt819: Fix a debug message Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 203c204b39fef2c1c99e4b39e61ba292aa60142a Author: Jean Delvare Date: Wed Jul 2 15:59:29 2008 -0300 V4L/DVB (8315): zr36067: Delete dead code This has been commented out for years, it's about time to get rid of it. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 44f71c3fcefbfea3628cca52c0a177252cf83b60 Author: Michael Krufky Date: Sat Jun 28 23:55:36 2008 -0300 V4L/DVB (8313): sms1xxx: add support for Hauppauge WinTV-Nova-T-MiniStick Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a745f0a12cab631b92f9e13b31997192c7df3823 Author: Michael Krufky Date: Tue Jul 1 04:47:10 2008 -0300 V4L/DVB (8312): sms1xxx: add firmware filenames to board properties for stellar and nova Assign the following firmware filenames: sms1xxx-stellar-dvbt-01.fw sms1xxx-nova-a-dvbt-01.fw sms1xxx-nova-b-dvbt-01.fw Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1fbc3caff47785aca67b4bd5b29c04f3f20c770e Author: Michael Krufky Date: Tue Jul 1 04:35:26 2008 -0300 V4L/DVB (8311): sms1xxx: support device-specific firmware filenames on stellar usb1 sticks Add the capability to define device-specific firmware filenames for the SMS1010, with a mechanism to fall back to the generic firmware if the device-specific firmware is not present. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b1d8f9f5b8036b61a7ec562dfb86361f5b18e8f2 Author: Michael Krufky Date: Sun Jun 29 15:15:19 2008 -0300 V4L/DVB (8310): sms1xxx: remove kmutex_t typedef remove typedef struct mutex kmutex_t fix one line > 80 columns Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4411d29165d83a4a73ea351ffccfdc0fd8baeb1e Author: Michael Krufky Date: Sun Jun 29 14:45:37 2008 -0300 V4L/DVB (8309): sms1xxx: fix OOPS on 64 bit kernels due to a bad cast Fix the following build warning: smscoreapi.c: In function 'smscore_detect_mode': smscoreapi.c:689: warning: cast from pointer to integer of different size smscoreapi.c:689: warning: cast to pointer from integer of different size smscoreapi.c: In function 'smscore_set_device_mode': smscoreapi.c:820: warning: cast from pointer to integer of different size smscoreapi.c:820: warning: cast to pointer from integer of different size ...and fix the following OOPS on 64bit kernels: [ 717.263667] usb 6-4: new high speed USB device using ehci_hcd and address 2 [ 717.396386] usb 6-4: configuration #1 chosen from 1 choice [ 717.473650] Unable to handle kernel paging request at 0000000000c02000 RIP: [ 717.473657] [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.473669] PGD 3c6f7067 PUD 3d484067 PMD 0 [ 717.473674] Oops: 0002 [1] SMP [ 717.473678] CPU 0 [Modules linked in snipped] [ 717.473773] Pid: 8380, comm: modprobe Tainted: P 2.6.24-16-generic #1 [ 717.473776] RIP: 0010:[] [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.473784] RSP: 0018:ffff81003d495ba8 EFLAGS: 00010206 [ 717.473786] RAX: ffff81003d8cd8d0 RBX: ffff81003d8cd800 RCX: ffff81003d8cd8d0 [ 717.473788] RDX: 0000000000000008 RSI: ffff81003f080070 RDI: ffff81003d8cd800 [ 717.473791] RBP: 0000000000000004 R08: ffff81003ec0104b R09: ffffffffffffffff [ 717.473793] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000c02000 [ 717.473796] R13: 00000000fffffff4 R14: ffff810000c02000 R15: ffff81003d8cd878 [ 717.473799] FS: 00007f70a680f6e0(0000) GS:ffffffff805b0000(0000) knlGS:0000000000000000 [ 717.473801] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 717.473804] CR2: 0000000000c02000 CR3: 000000003c68b000 CR4: 00000000000006e0 [ 717.473806] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 717.473809] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 717.473812] Process modprobe (pid: 8380, threadinfo ffff81003d494000, task ffff81003d2fc000) [ 717.473814] Stack: ffff81003d8cd800 ffff81003d8cd800 0000000000000000 ffff81003c6d8000 [ 717.473820] ffff81003dcac800 0000000000000008 ffffc20000787bb0 ffffffff88dba16c [ 717.473825] ffff81003dcac800 000000000000000a 0000000000000000 ffffffff88dbb2fa [ 717.473829] Call Trace: [ 717.473866] [] :sms1xxx:smscore_start_device+0x1c/0xb0 [ 717.473885] [] :sms1xxx:smsusb_probe+0x29a/0x670 [ 717.473929] [] :sms1xxx:smsusb_sendrequest+0x0/0x30 [ 717.473965] [] mutex_lock+0x9/0x20 [ 717.473998] [] :usbcore:usb_autopm_do_device+0x8e/0x130 [ 717.474040] [] :usbcore:usb_probe_interface+0xda/0x160 [ 717.474067] [] driver_probe_device+0x9c/0x1b0 [ 717.474091] [] __driver_attach+0xc9/0xd0 [ 717.474107] [] __driver_attach+0x0/0xd0 [ 717.474115] [] bus_for_each_dev+0x4d/0x80 [ 717.474156] [] bus_add_driver+0xac/0x220 [ 717.474203] [] :usbcore:usb_register_driver+0xa9/0x120 [ 717.474232] [] :sms1xxx:smsusb_register+0x1b/0x70 [ 717.474243] [] :sms1xxx:smscore_module_init+0x7c/0xb0 [ 717.474253] [] sys_init_module+0x18e/0x1a90 [ 717.474426] [] system_call+0x7e/0x83 [ 717.474490] [ 717.474491] [ 717.474492] Code: 66 41 c7 04 24 9c 02 41 c6 44 24 02 00 4c 89 e6 41 c6 44 24 [ 717.474506] RIP [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.474513] RSP [ 717.474515] CR2: 0000000000c02000 [ 717.474521] ---[ end trace 52d9c6f207be106a ]--- Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 14a638cd3b6031c27b33560506244b9bf1913ad9 Author: Michael Krufky Date: Sat Jun 28 23:53:51 2008 -0300 V4L/DVB (8308): sms1xxx: Provide option to support Siano default usb ids Provide an option to enable / disable support for Siano's default usb ids. This allows the support for Siano's USB IDs to be disabled, so that Siano's external driver can be used, instead. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eb383bddc5ec52087ccfad4cccd8c6cc57c846d8 Author: Michael Krufky Date: Sun Jun 29 01:33:23 2008 -0300 V4L/DVB (8307): sms1xxx: change smsusb_driver.name to sms1xxx Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 5068b7a449293ced0ea963f3c944189d78fe1b1e Author: Michael Krufky Date: Sat Jun 28 23:27:19 2008 -0300 V4L/DVB (8306): sms1xxx: log firmware download process by default Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0f2a1ee112a4709a3b1a3c3c64b5d11752da1eef Author: Michael Krufky Date: Sat Jun 28 20:53:45 2008 -0300 V4L/DVB (8305): sms1xxx: fix warning: format '%d' expects type 'int', but argument x has type 'size_t' Fix the following 64bit build warning: make[2]: Entering directory `/usr/src/linux-headers-2.6.24-16-generic' CC [M] smscoreapi.o smscoreapi.c: In function 'smscore_load_firmware_from_file': smscoreapi.c:604: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' CC [M] smsusb.o smsusb.c: In function 'smsusb1_load_firmware': smsusb.c:216: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' smsusb.c:223: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8f37356b065206316e0b66dbee2718c82329684c Author: Michael Krufky Date: Sat Jun 28 17:09:28 2008 -0300 V4L/DVB (8303): sms1xxx: update MODULE_DESCRIPTION set MODULE_DESCRIPTION to "Driver for the Siano SMS1XXX USB dongle" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit cf1cfe1ba70952093a46bb0e21b58357f36f2e8f Author: Michael Krufky Date: Sat Jun 28 16:45:36 2008 -0300 V4L/DVB (8302): sms1xxx: fix Siano board names Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 02aea4fb640cdc4018e0a6d34e235eb63e4482d7 Author: Michael Krufky Date: Thu Jun 26 04:58:30 2008 -0300 V4L/DVB (8301): sms1xxx: add capability to define device-specific firmware filenames Add the capability to define device-specific firmware filenames for the SMS1150, with a mechanism to fall back to the generic firmware if the device-specific firmware is not present. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2708e888c57904f78649dcd91dcda9768d580ecf Author: Michael Krufky Date: Sat Jun 21 05:24:38 2008 -0300 V4L/DVB (8300): sms1xxx: simplify smsusb_init_device switch..case block Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0c071f374f66f05aded3be970f683d54fd918806 Author: Michael Krufky Date: Sat Jun 21 02:44:02 2008 -0300 V4L/DVB (8299): sms1xxx: mark functions static Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c65c7a652ff10b86d33eda36f9c4200027bd8dd4 Author: Michael Krufky Date: Thu Jun 19 22:20:49 2008 -0300 V4L/DVB (8298): sms1xxx: remove redundant __func__ in sms_err macro Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2522dc13245073f75399ada8e7f6acecde834953 Author: Michael Krufky Date: Thu Jun 19 22:15:38 2008 -0300 V4L/DVB (8297): sms1xxx: remove old printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eb250942fe3cf2a129ab55d65161bc66b7009853 Author: Michael Krufky Date: Thu Jun 19 22:07:23 2008 -0300 V4L/DVB (8296): sms1xxx: always show error messages Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f14d56a99bddb779f6f7ec028bcd9d142536589e Author: Michael Krufky Date: Thu Jun 19 20:59:08 2008 -0300 V4L/DVB (8295): sms1xxx: add debug module option, to enable debug messages All dmesg spam turned off by default, for now. Values for debug: (info=1, adv=2 (or-able) Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a0c0abcb1fdb316dee3a38cff9843d7d094c327c Author: Michael Krufky Date: Thu Jun 19 20:35:21 2008 -0300 V4L/DVB (8294): sms1xxx: move message formatting into printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 068d6c0f5d6c67d0e93f8e214897ddd64746be4e Author: Michael Krufky Date: Thu Jun 19 01:15:46 2008 -0300 V4L/DVB (8293): sms1xxx: create printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1c11d546b6c31399ac60f42d3103227cc1164d80 Author: Michael Krufky Date: Wed Jun 18 22:09:55 2008 -0300 V4L/DVB (8292): sms1xxx: add code to allow device-specific functionality Set board ID in the usb_device_id table's driver_info field. Use board name when registering the dvb adapter. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit dd5b2a5c2a6c793d855910864593ad26dd844154 Author: Michael Krufky Date: Wed Jun 18 20:25:25 2008 -0300 V4L/DVB (8291): sms1xxx: change default_mode to 4 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d3e72fe75ef7651e49e50f6a5f2c1c6453749e33 Author: Michael Krufky Date: Mon Jun 16 12:37:05 2008 -0300 V4L/DVB (8290): sms1xxx: small cleanup Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit df0462e77e9aa19d50dbfd540e78f1803e992c25 Author: Michael Krufky Date: Sun Jun 15 19:39:55 2008 -0300 V4L/DVB (8289): sms1xxx: remove #if LINUX_VERSION_CODE checks Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fbd05c8213e7cddca3041c280e5fca5eff0956f9 Author: Michael Krufky Date: Sun Jun 15 19:27:35 2008 -0300 V4L/DVB (8288): sms1xxx: more cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e080842c6c31249010adb184f9efbbc5cb40bd2b Author: Michael Krufky Date: Sun Jun 15 19:11:37 2008 -0300 V4L/DVB (8287): sms1xxx: fix WARNING: unnecessary cast may hide bugs fix the following checkpatch.pl warning: WARNING: unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html 596: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:540: + msg = (struct SmsMsgHdr_ST *) kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA); Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 18245e18eeae15e928b46c1ae0f3a19bdc50419d Author: Michael Krufky Date: Sun Jun 15 17:52:24 2008 -0300 V4L/DVB (8286): sms1xxx: remove typedefs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ca78373687bddcd436e1bf2d9b6806cfd9cad8b8 Author: Michael Krufky Date: Sun Jun 15 17:36:00 2008 -0300 V4L/DVB (8285): sms1xxx: more 80-column cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9f2113975a7898c913c668bb709e95c27e51617b Author: Michael Krufky Date: Sun Jun 15 17:26:42 2008 -0300 V4L/DVB (8284): sms1xxx: fix WARNING: printk() should include KERN_ facility level Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 59bf6b8e85209f4b875e319b42e8f13af7797826 Author: Michael Krufky Date: Sun Jun 15 16:50:11 2008 -0300 V4L/DVB (8283): sms1xxx: 80-column cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fa830e8a014a206103d06a7600ed8c661b427db3 Author: Michael Krufky Date: Sun Jun 15 15:52:43 2008 -0300 V4L/DVB (8282): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f0333e3de0e06fb9a6662a6df7d3d1cc8e5dbeca Author: Michael Krufky Date: Sun Jun 15 15:32:00 2008 -0300 V4L/DVB (8281): sms1xxx: remove INT / UINT typedefs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 822374165d6b11733467cfa2fa18234319198233 Author: Michael Krufky Date: Sun Jun 15 15:14:13 2008 -0300 V4L/DVB (8280): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 73104fb3e4e692cb1f9505b548ab073b0859b256 Author: Michael Krufky Date: Sat Jun 14 18:27:18 2008 -0300 V4L/DVB (8279): sms1xxx: #define usb vid:pid's Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 494d24c527e5ab43aecb8e77bfdc7e939466b134 Author: Michael Krufky Date: Sat Jun 14 07:40:41 2008 -0300 V4L/DVB (8278): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f17407a85db3b86526d54e65698348873a6df617 Author: Michael Krufky Date: Sat Jun 14 00:43:26 2008 -0300 V4L/DVB (8277): sms1xxx: update latest siano drop to 1.2.17 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 55ad310c2f21281f50fa040b7765a4a1151bd420 Author: Michael Krufky Date: Tue May 6 03:52:44 2008 -0300 V4L/DVB (8276): sms1xxx: codingstyle cleanup: "(foo*)" should be "(foo *)" ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a83ccdd6a952eb25d3f51dfdc175c1e9bf8f7cae Author: Michael Krufky Date: Tue May 6 03:11:51 2008 -0300 V4L/DVB (8275): sms1xxx: codingstyle cleanup: "foo* bar"/"foo * bar" should be "foo *bar" ERROR: "foo* bar" should be "foo *bar" ERROR: "foo * bar" should be "foo *bar" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3617691fb98b81850640a9b61fb932b798ad4504 Author: Michael Krufky Date: Thu May 22 18:32:40 2008 -0300 V4L/DVB (8274): sms1xxx: build cleanup after driver relocation Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 18658117ff844e8117f6b363cb7fa8c5f8ad2cb8 Author: Michael Krufky Date: Thu May 22 18:30:17 2008 -0300 V4L/DVB (8273): sms1xxx: replace __FUNCTION__ with __func__ Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 854470606070d91955f03a7dca3a8024fc2a2540 Author: Michael Krufky Date: Thu May 22 18:29:20 2008 -0300 V4L/DVB (8272): sms1xxx: move driver from media/mdtv/ to media/dvb/siano/ Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7d18d2e91b5495ed0b99c83d595a56e25521a111 Author: Steven Toth Date: Thu May 22 18:07:39 2008 -0300 V4L/DVB (8271): sms1xxx: usbvid table Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 19d703da05de6495adfc0ec9aec927d2fce99af6 Author: Steven Toth Date: Thu May 22 18:06:41 2008 -0300 V4L/DVB (8270): sms1xxx: header include cleanups and unexport symbols Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8d4f9d0e0bb8b8191b525bd41eddadaf831e47ef Author: Steven Toth Date: Thu May 22 18:05:26 2008 -0300 V4L/DVB (8269): sms1xxx: copyrights Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eae55660fc4a7f17f0f87458d8ada2b51b1833c1 Author: Steven Toth Date: Thu May 22 18:04:36 2008 -0300 V4L/DVB (8268): sms1xxx: usb cleanup Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 159ed4bbc394bb3e547eb64fdd3a59141ced131a Author: Steven Toth Date: Thu May 22 18:01:42 2008 -0300 V4L/DVB (8267): sms1xxx: Makefile cleanup Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3dd243787017e40c66ae54cf590ea513a110c51d Author: Steven Toth Date: Thu May 22 18:01:02 2008 -0300 V4L/DVB (8266): sms1xxx: merge modules Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7a19598c75660b6d4464d291f8e99a91fd7afc4a Author: Steven Toth Date: Thu May 22 16:43:04 2008 -0300 V4L/DVB (8265): sms1xxx: Kconfig / Makefile cleanups Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9e4fb5e7122ce67769719e715159baed5e5d7247 Author: Steven Toth Date: Thu May 22 15:48:54 2008 -0300 V4L/DVB (8264): sms1xxx: remove smstypes.h Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 955e9ca3cdeae62e8067ede204b5a02dcde6813e Author: Steven Toth Date: Thu May 22 15:46:32 2008 -0300 V4L/DVB (8263): sms1xxx: merge ksyms Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c6465799c38762b963bb819e033d2a56a3d3c233 Author: Steven Toth Date: Mon May 19 19:09:21 2008 -0300 V4L/DVB (8262): sms1xxx: remove smschar.o Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 464a77dd8845fc8f3beeaad24478081576c4b83a Author: Steven Toth Date: Mon May 19 19:01:25 2008 -0300 V4L/DVB (8261): sms1xxx: remove smsnet.o Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7315b082e333191f7606dbb23dbcbdba98a79c11 Author: Michael Krufky Date: Mon May 19 18:58:40 2008 -0300 V4L/DVB (8260): sms1xxx: build fixes Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9c59f968a9960bbb3402c8a8ea8004c798f4f383 Author: Michael Krufky Date: Mon May 19 18:57:12 2008 -0300 V4L/DVB (8259): sms1xxx: pass adapter_nr into dvb_register_adapter Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2e5c1ec8865abd81e24a394918c7ba315e0b7b70 Author: Michael Krufky Date: Mon May 19 18:56:13 2008 -0300 V4L/DVB (8258): add support for SMS1010 and SMS1150 based digital television devices initial driver drop, provided by Siano Mobile Silicon, Inc. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a9e285856112e5e721b6a341d15437a164128b30 Author: Laurent Pinchart Date: Fri Jul 11 19:32:15 2008 -0300 V4L/DVB (8257): uvcvideo: Fix possible AB-BA deadlock with videodev_lock and open_mutex The uvcvideo driver's uvc_v4l2_open() method is called from videodev's video_open() function, which means it is called with the videodev_lock mutex held. uvc_v4l2_open() then takes uvc_driver.open_mutex to check dev->state and avoid racing against a device disconnect, which means that open_mutex must nest inside videodev_lock. However uvc_disconnect() takes the open_mutex around setting dev->state and also around putting its device reference. However, if uvc_disconnect() ends up dropping the last reference, it will call uvc_delete(), which calls into the videodev code to unregister its device, and this will end up taking videodev_lock. This opens a (unlikely in practice) window for an AB-BA deadlock and also causes a lockdep warning because of the lock misordering. Fortunately there is no apparent reason to hold open_mutex when doing kref_put() in uvc_disconnect(): if uvc_v4l2_open() runs before the state is set to UVC_DEV_DISCONNECTED, then it will take another reference to the device and kref_put() won't call uvc_delete; if uvc_v4l2_open() runs after the state is set, it will run before uvc_delete(), see the state, and return immediately -- uvc_delete() does uvc_unregister_video() (and hence video_unregister_device(), which is synchronized with videodev_lock) as its first thing, so there is no risk of use-after-free in uvc_v4l2_open(). Bug diagnosed based on a lockdep warning reported by Romano Giannetti . Signed-off-by: Roland Dreier Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 6f80e1b4cda7e184e369c84a8b388882b0233d53 Author: Andrew Morton Date: Fri Jul 4 06:33:23 2008 -0300 V4L/DVB (8256): uvc/uvc_v4l2.c: suppress uninitialized var warning drivers/media/video/uvc/uvc_v4l2.c: In function `uvc_v4l2_mmap': drivers/media/video/uvc/uvc_v4l2.c:1035: warning: 'buffer' might be used uninitialized in this function Signed-off-by: Andrew Morton Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 25e69850d1bb315f251c91183b89da44d4f9be23 Author: Laurent Pinchart Date: Wed Jul 9 18:29:59 2008 -0300 V4L/DVB (8254): uvcvideo : Add support for Asus F9GS integrated webcam Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit a9e1113483f110723e4c0277a05d08f51da232aa Author: Mauro Carvalho Chehab Date: Wed Jul 9 05:26:26 2008 -0300 V4L/DVB (8253): gspca: fix warnings on x86_64 /home/v4l/master/v4l/gspca.c: In function 'gspca_frame_add': /home/v4l/master/v4l/gspca.c:222: warning: format '%d' expects type 'int', but argument 2 has type 'long int' /home/v4l/master/v4l/gspca.c: In function 'dev_read': /home/v4l/master/v4l/gspca.c:1568: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' /home/v4l/master/v4l/gspca.c:1618: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a47cacbd869b67ce16981ad5a0b06e4eac2efaff Author: Christophe Jaillet Date: Fri Jul 4 06:33:22 2008 -0300 V4L/DVB (8252): buf-dma-sg.c: avoid clearing memory twice 1) Remove a useless initialisation of 'i' 2) Avoid clearing the memory allocated twice (once in 'kcalloc', once in 'sg_init_table') 3) Remove a test that can never trigger. The function returns NULL in such a case, so we know that at this point 'pages[0]' != NULL Signed-off-by: Christophe Jaillet Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit a8a89b7f60f18c2517c3b950f5ecede0626363eb Author: Akinobu Mita Date: Fri Jul 4 06:33:20 2008 -0300 V4L/DVB (8251): ttusb: use simple_read_from_buffer()() Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 3fce3fb0592841857ae01334d0c6934c1ad32faf Author: David Howells Date: Tue Jul 8 16:04:38 2008 -0300 V4L/DVB (8249): Fix pointer cast warnings in the ivtv framebuffer driver Fix casts of pointers to integers of different sizes in the ivtv framebuffer driver. These were introduced in patch 38eb6ba5b8487d15b020fe391d324edd2b659b03. Signed-off-by: David Howells Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5a367dfb739831d54caf226ce0bc4c75ef264d8d Author: Jean Delvare Date: Thu Jul 10 11:23:37 2008 -0300 V4L/DVB (8246): tvaudio: Stop I2C driver ID abuse The tvaudio driver is using "official" I2C device IDs for internal purpose. There must be some historical reason behind this but anyway, it shouldn't do that. As the stored values are never used, the easiest way to fix the problem is simply to remove them altogether. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit be99af6679174e5d0e9f36fc8c18318a8ce34bca Author: Jean Delvare Date: Thu Jul 10 11:04:10 2008 -0300 V4L/DVB (8245): ovcamchip: Delete stray I2C bus ID I2C_HW_SMBUS_OVFX2 is referenced in ovcamchip_core.c, but no bus uses this driver ID, so we can remove the reference. As far as I can see, the Cypress FX2 webcam is handled by a different driver (dvb-usb). Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit e2fc00c21124d9d9a8d4f396e5498ea27ddfc8fd Author: Massimo Piccioni Date: Fri Jul 11 13:48:02 2008 -0300 V4L/DVB (8244): saa7134: add support for AVerMedia M103 The following patch updates saa7134 driver to add support for AVerMedia M103 MiniPCI DVB-T Hybrid card. Signed-off-by: Massimo Piccioni [mchehab@infradead.org: fixed merge conflicts and a small codingstyle] Signed-off-by: Mauro Carvalho Chehab commit 52b5045078b76ee86e210210601d45670eab22f1 Author: Michael Krufky Date: Wed Jul 9 02:18:49 2008 -0300 V4L/DVB (8236): cx23885: add support for new revision of FusionHDTV7 Dual Express The new revision of this board uses the same pci subsystem id as the first revision, but uses a S5H1411 demodulator instead of the S5H1409. In the case of the FusionHDTV7 Dual Express, if s5h1409_attach fails, try s5h1411_attach. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bdf2fe4a0b9d23e69c77eaec76212216c9a957ef Author: Laurent Pinchart Date: Mon Jul 7 23:41:40 2008 -0300 V4L/DVB (8235): uvcvideo : Add support for Medion Akoya Mini E1210 integrated webcam Signed-off-by: Tim Gardner Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 6833c917b4de1757febdbf946d709ece6dc7a86f Author: Laurent Pinchart Date: Mon Jul 7 23:04:29 2008 -0300 V4L/DVB (8234): uvcvideo: Make input device support optional UVC devices can report button events. The uvcvideo driver depends on CONFIG_INPUT to report events to the input layer. This patch removes the hard dependency by introducing a new CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV option. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit ac0d6df69bc72eabda944fd14a958074dc08ca0c Author: Jean-Francois Moine Date: Tue Jul 8 06:58:15 2008 -0300 V4L/DVB (8232): gspca: Change the USERPTR mechanism. main: Change the packet copy mechanism for userptr. Cannot do reqbufs ioctl when already done and count != 0. Accept count < frame size in read(). Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c41492c89a00630c7482eae25deaf9af91b73c98 Author: Jean-Francois Moine Date: Mon Jul 7 08:31:16 2008 -0300 V4L/DVB (8231): gspca: Do not declare the webcams declared by other drivers. etoms: Do not declare the webcams declared by the driver et61x251. sonixb, sonixj: Do not declare the webcams declared by the driver sn9c102. zc3xx: Do not declare the webcams declared by the driver zc0301. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit f87086e302300fdff1bd32049deb7a7f3e3de7da Author: Hans Verkuil Date: Fri Jul 18 00:50:58 2008 -0300 v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10 Also remove some blank lines that were used to split compat code at -devel tree. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e01117c81676dc9897f567e32cdc13a26e85280b Author: Laurent Pinchart Date: Fri Jul 4 00:36:21 2008 -0300 V4L/DVB (8209): uvcvideo: Don't free URB buffers on suspend. All submitted URBs must be killed at suspend time, but URB buffers don't have to be freed. Avoiding a free on suspend/reallocate on resume lowers the presure on system memory. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 291358785cde5536d98a4f3cae77efd8ca626486 Author: Laurent Pinchart Date: Fri Jul 4 00:35:26 2008 -0300 V4L/DVB (8208): uvcvideo: Use GFP_NOIO when allocating memory during resume The swap device might still be asleep, so memory allocated in the resume handler must use GFP_NOIO. Thanks to Oliver Neukum for catching and reporting this bug. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 233548a2fd934a0220db8b1521c0bc88c82e5e53 Author: Laurent Pinchart Date: Fri Jul 4 00:34:59 2008 -0300 V4L/DVB (8207): uvcvideo: Fix a buffer overflow in format descriptor parsing Thanks to Oliver Neukum for catching and reporting this bug. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 553b9fa47d67a77f6456bc969891a347bfb323dc Author: Andoni Zubimendi Date: Sun Jul 6 07:27:19 2008 -0300 V4L/DVB (8205): gspca: Size of frame header adjusted according to sn9c10x in sonixb. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 814429501f65e3482adb8e7678660ceb7a2fc2e6 Author: Jean-Francois Moine Date: Sun Jul 6 07:04:39 2008 -0300 V4L/DVB (8204): gspca: Cleanup code. spca508: Cleanup code. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 80544d3c7a7ce32084c9137c96488704053772e3 Author: Hans de Goede Date: Sun Jul 6 06:40:55 2008 -0300 V4L/DVB (8202): gspca: PAC207 frames may be not compressed. pac207: Set the sizeimage to the max value for 352x288. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c2446b3eba97243acbe2ad0939a28b5edb97eae7 Author: Jean-Francois Moine Date: Sat Jul 5 11:49:20 2008 -0300 V4L/DVB (8201): gspca: v4l2_pix_format in each subdriver. main: Parameter comp_fac removed. main, pac207: get_buff_size op removed. (all) v4l2_pix_format in each subdriver. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit efab8211db79d20032fa7d09b8a3671e68a9c5b9 Author: Harvey Harrison Date: Sat Jul 5 06:12:47 2008 -0300 V4L/DVB (8199): gspca: Compile warnings about NULL ptr. Signed-off-by: Harvey Harrison Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 46ccdafa71c1c95de002ce7a31e700cf5c8195df Author: Hans de Goede Date: Fri Jul 4 18:39:08 2008 -0300 V4L/DVB (8198): gspca: Frame decoding errors when PAC207 in full daylight. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ab8f12cf8e3d33adec382585f9f60f8686a372c3 Author: Hans de Goede Date: Fri Jul 4 18:29:32 2008 -0300 V4L/DVB (8197): gspca: pac207 frames no more decoded in the subdriver. videodev2: New pixfmt pac207: Remove the specific decoding. main: get_buff_size operation added for the subdriver. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 24c530b4abb979f9e79298f0b4c4e83781a0e4c3 Author: Hans de Goede Date: Fri Jul 4 17:55:18 2008 -0300 V4L/DVB (8196): gspca: Correct sizeimage in vidioc_s/try/g_fmt_cap Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a5ae2062252e697d38e53dbbeb91460252208914 Author: Jean-Francois Moine Date: Fri Jul 4 11:16:16 2008 -0300 V4L/DVB (8195): gspca: Input buffer overwritten in spca561 + cleanup code. spca561: Input buffer may be changed on reg write. (all sd): Cleanup code, 'const' added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 54ab92ca05550550bcec2462de2605f35d079b66 Author: Hans de Goede Date: Thu Jul 3 11:20:58 2008 -0300 V4L/DVB (8194): gspca: Fix the format of the low resolution mode of spca561. The low (half) res modes of the spca561 are not spca561 compressed, but are raw bayer, this patches fixes this and adds a PIX_FMT define for the GBRG bayer format used by the spca561 in low res mode. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit bf7f0b98426b54c29ec8100a3f1963114c2f2ef0 Author: Jean-Francois Moine Date: Thu Jul 3 11:09:12 2008 -0300 V4L/DVB (8193): gspca: Input buffer may be changed on reg write. Done for conex, etoms, pac7311, sonixj, t613 and tv8532. Code cleanup for some other subdrivers. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0d2a722ddae5e736a5c36a1b99ee4ca59a8373bc Author: Hans de Goede Date: Thu Jul 3 08:15:22 2008 -0300 V4L/DVB (8192): Try to fix a reg_w() bug Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d646e701819f994c5cb1507dc859b739b5478d32 Author: Hans de Goede Date: Thu Jul 3 06:48:22 2008 -0300 V4L/DVB (8191): gspca: Make CONFIG_VIDEO_ADV_DEBUG actually work. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0c61621412ca09bd692cef86d4c9f358d5e81b0c Author: Andy Walls Date: Mon Jul 7 10:36:16 2008 -0300 V4L/DVB (8189): cx18: Use correct GPIO pin for resetting Xceive 3028 tuner on Yuan MPC718 Change the Yuan MPC718 cards entry to use the correct GPIO pin for resetting the Xceive 3028 tuner. Thanks to Brian Hope for taking the time and figuring out which pin to use. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 53ad02efe7d5908f0ce73a7dac9530f1180f2514 Author: Andy Walls Date: Sun Jul 6 19:36:52 2008 -0300 V4L/DVB (8188): cx18: Add missing reset recovery delay in cx18-i2c.c cx18: Add a missing reset recovery delay in cx18-i2c.c after the final deassert. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit d01eb2dc7d5265ec3bee9ec1b8ab79155e1310d6 Author: Michael Krufky Date: Thu Jul 3 23:43:36 2008 -0300 V4L/DVB (8186): dib0700: add support for Hauppauge Nova-TD Stick 52009 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 69b28b110975abcfac3f7345494e74a771e9b724 Author: Douglas Schilling Landgraf Date: Fri Jul 4 04:40:28 2008 -0300 V4L/DVB (8184): spca508: Add Clone Digital Webcam 11043 Added ID vendor/product for Clone Digital Webcam 11043. Thanks to Ivan Brasil Fuzzer for testing and data collection. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 30b4d355aa02ba274279eae1187539b85bd100ed Author: Michael Krufky Date: Wed Jul 2 12:55:49 2008 -0300 V4L/DVB (8183): cxusb: select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE After adding support for AVerTVHD Volar, DVB_USB_CXUSB must select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 82643d0e90896fba965e6e43692538b2cc093d34 Author: Jean-Francois Moine Date: Wed Jul 2 09:14:56 2008 -0300 V4L/DVB (8181): gspca: read() did not work (loop in kernel, timeout...) main: Remove some vidioc_xx traces. main: read() did not work (user irq instead of mmap irq). main: Lack of v4l1 compat. main: Process loop inside kernel when no frame arriving. main: Double qbuf in read() when too many buffered frames. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 956e42d28f300f5bb928fb5850b3e3c0a8982d23 Author: Jean-Francois Moine Date: Tue Jul 1 10:03:42 2008 -0300 V4L/DVB (8180): Source cleanup - compile error with VIDEO_ADV_DEBUG. main, etoms, mars, pac207, pac7311, sonixb, sonixj, spca500, spca505: Cleanup source. sunplus: Compilation error when VIDEO_ADV_DEBUG set. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 00528d9c2e9e15625883c161867cba61725ba335 Author: Mike Isely Date: Mon Jun 30 03:35:52 2008 -0300 V4L/DVB (8176): pvrusb2: Update video_gop_size When switching video standard, ensure that video GOP size remains appropriately configured. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit ab062fe3b540c157eb66c4acedbedbc200cfd9e2 Author: Mike Isely Date: Mon Jun 30 03:32:35 2008 -0300 V4L/DVB (8175): pvrusb2: Fix misleading source code comment Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 7e87218bbfa2697c7df42ac80498a2fd17b276a4 Author: Hans Verkuil Date: Tue Jul 1 18:46:09 2008 -0300 V4L/DVB (8173): saa711x.c: remove obsolete file. saa711x.c is no longer used. Remove. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dc5e42fb20229487ef11fd6fa0cdb7b7d42170f6 Author: Hans Verkuil Date: Mon Jun 30 20:02:47 2008 -0300 V4L/DVB (8171): ivtv: put back full device name, people relied on it in udev rules. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e8b934de12989d1704e7df7ebb408a6021f08442 Author: Hans Verkuil Date: Sat Jun 28 20:57:56 2008 -0300 V4L/DVB (8169): cx18: enable TS support Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1a3932e0ed9ca46db2b76ce067e4ebaf04d91ea1 Author: Hans Verkuil Date: Sat Jun 28 20:57:30 2008 -0300 V4L/DVB (8168): cx18: Upgrade to newer firmware & update cx18 documentation. Conexant graciously gave us permission to redistribute the firmware. Update the documentation where the firmware can be downloaded. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 86d674a1324cce5708b1b84e4ae162910e201b4f Author: Hans Verkuil Date: Sat Jun 28 14:57:30 2008 -0300 V4L/DVB (8168a): cx18: Update cx18 documentation. Update the documentation, providing an updated list of supported boards. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 81cb727d29eda7692a03be035b7228b4c3f6b610 Author: Hans Verkuil Date: Sat Jun 28 12:49:20 2008 -0300 V4L/DVB (8167): cx18: set correct audio inputs for tuner and line-in 2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f313da113fe083bfb1eb43377f551db4bbe702a6 Author: Hans Verkuil Date: Sat Jun 28 08:03:02 2008 -0300 V4L/DVB (8165): cx18: fix v4l-cx23418-dig.fw firmware load. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c3cb4d95ae778dbc6a4be1e74672d645fc75c8a7 Author: Hans Verkuil Date: Fri Jun 27 23:27:25 2008 -0300 V4L/DVB (8164): cx18/ivtv: choose a better initial TV standard for cards without eeprom. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c1738904d6808a091d7d496b445d20671d513ad4 Author: Hans Verkuil Date: Fri Jun 27 15:33:02 2008 -0300 V4L/DVB (8162): cx18: fix PAL/SECAM support Reverted the 'Fix unintended auto configurations in cx18-av-core' patch, instead disable the auto config completely. Fix a bug in cx18_av_vbi_setup() where the standard tests were done in the wrong order. Tested with NTSC-M, PAL-BG, PAL-I, PAL-DK, PAL-M, PAL-Nc, SECAM-DK, SECAM-L and SECAM-BG. The last one does not work at the moment due to a tda9887.c bug. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e078770a050aa686f895a965f54222c0f201feb3 Author: Mauro Carvalho Chehab Date: Tue Jul 1 04:06:22 2008 -0300 V4L/DVB (8161): gspca: Fix compilation Some callbacks were renamed. Fix it. Signed-off-by: Mauro Carvalho Chehab commit 50a871fed9c82f01baa40100cd2d262784220953 Author: Jean-Francois Moine Date: Mon Jun 30 19:47:33 2008 -0300 V4L/DVB (8158): gspca: minor changes main: V4L2_PIX_FMT_SPCA501 is compressed (thanks to Hans de Goede) main: return 0 when no change on vidioc_s_fmt_cap (thanks to Hans de Goede) pac207: cleanup Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 6a7eba24e4f0ff725d33159f6265e3a79d53a833 Author: Jean-Francois Moine Date: Mon Jun 30 15:50:11 2008 -0300 V4L/DVB (8157): gspca: all subdrivers - remaning subdrivers added - remove the decoding helper and some specific frame decodings Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d43fa32fec442571f10f5d0c3b553413288728de Author: Jean-Francois Moine Date: Thu Jun 12 10:58:58 2008 -0300 V4L/DVB (8156): Many bug fixes, zc3xx added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 4aa0d037a6c8e6b37ecfd986a444f83190c32a21 Author: Jean-Francois Moine Date: Sun May 4 06:46:21 2008 -0300 V4L/DVB (8154): Fix protection problems in the main driver. - Protect format change when streaming active. - Protect USB exchanges on close. - Set a timeout in frame wait. - Have only one capture file and free the resources when closing this file. - Simplify the URB buffer. - Don't reset the control values at open time in pac207. - Fix compilation warnings of stk014. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit e2997a72ddfafc25bd0c8f1f52bcf41979d5a559 Author: Hans de Goede Date: Wed Apr 23 08:09:12 2008 -0300 V4L/DVB (8153): Subdriver pac207 added and minor changes. pac207 added. Check status on mutex lock. Call back on frame dequeue. Free the resources on last close only. Avoid URB and ISOC errors on close. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 63eb9546dcb5e9dc39ab88a603dede8fdd18e717 Author: Jean-Francois Moine Date: Sat Apr 12 09:58:09 2008 -0300 V4L/DVB (8152): Initial release of gspca with only one driver. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 8b53b39d6228cda41b7ddfc9d094a072afca6655 Author: Hans Verkuil Date: Fri Jun 27 21:18:15 2008 -0300 V4L/DVB (8151): saa7134-empress: fix MPEG control support The MPEG controls could not be enumerated and so could not be read or set through the v4l2-ctl utility or shown in control panels. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e5e4cd8df61e602202f588dd545364dba37b4cc7 Author: Tim Farrington Date: Sun Jun 29 11:54:08 2008 -0300 V4L/DVB (8149): Avermedia E506 composite Composite was originally mis-labelled as name_comp1, so it should be simply redone as name_comp, with its now corrected attributes. Signed-off-by: Tim Farrington Signed-off-by: Mauro Carvalho Chehab commit f5376adacc693155c24e4e7be3777bdd0eeb99f7 Author: Daniel Gimpelevich Date: Sat Jun 28 05:01:30 2008 -0300 V4L/DVB (8147): cxusb: add initial support for AVerTVHD Volar Add initial support for this device. The AGC and tracking filter settings for the mxl5003 are known to be wrong, but it generally works. Signed-off-by: Daniel Gimpelevich Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c0f4c0adfdb10747045fcc757a3e60ae1e1558f3 Author: Michael Krufky Date: Sat Jun 28 02:06:50 2008 -0300 V4L/DVB (8146): lgdt330x: add additional FEC control configuration option Allow the following configuration, by passing clock_polarity_flip = 2: Enable FEC automatic reset. Disable spectrum inversion. Enable viterbi resynchronization. Set polarity indicator high. Enable error flag insertion. Thanks to Daniel Gimpelevich, for discovering that this configuration is used on the AVerMedia AVerTVHD Volar. Signed-off-by: Michael Krufky CC: Daniel Gimpelevich Signed-off-by: Mauro Carvalho Chehab commit ecfceef742b816a5c8541a7d58fe215c38d4d859 Author: Mauro Carvalho Chehab Date: Sun Jun 29 08:41:19 2008 -0300 V4L/DVB (8143): Fix compilation for mt9v022 Signed-off-by: Mauro Carvalho Chehab commit 2d5b5a4733b7e32188baa250fbbc4ae11f5e6f69 Author: Mauro Carvalho Chehab Date: Sun Jun 29 08:29:00 2008 -0300 V4L/DVB (8142): ttpci: tda827x.h is at drivers/media/common As reported by Stephen Rothwell : drivers/media/dvb/ttpci/budget-ci.c:50:21: error: tda827x.h: No such file or directory Signed-off-by: Mauro Carvalho Chehab commit 84a9f33614e3cfcc7326629a503d4389c9d84e0f Author: Al Viro Date: Sun Jun 22 14:19:29 2008 -0300 V4L/DVB (8136): xc2028 unaligned access fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 153755a774578dcf921f8145e786ce25f72368d2 Author: Al Viro Date: Sun Jun 22 14:19:39 2008 -0300 V4L/DVB (8135): WRITE_RPS1() converts to le32 itself ... but two ancient drivers had not noticed. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 9c169df8d6877c618587bf40498f2ef378c97eb8 Author: Al Viro Date: Sun Jun 22 14:19:49 2008 -0300 V4L/DVB (8134): zoran annotations and fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 86ecc02755ea2d00925b344272b49b26d610bbe2 Author: Al Viro Date: Sun Jun 22 14:19:59 2008 -0300 V4L/DVB (8133): cx23885 endianness fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 3aa7110e1c415c38c42ef77be0ef2c7a888b9e16 Author: Al Viro Date: Sun Jun 22 14:20:09 2008 -0300 V4L/DVB (8132): bt8xx endianness annotations and fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 947a080037c6ae47cfe5072eadbd189e3da27ecd Author: Al Viro Date: Sun Jun 22 14:20:19 2008 -0300 V4L/DVB (8131): dmx_write: memcpy from user-supplied pointer ... copy to kernel memory first Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit b0ba0e3ab6f452321771325b7b5578f9a804f69e Author: Al Viro Date: Sun Jun 22 14:20:29 2008 -0300 V4L/DVB (8130): split dvb_ringbuffer dual-use functions split the suckers into kernel-memory and user-memory versions, annotate both properly. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 67778b322780200ac14e95c8089a0bd679a467d9 Author: Al Viro Date: Sun Jun 22 14:20:39 2008 -0300 V4L/DVB (8129): pluto_set_dma_addr() fix bogus cpu_to_le32() when passing dma address to hardware via writel() - writel() converts itself. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit a36ef6b1e09d06d4f1ac769eee4bd7e6cf3e0fae Author: Al Viro Date: Sun Jun 22 14:19:19 2008 -0300 V4L/DVB (8128): saa7146: ->cpu_addr and friends are little-endian Annotations + stop saa7146_i2c from playing fast and loose with reuse of ->cpu_addr for host-endian. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit f51b10ef6520f2bd725dc333e771eabd55d6c04f Author: Al Viro Date: Sun Jun 22 14:20:49 2008 -0300 V4L/DVB (8126): net endianness fix According to RFC 4326 (4.1) D-bit is MSB in net-endian 16bit. dvb_net.c did /* Set D-bit for CRC32 verification, * if it was set originally. */ ulen |= 0x0080; which works of little-endian (htons(1<<15) is 0x0080 there), but breaks on big-endian. Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 38f993ad8b1fe4caf9e989caf6e2a25aff3bbaf7 Author: Dean Anderson Date: Thu Jun 26 23:15:51 2008 -0300 V4L/DVB (8125): This driver adds support for the Sensoray 2255 devices. It was primarily developed by Dean Anderson with only a little bit of guidance and cleanup by Greg. Signed-off-by: Dean Anderson Signed-off-by: Greg Kroah-Hartman [mchehab@infradead.org: fixed renamed callbacks] Signed-off-by: Mauro Carvalho Chehab commit bfda3a0b3276cda7f2da1dcd98bd060b60954cbb Author: Daniel Gimpelevich Date: Sat Jun 28 01:45:26 2008 -0300 V4L/DVB (8124): Add LifeVideo To-Go Cardbus PCI ID Signed-off-by: Daniel Gimpelevich Signed-off-by: Mauro Carvalho Chehab commit a9fc52bcbeb5245b58d23c558f3e3e8f18bebbc3 Author: Devin Heitmueller Date: Sat Jun 28 08:57:06 2008 -0300 V4L/DVB (8123): Add support for em2860 based PointNix Intra-Oral Camera em28xx-cards.c em28xx-input.c em28xx-video.c em28xx.h - Add support for the PointNix Intra-Oral Camera, which required addition of a construct for reading the "snapshot" button (provided on the em2860 and em2880 chips, but this is the first case where I have seen it actually used in a product). The button is wired to pin 56 on the em2880. http://www.pointnix.com/ENG/dental/product_02.asp Thanks to Roberto Mantovani for testing the changes Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 305519c924d8f2f2f85c390c6d456dc41dbe0284 Author: Douglas Schilling Landgraf Date: Fri Jun 27 04:15:38 2008 -0300 V4L/DVB (8120): cx23885-417: Replace cx23885_do_ioctl to use video_ioctl2 Convert cx23885-417 to use video_ioctl2 Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9c7ecaf5ace4dba94b4c75afa395440acfb2e36c Author: Dan Taylor Date: Fri Jun 27 13:29:41 2008 -0300 V4L/DVB (8117): saa7134: Avermedia A16D composite input Signed-off-by: Star Trac by Unisen, Inc. Dan Taylor Signed-off-by: Mauro Carvalho Chehab commit 6264c80661eaa2df793dd71d4956f371be955aa2 Author: Hans Verkuil Date: Wed Jun 25 06:54:05 2008 -0300 V4L/DVB (8116): videodev: allow PRIVATE_BASE controls when called through VIDIOC_G/S_CTRL. V4L2_CID_PRIVATE_BASE controls are not allowed when called from VIDIOC_S/G_EXT_CTRL as extended controls use a better mechanism for private controls. But still allow it when called from the VIDIOC_G/S_CTRL to extended control conversion in video_ioctl2() for backwards compatibility. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c5588b5c473c3d496a2f94b80ea8254110866506 Author: Andy Walls Date: Wed Jun 25 00:24:21 2008 -0300 V4L/DVB (8114): cx18: Improve Raptor card audio input routing defintions cx18: Improved Raptor card audio input routing defintions, so that muxer values matched cx18_gpio() values for tuner, line in 1, and radio and added LED indication of selected audio input. Audio line in 2 doesn't work as it uses the not yet supported 2nd I2S port. Tuner/FM Radio AF is mono until SIF support is fixed. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit adb65bc71c8fef53822870cc9018f05b11131233 Author: Hans Verkuil Date: Wed Jun 25 06:32:44 2008 -0300 V4L/DVB (8113): ivtv/cx18: remove s/g_ctrl, now all controls are handled through s/g_ext_ctrl videodev converts old-style controls to an extended control so the ivtv and cx18 drivers no longer have to handle both. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d8799b4699af008290e141804b40c5ebf3d7dc35 Author: Hans Verkuil Date: Wed Jun 25 06:29:01 2008 -0300 V4L/DVB (8112): videodev: improve extended control support in video_ioctl2() - add sanity checks for the extended controls argument. - if the driver only supports extended controls, then convert old-style controls to an extended control callback. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 36ecd4955a5ebee6135e2bcc997712fad4ac9b69 Author: Hans Verkuil Date: Wed Jun 25 06:00:17 2008 -0300 V4L/DVB (8111): ivtv/cx18: fix compile error when CONFIG_VIDEO_ADV_DEBUG is not defined. Thanks to Randy Dunlap for reporting this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1d0a436256dc1aecfad901bcd4432dac1cabe6b2 Author: Mauro Carvalho Chehab Date: Mon Jun 23 12:31:29 2008 -0300 V4L/DVB (8110): bttv: allow debug ioctl's Signed-off-by: Mauro Carvalho Chehab commit f24648e42fd4b7d3ad5af6eaefe0214426933954 Author: Hans Verkuil Date: Sun Jun 22 12:11:13 2008 -0300 V4L/DVB (8107): cx18: improve support for the Raptor board. - add radio definition - reset the audio firmware (required for this board, harmless for the others) Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 156f194b9df243b4c347a62b37258cb088f20297 Author: Hans Verkuil Date: Sun Jun 22 12:08:16 2008 -0300 V4L/DVB (8106): ivtv/cx18: improve tuner std check in card definitions. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e0e31cdb91cddc4cfbf6d5ffa8212f694723269b Author: Hans Verkuil Date: Sun Jun 22 12:03:28 2008 -0300 V4L/DVB (8105): cx2341x: add TS capability The cx18 can support transport streams with newer firmwares. Add a TS capability to the generic cx2341x module. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 37f89f9542c3945bddf46efc15a1b1e349af3f88 Author: Hans Verkuil Date: Sun Jun 22 11:57:31 2008 -0300 V4L/DVB (8104): cx18/ivtv: ioctl debugging improvements Completely rely on the video_ioctl2 debugging facilities rather than doing it ourselves. Fill in some missing fields in ivtv with VIDIOC_G_FBUF. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 21575c13125f2ef790e192e2c70e446c6cfe0d7d Author: Hans Verkuil Date: Sun Jun 22 11:55:09 2008 -0300 V4L/DVB (8103): videodev: fix/improve ioctl debugging Various ioctl debugging fixes and improvements: - use %x rather than %d for control IDs and bitmask fields - make two arrays const - show the whole control array for the ext_ctrl ioctls - print pix_fmt for V4L2_BUF_TYPE_VIDEO_OUTPUT - show full type name rather than an integer - fix CROPCAP debugging - fix G/S_TUNER debugging - show error code in case of an error - other small cleanups Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7dc1b8844eb3e0a91911f20736db87f4876e14b4 Author: Michael Krufky Date: Sat Jun 21 22:13:42 2008 -0300 V4L/DVB (8098): xc5000: add module option to load firmware during driver attach The xc5000 firmware download process can be slow on certain devices. Add a module option, "init_fw" to perform the firmware download during xc5000_attach(), which would get the firmware download over with well before any tune request is made. When this option is enabled, it will reduce the time it takes to get a signal lock during the first tune after driver load, but will add a few seconds to the driver initialization. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fa1035997cbba4c348a88f8b94eb135222aaba12 Author: Huang Weiyi Date: Sat Jun 21 14:30:33 2008 -0300 V4L/DVB (8095): zoran_driver.c: Removed duplicated include Removed duplicated include file in drivers/media/video/zoran_driver.c. Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit fdea5d69c1d335a639e39e83990de84e10fb2057 Author: Hans Verkuil Date: Sat Jun 21 13:25:36 2008 -0300 V4L/DVB (8093): cx18: fix prefix typo Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3d66c405708ee43b08788e89dbd63ebf3bbb5af1 Author: Hans Verkuil Date: Sat Jun 21 11:19:34 2008 -0300 V4L/DVB (8091): cx18: show GPIO pins when VIDIOC_LOG_STATUS is called. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 42b03fe16fe8cc2cd6575e25ed1872fd6f5da56f Author: Ian Armstrong Date: Sat Jun 21 11:09:46 2008 -0300 V4L/DVB (8090): ivtv: yuv decoder lock fix (2) The IVTV_IOC_DMA_FRAME ioctl fails to correctly 'start' the decoder. Although yuv output will be correct, some functions which should be disabled while the decoder is in use remain enabled. This can result in hardware registers being corrupted, causing problems with the mpeg decoder. This patch ensures the decoder 'start' sequence is called, disabling these functions until the device is closed. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 03c2808503b102971226007070c57410267d0b9d Author: Sri Deevi Date: Sat Jun 21 11:06:44 2008 -0300 V4L/DVB (8089): cx18: add support for Conexant Raptor PAL/SECAM card Patch provided courtesy of Conexant http://www.conexant.com. Signed-off-by: Srinivasa Deevi Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 464e9f3a0cabce9a7cf51f382f129d464483b0d0 Author: Ian Armstrong Date: Sat Jun 21 09:25:23 2008 -0300 V4L/DVB (8088): ivtv: yuv decoder lock fix write() operations to the yuv device may not always 'start' the decoder. Although yuv output will be correct, some functions which should be disabled while the decoder is in use remain enabled. This can result in hardware registers being corrupted, causing problems with the mpeg decoder. This patch simply moves the existing decoder 'start' sequence to earlier in the write() handler. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0b5a30e90ddcb0095a1bfc4b44eb3fd1e8ee9f3c Author: Hans Verkuil Date: Sat Jun 21 09:22:19 2008 -0300 V4L/DVB (8087): cx18: make sure all v4l2_format fields are filled in Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e27bf207db4fc6dd500eb82611f102da85cfe7d0 Author: Hans Verkuil Date: Sat Jun 21 09:21:23 2008 -0300 V4L/DVB (8086): ivtv/cx18: fix video_temporal_filter handling If the capture is scaled, then the video_temporal_filter is set to 0 by the cx2341x.c module since otherwise you would get ghosting. However, this was also done in the VIDIOC_S_FMT ioctl which meant that the video_temporal_filter control was reset to 0 or 8 each time S_FMT was called. This was old code that should have been removed a long time ago. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5cf2cc4803a0415f7048951a727204df414325e6 Author: Hans Verkuil Date: Sat Jun 21 09:06:59 2008 -0300 V4L/DVB (8085): ivtv: fill in all v4l2_framebuffer fields in VIDIOC_G/S_FBUF Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 79afcb10dfdd3287875666de34c23510423058b8 Author: Hans Verkuil Date: Sat Jun 21 09:02:36 2008 -0300 V4L/DVB (8084): ivtv/cx18: remove unnecessary memsets & KERNEL_VERSION tests Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8bfb9b1ce62757b8dea07c239efbbeec7bac811a Author: Hans Verkuil Date: Sat Jun 21 08:57:42 2008 -0300 V4L/DVB (8083): videodev: zero fields for ENCODER_CMD and VIDIOC_G_SLICED_VBI_CAP This avoids the need of memsets in the ivtv/cx18 drivers. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3b6fe58f0f18880200969e813d0181d1bdab0966 Author: Andy Walls Date: Sat Jun 21 08:36:31 2008 -0300 V4L/DVB (8082): cx18: convert to video_ioctl2() cx18: convert driver to use video_ioctl2(). Pushed down ioctl debug messages and priority checks as well. Still left serialization lock in place for now. #if 0'ed out sliced vbi ioctl code for now. Patch heavily based on similar changes made to ivtv by Hans Verkuil. Signed-off-by: Andy Walls Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1a05221bc45ccb1b5c583a87dc3639bfc10c4f10 Author: Hans Verkuil Date: Sat Jun 21 08:15:37 2008 -0300 V4L/DVB (8081): ivtv: remove obsolete arrays. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e88360c0f306de8535b5072c7c0dcae20f75af62 Author: Hans Verkuil Date: Sat Jun 21 08:00:56 2008 -0300 V4L/DVB (8080): ivtv: make sure all v4l2_format fields are filled in Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3f038d80039f60e4340eaedd13369e0d2c758b80 Author: Hans Verkuil Date: Thu May 29 16:43:54 2008 -0300 V4L/DVB (8079): ivtv: Convert to video_ioctl2. Based on an initial conversion patch from Douglas Landgraf. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 539a7555b31e65e66fb84c881d07d2bf18c974d0 Author: brandon@ifup.org Date: Fri Jun 20 22:58:53 2008 -0300 V4L/DVB (8078): Introduce "index" attribute for persistent video4linux device nodes A number of V4L drivers have a mod param to specify their preferred minors. This is because it is often desirable for applications to have a static /dev name for a particular device. However, using minors has several disadvantages: 1) the requested minor may already be taken 2) using a mod param is driver specific 3) it requires every driver to add a param 4) requires configuration by hand This patch introduces an "index" attribute that when combined with udev rules can create static device paths like this: /dev/v4l/by-path/pci-0000\:00\:1d.2-usb-0\:1\:1.0-video0 /dev/v4l/by-path/pci-0000\:00\:1d.2-usb-0\:1\:1.0-video1 /dev/v4l/by-path/pci-0000\:00\:1d.2-usb-0\:1\:1.0-video2 $ ls -la /dev/v4l/by-path/pci-0000\:00\:1d.2-usb-0\:1\:1.0-video0 lrwxrwxrwx 1 root root 12 2008-04-28 00:02 /dev/v4l/by-path/pci-0000:00:1d.2-usb-0:1:1.0-video0 -> ../../video1 These paths are steady across reboots and should be resistant to rearranging across Kernel versions. video_register_device_index is available to drivers to request a specific index number. Signed-off-by: Brandon Philips Signed-off-by: Kees Cook Signed-off-by: Kay Sievers Signed-off-by: Mauro Carvalho Chehab commit bbfc4c234e240b67ccd9cdca72d76267bad0dc96 Author: Oliver Endriss Date: Thu Jun 19 23:36:45 2008 -0300 V4L/DVB (8076): budget-ci: Support the bundled remote control of the TT DVB-C 1501 Support the bundled remote control of the TT DVB-C 1501 Thanks-to: SG Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit ccb43646ed574ef0d1ab6ddf73283a3c7caa426d Author: Oliver Endriss Date: Thu Jun 19 22:56:03 2008 -0300 V4L/DVB (8072): av7110: Removed some obsolete definitions and one unused variable Removed some obsolete definitions and one unused variable. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 980b59fb5b4ed4fac91dc57f4e50593faa804f8f Author: Mauro Carvalho Chehab Date: Wed Jun 18 16:23:52 2008 -0300 V4L/DVB (8065): Add missing selects at dvb-usb/Kconfig Add missing auto-selects for MEDIA_TUNER_XC2028 and DVB_TDA1004X at dvb-usb/Kconfig. Signed-off-by: Mauro Carvalho Chehab commit fb733bf52377a2a91d9f85775a2bd1d877927ea0 Author: Michael Krufky Date: Tue Jun 17 15:32:08 2008 -0300 V4L/DVB (8060): Kconfig: MEDIA_TUNER_CUSTOMIZE should be disabled by default The build option, MEDIA_TUNER_CUSTOMIZE, allows us to disable tuner drivers that would have otherwise been selected by default. This is an advanced customization option that should be disabled by default. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 03a0ea11e2db5cf4fb47ca78cb25c4f7b9c8293b Author: Mauro Carvalho Chehab Date: Wed Jun 18 09:27:21 2008 -0300 V4L/DVB (8059): Add missing select for MEDIA_TUNER_TDA827X $ find linux/drivers/media/dvb -exec grep -l tda827x_attach '{}' \; linux/drivers/media/dvb/dvb-usb/m920x.c linux/drivers/media/dvb/ttpci/budget-ci.c Signed-off-by: Mauro Carvalho Chehab commit a046e43dc884e4cd01c682b22db9cc872d7b0e60 Author: Mauro Carvalho Chehab Date: Mon Jun 16 12:35:06 2008 -0300 V4L/DVB (8051): ttpci/Kconfig: Technotrend budget C-1501 needs tda10023 Auto-selects tda10023, for budget-ci, if !DVB_FE_CUSTOMISE. This is needed for Technotrend budget C-1501 dvb board. Signed-off-by: Mauro Carvalho Chehab commit c121ba1f408eb13ff50891ff8d9e5914f993939c Author: Mauro Carvalho Chehab Date: Mon Jun 16 12:31:57 2008 -0300 V4L/DVB (8050): Add register get/set debug ioctls to saa7134 Signed-off-by: Mauro Carvalho Chehab commit 11417daab6d596f8d4851476777ca49fb3b12a87 Author: Sigmund Augdal Date: Sun Jun 15 17:25:46 2008 -0300 V4L/DVB (8049): budget-ci: Add support for Technotrend budget C-1501 dvb-c card The following experimental patch adds support for the technotrend budget C-1501 dvb-c card. The parameters used to configure the tda10023 demod chip are largely determined experimentally, but works quite for me in my initial tests. Signed-off-by: Sigmund Augdal Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit df9b5d4cf636f992276b6b595620d9b2a63095db Author: Jean Delvare Date: Sun Jun 15 12:20:18 2008 -0300 V4L/DVB (8047): bt8xx: i2c structure templates clean-up Clean up the use of structure templates in bttv-i2c. For one thing, a real template is supposed to be read-only. And in some cases it's more efficient to initialize the few fields we need individually. This clean-up shrinks bttv-i2c.o by 29% (x86_64). Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 6275163e3ddbf0f0b34981bf6dc50b803e5a1c67 Author: Jean Delvare Date: Thu Jun 12 13:20:46 2008 -0300 V4L/DVB (8046): zoran: i2c structure templates clean-up Clean up the use of structure templates in zoran_card. For one thing, a real template is supposed to be read-only. And in some cases it's more efficient to initialize the few fields we need individually. Signed-off-by: Jean Delvare Acked-by: Ronald S. Bultje Signed-off-by: Mauro Carvalho Chehab commit 9fdd9caf44296213c1e1130e86c2f919f83124da Author: Antti Palosaari Date: Wed Jun 11 11:43:19 2008 -0300 V4L/DVB (8032): Anysee: fix Kconfig - select DVB_PLL - fix typos in comments Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 5ae2fcaee4b0d6bf0fa5d9bd71e1291c9a9a6e60 Author: Antti Palosaari Date: Mon Jun 9 22:58:22 2008 -0300 V4L/DVB (8031): Anysee: support for Anysee E30C Plus rev 0.4 - support for Anysee E30C Plus rev 0.4 - set IO port E - set correct TS mode - change deltaf according to latest Windows driver Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit e75888661a7008503e3d147f92499d9c30ebf6e3 Author: Antti Palosaari Date: Mon Jun 9 22:53:04 2008 -0300 V4L/DVB (8030): TDA10023: make TS output mode configurable - make TS output mode configurable Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 584ce48de9e01838402c8e82c78f166775ea3075 Author: Mauro Carvalho Chehab Date: Tue Jun 10 15:21:49 2008 -0300 V4L/DVB (8024): vivi: rename MODULE_NAME macro to VIVI_MODULE_NAME to avoid namespace conflicts Signed-off-by: Mauro Carvalho Chehab commit 745271aefec602326b1dafded778d1eb94bc50ad Author: Carl Karsten Date: Tue Jun 10 00:02:32 2008 -0300 V4L/DVB (8023): vivi: announce that it is registered as /dev/video%d Signed-off-by: Carl Karsten Signed-off-by: Mauro Carvalho Chehab commit 878cf2a5d86c7045b480f09b56b96a779449b0f6 Author: Dmitry Belimov Date: Tue Jun 10 14:22:00 2008 -0300 V4L/DVB (8021): Beholder's cards description Split the Beholder M6 family to different models. Because M6 hasn`t RDS, M63 has chip with AC3 codec, M6 Extra has other type of HF module. Add correct data for support MPEG encoder. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 37df96d39eefd0c1db69a336895c4691d2bc63a1 Author: Dmitry Belimov Date: Tue Jun 10 12:43:58 2008 -0300 V4L/DVB (8019): New for I2S on for MPEG of saa7134_empress Rework saa7134_enable_i2s function. Remove vendor specific data. Configure I2S output port specific for model of SAA7133/5-SAA7134. I think it is more good. Renamed definition of I2S audio output control register. It`s SAA7133/5 register Start video port after configuring procedure. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit fb49558c3b6b55c0f3378b7e8935c2d9e357f93a Author: Antti Palosaari Date: Wed May 28 22:16:31 2008 -0300 V4L/DVB (8014): gl861: coding style fixes - coding style fixes raised by checkpatch Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 17d9d558e818530cc7d210ffea575a36f48eaa1a Author: Devin Heitmueller Date: Sun Jun 8 10:22:03 2008 -0300 V4L/DVB (8006): em28xx: Split HVR900 into two separate entries - Separate the newer variant of the HVR-900 into its own device profile because it has a Micronas DRX397 instead of the Zarlink demod. This doesn't make the device work, but at least we don't try to initialize it as though it had the Zarlink device. Signed-off-by: Devin Heitmueller [mchehab@infradead.org: avoid compilation breakage at mainstream, where drx397xD.h doesn't exist yet] Signed-off-by: Mauro Carvalho Chehab commit bbc8995f9fa3f9cdd77aeb7c9bbf5bf526feca3c Author: Tobias Lorenz Date: Sat May 31 15:11:32 2008 -0300 V4L/DVB (7997): si470x: hardware frequency seek support This patch brings the following changes: - this now finally adds hardware frequency seek support Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit ace7d4bbe6170ef9b72bfa82c3e5769d250fffae Author: Tobias Lorenz Date: Sat May 31 15:09:07 2008 -0300 V4L/DVB (7996): si470x: afc indication This patch brings the following changes: - afc indication: device has no indication whether freq is too low or too high therefore afc always return 1, when freq is wrong Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit a7c850a07eddf0e0f515d57b2ce696a9779c6ed1 Author: Tobias Lorenz Date: Sat May 31 15:07:52 2008 -0300 V4L/DVB (7995): si470x: a lot of small code cleanups This patch brings the following changes: - comment on how to listen to an usb audio device   (i get so many questions about that...) - code cleanup (error handling, more warnings, spacing, ...) Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 6cc72658897ee970e4ecfefaae58f043a98a8e65 Author: Tobias Lorenz Date: Sat May 31 15:06:50 2008 -0300 V4L/DVB (7994): si470x: let si470x_get_freq return errno This patch brings the following changes: - version bumped to 1.0.8 for all the following patches - si470x_get_freq now returns errno Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit ce5829e5fc8204af09db5b226a3dce9824e7d596 Author: Tobias Lorenz Date: Sat May 31 15:04:32 2008 -0300 V4L/DVB (7993): si470x: move global lock to device structure this patch brings the following changes: - move the global disconnect lock into the device structure - code cleanup (spaces to tabs, long line splits, ...) Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 4fd305b2a2c4d16e8d4ebc95c84f946edd3385c5 Author: Devin Heitmueller Date: Wed Jun 4 13:43:46 2008 -0300 V4L/DVB (7992): Add support for Pinnacle PCTV HD Pro stick (the older variant 2304:0227) Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 72937890f98167cbe626f24df2c16d6b63e3e357 Author: Hans Verkuil Date: Sun Jun 1 10:35:18 2008 -0300 V4L/DVB (7988): soc_camera: missed fmt callback conversion. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 335377b73dd0b0af1fbd283ceae6fcb87a747885 Author: Michael Krufky Date: Wed May 7 01:43:10 2008 -0300 V4L/DVB (7986): cx23885: add initial support for DViCO FusionHDTV7 Dual Express Only one frontend is enabled right now. The second frontend can lock, but transport doesn't work yet. The device will be supported as a single tuner device until the second frontend is working. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 26151c32d3d001f64e75871588acd0aff3f216d7 Author: Michael Krufky Date: Tue Jun 3 05:16:37 2008 -0300 V4L/DVB (7984): tda18271: update filename in comments This file was renamed but we forgot to change it in the comments. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f808a9e3cefd577d96d43d308685468c0a03185e Author: Dmitri Belimov Date: Wed May 21 03:16:52 2008 -0300 V4L/DVB (7976): I2S on for MPEG of saa7134_empress Rework saa7134_enable_i2s function. Add vendor specific data. Add definition for I2S audio output control register. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 53af158a901a32dd8639fbe03db5354ab711d8f0 Author: Antti Palosaari Date: Wed May 28 03:57:39 2008 -0300 V4L/DVB (7952): AU6610: various cosmetic changes - update license comments - change MODULE_DESCRIPTION from device specific to chipset specific - correct debug switch from deb_rc to deb_info - correct MPEG2 stream interval from 1.25 to 1 - change frontend_attach error code from -EIO to -ENODEV Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit bbf23af2b10926c0d489d74814d9744cd495c3bc Author: Antti Palosaari Date: Wed May 28 01:01:04 2008 -0300 V4L/DVB (7951): AU6610: remove useless identify_state - remove useless identify_state - device is always warm Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit b6b2d268445ad4f5fac495bbbae6d2922f0becd9 Author: Antti Palosaari Date: Wed May 28 00:53:27 2008 -0300 V4L/DVB (7950): AU6610: coding style fixes - coding style fixes raised by checkpatch Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 78b526a43561d7e5e702ba27948e422dfbc4bea1 Author: Hans Verkuil Date: Wed May 28 12:16:41 2008 -0300 V4L/DVB (7949): videodev: renamed the vidioc_*_fmt_* callbacks The naming for the callbacks that handle the VIDIOC_ENUM_FMT and VIDIOC_S/G/TRY_FMT ioctls was very confusing. Renamed it to match the v4l2_buf_type name. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0e3bd2b9996dfa4105617e2369155823df6b389a Author: Hans Verkuil Date: Tue May 27 22:31:43 2008 -0300 V4L/DVB (7948): videodev: add missing vidioc_try_fmt_sliced_vbi_output and VIDIOC_ENUMOUTPUT handling There was no vidioc_try_fmt_sliced_vbi_output, instead vidioc_try_fmt_vbi_output was reused. The VIDIOC_ENUMOUTPUT handling was missing altogether, even though the callback existed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b2de2313f170c3f7341d3a94365c5139a23067a7 Author: Hans Verkuil Date: Wed May 28 08:27:00 2008 -0300 V4L/DVB (7947): videodev: add vidioc_g_std callback. The default videodev behavior for VIDIOC_G_STD is not correct for all devices. Add a new callback that drivers can use instead. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7bb846afceafdaceb88d2ed2e861585d26e353b9 Author: Hans Verkuil Date: Tue May 27 21:32:08 2008 -0300 V4L/DVB (7946): videodev: small fixes for VIDIOC_G_FREQUENCY and VIDIOC_G_FMT __video_do_ioctl incorrectly zeroed the tuner field of v4l2_frequency and did not zero the full fmt union of v4l2_format. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1d0ba5f3784612fe6e91a12e0dec37c797d4f07c Author: Tobias Lorenz Date: Mon May 26 18:40:46 2008 -0300 V4L/DVB (7942): Hardware frequency seek ioctl interface Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit f90fe7a3f7fcba0abd89ce0978628ef1d86ecbf9 Author: Mike Isely Date: Mon May 26 06:00:47 2008 -0300 V4L/DVB (7939): pvrusb2: Remove sysfs interface hackery Back in the early days of the pvrusb2 driver, the kernel class mechanism in use for the sysfs interface had no means to pass per-attribute information to the show / store functions. This forced me to implement a horrible ugly thunking mechanism (i.e. infer the missing data through the use of dedicated cookie cutter bounce functions). However now we're using a better mechanism which also passes enough additional information to the show / store functions that we no longer need the hack. So eliminate all the crap. Yay! Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit fa98e594220b86eb3632de478352e93ebf1201fa Author: Mike Isely Date: Mon May 26 05:54:24 2008 -0300 V4L/DVB (7938): pvrusb2: Increase enforced encoder wait delay to improve reliability The driver enforces a "quiet period" on the encoder in certain situations before attempting to operate it. This seems to help avoid video encoding errors / corruption. The quiet period was 50msec, but through experimentation it has been observed to improve further if the interval is increased to 100msec. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 83ce57aa45a59e25146a32ee9f68edb7eecacd2b Author: Mike Isely Date: Mon May 26 05:51:57 2008 -0300 V4L/DVB (7937): pvrusb2: Change several embedded timer constants to defined values This is primarily a cosmetic change to make it easier to change some of the time constants used in the driver. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 64723b301846636accbfb1539ebda0835f683a72 Author: Mike Isely Date: Sun May 25 17:08:13 2008 -0300 V4L/DVB (7936): pvrusb2: Remove svn Id keyword from all sources Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 4451342db5b5b779add112c6b15d676f07c73b33 Author: Hans Verkuil Date: Tue May 20 06:24:04 2008 -0300 V4L/DVB (7927): ivtv: simplify gpio initialization for XCeive tuners. Separate gpio_init field and xceive_pin and combine the two when the gpio is initialized. So there is no longer any need to set the xceive pin in the gpio_init values, simplifying the creation of a new card definition. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d56eebfbdc11d1a3809d8bd793a118da5058ffa8 Author: Hans Verkuil Date: Tue May 20 06:19:47 2008 -0300 V4L/DVB (7926): ivtv: add support for the Buffalo PC-MV5L/PCI card. Thanks to Peter Brandt for doing the necessary tests to fill out the card definition! Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b4ac3c8d8de387366be11c7320693e0b14429a49 Author: Jean Delvare Date: Tue May 13 18:27:15 2008 -0300 V4L/DVB (7924): ivtv/cx18: snprintf fixes snprinf() takes the trailing \0 into account in its length calculations, so there is no need to subtract 1 to the buffer size. Signed-off-by: Jean Delvare Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 54b6550e430aa8739dceb5ba0fe4325c0208d3a7 Author: Michael Krufky Date: Sun May 25 13:28:46 2008 -0300 V4L/DVB (7921): s5h1411.c shouldn't #include "dvb-pll.h" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bbe09cbe3f082b0af8fd83ccdf5ce1cf005da3eb Author: Michael Krufky Date: Sun May 25 13:27:57 2008 -0300 V4L/DVB (7920): s5h1409.c shouldn't #include "dvb-pll.h" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 073204326d8f767e9702257c140ca1cf3071fd46 Author: Michael Krufky Date: Sun May 25 00:25:08 2008 -0300 V4L/DVB (7917): au8522.c shouldn't #include "dvb-pll.h" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a51e34dd6080d8d5c9e95a4e0292cd4cb889a61b Author: Antti Palosaari Date: Sat May 17 23:05:48 2008 -0300 V4L/DVB (7914): Anysee: driver for Anysee DVB-T/C receiver - driver for Anysee DVB-T/C receiver Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 139dfeb2611ce92dec4c6b77297d209748340a21 Author: Antti Palosaari Date: Sat May 17 23:02:00 2008 -0300 V4L/DVB (7913): DVB-PLL: add Samsung DTOS403IH102A tuner - add Samsung DTOS403IH102A tuner Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 4388c3b4fe0362e8bb3fe3a09b312db929b8c730 Author: Antti Palosaari Date: Sat May 17 22:58:04 2008 -0300 V4L/DVB (7912): TDA10023: make few parameters configurable - separate TDA10021 and TDA10023 attach - configurable Xtal settings - configurable input freq offset + baseband conversion type settings Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 34cb61693e204897a6ae37d56a1e07d0cdd8cdbf Author: Sakari Ailus Date: Tue May 13 09:21:06 2008 -0300 V4L/DVB (7897): TCM825x: Include invertation of image mirroring in configuration Add invertation of image mirroring register bits to default configuration. This is useful when the camera module is e.g. mounted upside down. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit 4cbeb3711481a7e563fe4c61888986c4aa1cb22e Author: Ian Armstrong Date: Mon May 12 11:53:10 2008 -0300 V4L/DVB (7886): ivtvfb: Use DMA for write() write() operations to the ivtv framebuffer will now attempt to use DMA if the amount of data to copy is >= 4096 bytes. This change effectively depreciates the need for the proprietary IVTVFB_IOC_DMA_FRAME ioctl since a write() of sufficient size will do the same thing. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5a4f5da6552e6c55eff6fbddfee3eab908325c63 Author: Michael Krufky Date: Sun May 11 16:37:50 2008 -0300 V4L/DVB (7883): pvrusb2: make default frequency configurable via modprobe option The pvrusb2 driver initially sets the tuner to known broadcast frequencies in the Chicago area, to ease driver testing for the maintainer. This patch keeps those default frequencies, but allows them to be altered via modprobe option. This allows the same ease and convenience for testing multiple pvrusb2 devices one after another under other conditions and areas. For instance, the default initial frequency, 175.25 MHz, might not necessarily be valid on all cable television networks, but usually will be a valid NTSC broadcast channel. Signed-off-by: Michael Krufky Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit e9b59f6e2f6686016dfea7625e98fbef1e335c61 Author: Adrian Bunk Date: Sat May 10 04:35:24 2008 -0300 V4L/DVB (7882): pvrusb2: make code static This patch makes the following needlessly global code static: - pvrusb2-devattr.c: struct pvr2_onair_creator_fe_props - pvrusb2-devattr.c: struct pvr2_onair_usb2_fe_props - pvrusb2-devattr.c: struct pvr2_73xxx_dvb_props - pvrusb2-devattr.c: struct pvr2_750xx_dvb_props - pvrusb2-devattr.c: struct pvr2_751xx_dvb_props - pvrusb2-hdw.c:pvr2_led_ctrl_hauppauge() Signed-off-by: Adrian Bunk Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 5ad6b816e2227a7daf9569f1dbb8d7af90b387b2 Author: Harvey Harrison Date: Tue Apr 15 22:22:11 2008 -0300 V4L/DVB (7586): radio: use get/put_unaligned_* helpers Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 722c05f2192070bac0208b2c16ce13929b32d92f Author: Avi Kivity Date: Sun Jul 13 11:33:54 2008 +0300 KVM: MMU: Fix potential race setting upper shadow ptes on nonpae hosts The direct mapped shadow code (used for real mode and two dimensional paging) sets upper-level ptes using direct assignment rather than calling set_shadow_pte(). A nonpae host will split this into two writes, which opens up a race if another vcpu accesses the same memory area. Fix by calling set_shadow_pte() instead of assigning directly. Noticed by Izik Eidus. Signed-off-by: Avi Kivity commit 2a7c5b8b550b1fb1db9eb490420132e637f5dcb4 Author: Glauber Costa Date: Thu Jul 10 17:08:15 2008 -0300 KVM: x86 emulator: emulate clflush If the guest issues a clflush in a mmio address, the instruction can trap into the hypervisor. Currently, we do not decode clflush properly, causing the guest to hang. This patch fixes this emulating clflush (opcode 0f ae). Signed-off-by: Glauber Costa Signed-off-by: Avi Kivity commit 376c53c2b30d4a1955240f59f4ecd959aa118f92 Author: Marcelo Tosatti Date: Thu Jul 10 20:54:29 2008 -0300 KVM: MMU: improve invalid shadow root page handling Harden kvm_mmu_zap_page() against invalid root pages that had been shadowed from memslots that are gone. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 34d4cb8fca1f2a31be152b74797e6cd160ec9de6 Author: Marcelo Tosatti Date: Thu Jul 10 20:49:31 2008 -0300 KVM: MMU: nuke shadowed pgtable pages and ptes on memslot destruction Flush the shadow mmu before removing regions to avoid stale entries. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit d6e88aec07aa8f6c7e4024f5734ec659fd7c5a40 Author: Avi Kivity Date: Thu Jul 10 16:53:33 2008 +0300 KVM: Prefix some x86 low level function with kvm_, to avoid namespace issues Fixes compilation with CONFIG_VMI enabled. Signed-off-by: Avi Kivity commit c65bbfa1d693d375da51f9c8aa9fb26f09fa19ed Author: Ben-Ami Yassour Date: Sun Jul 6 17:15:07 2008 +0300 KVM: check injected pic irq within valid pic irqs Check that an injected pic irq is between 0 and 15. Signed-off-by: Ben-Ami Yassour Signed-off-by: Avi Kivity commit 19fdfa0d133ae216e9d1c69a8333fe63fcf8e584 Author: Mohammed Gamal Date: Sun Jul 6 16:51:26 2008 +0300 KVM: x86 emulator: Fix HLT instruction This patch fixes issue encountered with HLT instruction under FreeDOS's HIMEM XMS Driver. The HLT instruction jumped directly to the done label and skips updating the EIP value, therefore causing the guest to spin endlessly on the same instruction. The patch changes the instruction so that it writes back the updated EIP value. Signed-off-by: Mohammed Gamal Signed-off-by: Avi Kivity commit ac9f6dc0db0b5582ebf8bb720d7c41c3d2159013 Author: Avi Kivity Date: Sun Jul 6 15:48:31 2008 +0300 KVM: Apply the kernel sigmask to vcpus blocked due to being uninitialized Signed-off-by: Avi Kivity commit 4e1096d27f3d095735c1c69c7b0a26a06a0d454e Author: Sheng Yang Date: Sun Jul 6 19:16:51 2008 +0800 KVM: VMX: Add ept_sync_context in flush_tlb Fix a potention issue caused by kvm_mmu_slot_remove_write_access(). The old behavior don't sync EPT TLB with modified EPT entry, which result in inconsistent content of EPT TLB and EPT table. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 5a4c92880493945678315a6df810f7a21f55b985 Author: Marcelo Tosatti Date: Thu Jul 3 18:33:02 2008 -0300 KVM: mmu_shrink: kvm_mmu_zap_page requires slots_lock to be held kvm_mmu_zap_page() needs slots lock held (rmap_remove->gfn_to_memslot, for example). Since kvm_lock spinlock is held in mmu_shrink(), do a non-blocking down_read_trylock(). Untested. Signed-off-by: Avi Kivity commit 7e37c2998a5a0b00134f6227167694b710f57ac0 Author: Adrian Bunk Date: Tue Jul 1 01:19:19 2008 +0300 x86: KVM guest: make kvm_smp_prepare_boot_cpu() static This patch makes the needlessly global kvm_smp_prepare_boot_cpu() static. Signed-off-by: Adrian Bunk Signed-off-by: Avi Kivity commit 0da1db75a2feca54564add30828bab658982481c Author: Joerg Roedel Date: Wed Jul 2 16:02:11 2008 +0200 KVM: SVM: fix suspend/resume support On suspend the svm_hardware_disable function is called which frees all svm_data variables. On resume they are not re-allocated. This patch removes the deallocation of svm_data from the hardware_disable function to the hardware_unsetup function which is not called on suspend. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 180c12fb22bd17c7187ae1bce023d24a42b2980c Author: Christian Borntraeger Date: Fri Jun 27 15:05:40 2008 +0200 KVM: s390: rename private structures While doing some tests with our lcrash implementation I have seen a naming conflict with prefix_info in kvm_host.h vs. addrconf.h To avoid future conflicts lets rename private definitions in asm/kvm_host.h by adding the kvm_s390 prefix. Signed-off-by: Christian Borntraeger Signed-off-by: Carsten Otte Signed-off-by: Avi Kivity commit 4da29e909ea8087de09e27476f91f51a070cabe8 Author: Christian Borntraeger Date: Fri Jun 27 15:05:38 2008 +0200 KVM: s390: Set guest storage limit and offset to sane values Some machines do not accept 16EB as guest storage limit. Lets change the default for the guest storage limit to a sane value. We also should set the guest_origin to what userspace thinks it is. This allows guests starting at an address != 0. Signed-off-by: Christian Borntraeger Signed-off-by: Carsten Otte Signed-off-by: Avi Kivity commit dfdded7c41e5b68c79a9f8a942d41f56bc265ba4 Author: Carsten Otte Date: Fri Jun 27 15:05:34 2008 +0200 KVM: Fix memory leak on guest exit This patch fixes a memory leak, we want to free the physmem when destroying the vm. Signed-off-by: Carsten Otte Signed-off-by: Avi Kivity commit eff0114ac3d3a20a5c93b31b00134e59bfc75189 Author: Carsten Otte Date: Fri Jun 27 15:05:31 2008 +0200 KVM: s390: dont allocate dirty bitmap This patch #ifdefs the bitmap array for dirty tracking. We don't have dirty tracking on s390 today, and we'd love to use our storage keys to store the dirty information for migration. Therefore, we won't need this array at all, and due to our limited amount of vmalloc space this limits the amount of guests we can run. Signed-off-by: Carsten Otte Signed-off-by: Avi Kivity commit f8b78fa3d406f3a2dc038e2b47749013a9295994 Author: Marcelo Tosatti Date: Mon Jun 23 12:04:25 2008 -0300 KVM: move slots_lock acquision down to vapic_exit There is no need to grab slots_lock if the vapic_page will not be touched. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit efa67e0d1f51842393606034051d805ab9948abd Author: Chris Lalancette Date: Fri Jun 20 09:51:30 2008 +0200 KVM: VMX: Fake emulate Intel perfctr MSRs Older linux guests (in this case, 2.6.9) can attempt to access the performance counter MSRs without a fixup section, and injecting a GPF kills the guest. Work around by allowing the guest to write those MSRs. Tested by me on RHEL-4 i386 and x86_64 guests, as well as F-9 guests. Signed-off-by: Chris Lalancette Signed-off-by: Avi Kivity commit 65267ea1b3e768dc54b63cd7fad520d89c27d350 Author: Sheng Yang Date: Wed Jun 18 14:43:38 2008 +0800 KVM: VMX: Fix a wrong usage of vmcs_config The function ept_update_paging_mode_cr0() write to CPU_BASED_VM_EXEC_CONTROL based on vmcs_config.cpu_based_exec_ctrl. That's wrong because the variable may not consistent with the content in the CPU_BASE_VM_EXEC_CONTROL MSR. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit db475c39eca0f2e44953d96e768d7ce808ab85bd Author: Avi Kivity Date: Sun Jun 22 16:46:22 2008 +0300 KVM: MMU: Fix printk format Signed-off-by: Avi Kivity commit 6ada8cca79cb971f5da7d1756f4f9292e3ef1e03 Author: Avi Kivity Date: Sun Jun 22 16:45:24 2008 +0300 KVM: MMU: When debug is enabled, make it a run-time parameter Signed-off-by: Avi Kivity commit 7a5b56dfd3a682a51fc84682290d5147872a8e99 Author: Avi Kivity Date: Sun Jun 22 16:22:51 2008 +0300 KVM: x86 emulator: lazily evaluate segment registers Instead of prefetching all segment bases before emulation, read them at the last moment. Since most of them are unneeded, we save some cycles on Intel machines where this is a bit expensive. Signed-off-by: Avi Kivity commit 0adc8675d645940139d12477e5e05b8a0a7a1117 Author: Avi Kivity Date: Sun Jun 15 22:45:54 2008 -0700 KVM: x86 emulator: avoid segment base adjust for lea Signed-off-by: Avi Kivity commit f5b4edcd52e78556800f90d08bfc9126416ac82f Author: Avi Kivity Date: Sun Jun 15 22:09:11 2008 -0700 KVM: x86 emulator: simplify rip relative decoding rip relative decoding is relative to the instruction pointer of the next instruction; by moving address adjustment until after decoding is complete, we remove the need to determine the instruction size. Signed-off-by: Avi Kivity commit 84411d85dacdb6665578608c6a70fc8b819761a8 Author: Avi Kivity Date: Sun Jun 15 21:53:26 2008 -0700 KVM: x86 emulator: simplify r/m decoding Consolidate the duplicated code when not in any special case. Signed-off-by: Avi Kivity commit dc71d0f1620790ec8e54101ca37e7b31e31208a8 Author: Avi Kivity Date: Sun Jun 15 21:23:17 2008 -0700 KVM: x86 emulator: simplify sib decoding Instead of using sparse switches, use simpler if/else sequences. Signed-off-by: Avi Kivity commit 8684c0af0b2bab770c257e2a04e1546eed35fa56 Author: Avi Kivity Date: Sun Jun 15 21:13:41 2008 -0700 KVM: x86 emulator: handle undecoded rex.b with r/m = 5 in certain cases x86_64 does not decode rex.b in certain cases, where the r/m field = 5. Signed-off-by: Avi Kivity commit b13354f8f092884fa8d79472404de4907b25d579 Author: Mohammed Gamal Date: Sun Jun 15 19:37:38 2008 +0300 KVM: x86 emulator: emulate nop and xchg reg, acc (opcodes 0x90 - 0x97) Signed-off-by: Mohammed Gamal Signed-off-by: Avi Kivity commit f76c710d759250a43976bcfcab6af6ebb94b7dc2 Author: Avi Kivity Date: Fri Jun 13 22:45:42 2008 +0300 KVM: Use printk_rlimit() instead of reporting emulation failures just once Emulation failure reports are useful, so allow more than one per the lifetime of the module. Signed-off-by: Avi Kivity commit 9ef621d3be56e1188300476a8102ff54f7b6793f Author: Tan, Li Date: Fri May 23 14:54:09 2008 +0800 KVM: Support mixed endian machines Currently kvmtrace is not portable. This will prevent from copying a trace file from big-endian target to little-endian workstation for analysis. In the patch, kernel outputs metadata containing a magic number to trace log, and changes 64-bit words to be u64 instead of a pair of u32s. Signed-off-by: Tan Li Acked-by: Jerone Young Acked-by: Hollis Blanchard Signed-off-by: Avi Kivity commit 25be46080f1a446cb2bda3daadbd22a5682b955e Author: Glauber Costa Date: Tue Jun 10 10:46:53 2008 -0300 KVM: Do not calculate linear rip in emulation failure report If we're not gonna do anything (case in which failure is already reported), we do not need to even bother with calculating the linear rip. Signed-off-by: Glauber Costa Signed-off-by: Avi Kivity commit 622395a9e63bf87a16faecf555ed02375cbae5b7 Author: Marcelo Tosatti Date: Wed Jun 11 19:52:53 2008 -0300 KVM: only abort guest entry if timer count goes from 0->1 Only abort guest entry if the timer count went from 0->1, since for 1->2 or larger the bit will either be set already or a timer irq will have been injected. Using atomic_inc_and_test() for it also introduces an SMP barrier to the LAPIC version (thought it was unecessary because of timer migration, but guest can be scheduled to a different pCPU between exit and kvm_vcpu_block(), so there is the possibility for a race). Noticed by Avi. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 7f39f8ac177db258200053074aa7a3d98656b1cf Author: Laurent Vivier Date: Fri May 30 16:05:57 2008 +0200 KVM: Add coalesced MMIO support (ia64 part) This patch enables coalesced MMIO for ia64 architecture. It defines KVM_MMIO_PAGE_OFFSET and KVM_CAP_COALESCED_MMIO. It enables the compilation of coalesced_mmio.c. [akpm: fix compile error on ia64] Signed-off-by: Laurent Vivier Signed-off-by: Andrew Morton Signed-off-by: Avi Kivity commit 588968b6b7d34e6a88f538d1db9aca47b203623e Author: Laurent Vivier Date: Fri May 30 16:05:56 2008 +0200 KVM: Add coalesced MMIO support (powerpc part) This patch enables coalesced MMIO for powerpc architecture. It defines KVM_MMIO_PAGE_OFFSET and KVM_CAP_COALESCED_MMIO. It enables the compilation of coalesced_mmio.c. Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 542472b53ea9e0add0ba23976018210191d84754 Author: Laurent Vivier Date: Fri May 30 16:05:55 2008 +0200 KVM: Add coalesced MMIO support (x86 part) This patch enables coalesced MMIO for x86 architecture. It defines KVM_MMIO_PAGE_OFFSET and KVM_CAP_COALESCED_MMIO. It enables the compilation of coalesced_mmio.c. Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 5f94c1741bdc7a336553122036e8a779e616ccbf Author: Laurent Vivier Date: Fri May 30 16:05:54 2008 +0200 KVM: Add coalesced MMIO support (common part) This patch adds all needed structures to coalesce MMIOs. Until an architecture uses it, it is not compiled. Coalesced MMIO introduces two ioctl() to define where are the MMIO zones that can be coalesced: - KVM_REGISTER_COALESCED_MMIO registers a coalesced MMIO zone. It requests one parameter (struct kvm_coalesced_mmio_zone) which defines a memory area where MMIOs can be coalesced until the next switch to user space. The maximum number of MMIO zones is KVM_COALESCED_MMIO_ZONE_MAX. - KVM_UNREGISTER_COALESCED_MMIO cancels all registered zones inside the given bounds (bounds are also given by struct kvm_coalesced_mmio_zone). The userspace client can check kernel coalesced MMIO availability by asking ioctl(KVM_CHECK_EXTENSION) for the KVM_CAP_COALESCED_MMIO capability. The ioctl() call to KVM_CAP_COALESCED_MMIO will return 0 if not supported, or the page offset where will be stored the ring buffer. The page offset depends on the architecture. After an ioctl(KVM_RUN), the first page of the KVM memory mapped points to a kvm_run structure. The offset given by KVM_CAP_COALESCED_MMIO is an offset to the coalesced MMIO ring expressed in PAGE_SIZE relatively to the address of the start of th kvm_run structure. The MMIO ring buffer is defined by the structure kvm_coalesced_mmio_ring. [akio: fix oops during guest shutdown] Signed-off-by: Laurent Vivier Signed-off-by: Akio Takebe Signed-off-by: Avi Kivity commit 92760499d01ef91518119908eb9b8798b6c9bd3f Author: Laurent Vivier Date: Fri May 30 16:05:53 2008 +0200 KVM: kvm_io_device: extend in_range() to manage len and write attribute Modify member in_range() of structure kvm_io_device to pass length and the type of the I/O (write or read). This modification allows to use kvm_io_device with coalesced MMIO. Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 131d82791b628d4aeafd94ddc74a9b68f3d15a83 Author: Avi Kivity Date: Thu May 29 14:56:28 2008 +0300 KVM: MMU: Avoid page prefetch on SVM SVM cannot benefit from page prefetching since guest page fault bypass cannot by made to work there. Avoid accessing the guest page table in this case. Signed-off-by: Avi Kivity commit d761a501cf9cd4fa08ff35d252ff08b8c31ce677 Author: Avi Kivity Date: Thu May 29 14:55:03 2008 +0300 KVM: MMU: Move nonpaging_prefetch_page() In preparation for next patch. No code change. Signed-off-by: Avi Kivity commit 91ed7a0e15c6f6ff57f5cf70feabdba56a999863 Author: Avi Kivity Date: Thu May 29 14:38:38 2008 +0300 KVM: x86 emulator: implement 'push imm' (opcode 0x68) Encountered in FC6 boot sequence, now that we don't force ss.rpl = 0 during the protected mode transition. Not really necessary, but nice to have. Signed-off-by: Avi Kivity commit 19e43636b5af1c8b9cc8406af674835284abab0c Author: Avi Kivity Date: Thu May 29 14:26:29 2008 +0300 KVM: x86 emulator: simplify push imm8 emulation Instead of fetching the data explicitly, use SrcImmByte. Signed-off-by: Avi Kivity commit eab9f71feb1851b5b700ca12ae614b6a0a441021 Author: Avi Kivity Date: Thu May 29 14:20:16 2008 +0300 KVM: MMU: Optimize prefetch_page() Instead of reading each pte individually, read 256 bytes worth of ptes and batch process them. Signed-off-by: Avi Kivity commit 38d5bc6d50a4368be08b39b02efb9cbbe1dd60d0 Author: Guillaume Thouvenin Date: Tue May 27 15:13:28 2008 +0200 KVM: x86 emulator: Add support for mov r, sreg (0x8c) instruction Add support for mov r, sreg (0x8c) instruction Signed-off-by: Guillaume Thouvenin Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 4257198ae2c36e030a0947fef661c8de973778be Author: Guillaume Thouvenin Date: Tue May 27 14:49:15 2008 +0200 KVM: x86 emulator: Add support for mov seg, r (0x8e) instruction Add support for mov r, sreg (0x8c) instruction. [avi: drop the sreg decoding table in favor of 1:1 encoding] Signed-off-by: Guillaume Thouvenin Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 615ac125618dc7b40ecb418e8b353d31ccf0e518 Author: Guillaume Thouvenin Date: Tue May 27 10:19:16 2008 +0200 KVM: x86 emulator: adds support to mov r,imm (opcode 0xb8) instruction Add support to mov r, imm (0xb8) instruction. Signed-off-by: Guillaume Thouvenin Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 954cd36f7613ac6d084abe33114dd45a8e0dbe92 Author: Guillaume Thouvenin Date: Tue May 27 10:19:08 2008 +0200 KVM: x86 emulator: add support for jmp far 0xea Add support for jmp far (opcode 0xea) instruction. Signed-off-by: Guillaume Thouvenin Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 89c696383d6eb493351a89d450d8ad7a55cbe1da Author: Guillaume Thouvenin Date: Tue May 27 10:22:20 2008 +0200 KVM: x86 emulator: Update c->dst.bytes in decode instruction Update c->dst.bytes in decode instruction instead of instruction itself. It's needed because if c->dst.bytes is equal to 0, the instruction is not emulated. Signed-off-by: Guillaume Thouvenin Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 3e6e0aab1ba1e8b354ce01f5659336f9aee69437 Author: Guillaume Thouvenin Date: Tue May 27 10:18:46 2008 +0200 KVM: Prefixes segment functions that will be exported with "kvm_" Prefixes functions that will be exported with kvm_. We also prefixed set_segment() even if it still static to be coherent. signed-off-by: Guillaume Thouvenin Signed-off-by: Laurent Vivier Signed-off-by: Avi Kivity commit 9ba075a664dff836fd6fb93f90fcc827f7683d91 Author: Avi Kivity Date: Mon May 26 20:06:35 2008 +0300 KVM: MTRR support Add emulation for the memory type range registers, needed by VMware esx 3.5, and by pci device assignment. Signed-off-by: Avi Kivity commit 81609e3e26508840a1b51414376f2541dd191483 Author: Avi Kivity Date: Tue May 27 16:26:01 2008 +0300 KVM: Order segment register constants in the same way as cpu operand encoding This can be used to simplify the x86 instruction decoder. Signed-off-by: Avi Kivity commit f08864b42a45581a64558aa5b6b673c77b97ee5d Author: Sheng Yang Date: Thu May 15 18:23:25 2008 +0800 KVM: VMX: Enable NMI with in-kernel irqchip Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 3419ffc8e45a5344abc87684cbca6cdc5c9c8a01 Author: Sheng Yang Date: Thu May 15 09:52:48 2008 +0800 KVM: IOAPIC/LAPIC: Enable NMI support [avi: fix ia64 build breakage] Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 50d40d7fb9b09e68a657c68837fcfa067b70cc42 Author: Avi Kivity Date: Sun May 25 14:38:15 2008 +0300 KVM: Remove unnecessary ->decache_regs() call Since we aren't modifying any register, there's no need to decache the register state. Signed-off-by: Avi Kivity commit 7cc8883074b040aa8c1ebd3a17463b0ea3a9ef16 Author: Avi Kivity Date: Tue May 13 16:29:20 2008 +0300 KVM: Remove decache_vcpus_on_cpu() and related callbacks Obsoleted by the vmx-specific per-cpu list. Signed-off-by: Avi Kivity commit 543e42436643d68ad007d0bae2f485caac9c8a02 Author: Avi Kivity Date: Tue May 13 16:22:47 2008 +0300 KVM: VMX: Add list of potentially locally cached vcpus VMX hardware can cache the contents of a vcpu's vmcs. This cache needs to be flushed when migrating a vcpu to another cpu, or (which is the case that interests us here) when disabling hardware virtualization on a cpu. The current implementation of decaching iterates over the list of all vcpus, picks the ones that are potentially cached on the cpu that is being offlined, and flushes the cache. The problem is that it uses mutex_trylock() to gain exclusive access to the vcpu, which fires off a (benign) warning about using the mutex in an interrupt context. To avoid this, and to make things generally nicer, add a new per-cpu list of potentially cached vcus. This makes the decaching code much simpler. The list is vmx-specific since other hardware doesn't have this issue. [andrea: fix crash on suspend/resume] Signed-off-by: Andrea Arcangeli Signed-off-by: Avi Kivity commit 4ecac3fd6dc2629ad76a658a486f081c44aef10e Author: Avi Kivity Date: Tue May 13 13:23:38 2008 +0300 KVM: Handle virtualization instruction #UD faults during reboot KVM turns off hardware virtualization extensions during reboot, in order to disassociate the memory used by the virtualization extensions from the processor, and in order to have the system in a consistent state. Unfortunately virtual machines may still be running while this goes on, and once virtualization extensions are turned off, any virtulization instruction will #UD on execution. Fix by adding an exception handler to virtualization instructions; if we get an exception during reboot, we simply spin waiting for the reset to complete. If it's a true exception, BUG() so we can have our stack trace. Signed-off-by: Avi Kivity commit 1b7fcd3263e5f12dba43d27b64e1578bec070c28 Author: Avi Kivity Date: Thu May 15 13:51:35 2008 +0300 KVM: MMU: Fix false flooding when a pte points to page table The KVM MMU tries to detect when a speculative pte update is not actually used by demand fault, by checking the accessed bit of the shadow pte. If the shadow pte has not been accessed, we deem that page table flooded and remove the shadow page table, allowing further pte updates to proceed without emulation. However, if the pte itself points at a page table and only used for write operations, the accessed bit will never be set since all access will happen through the emulator. This is exactly what happens with kscand on old (2.4.x) HIGHMEM kernels. The kernel points a kmap_atomic() pte at a page table, and then proceeds with read-modify-write operations to look at the dirty and accessed bits. We get a false flood trigger on the kmap ptes, which results in the mmu spending all its time setting up and tearing down shadows. Fix by setting the shadow accessed bit on emulated accesses. Signed-off-by: Avi Kivity commit 7682f2d0dd3ff5bd2756eac018a5b4e7e30ef16c Author: Avi Kivity Date: Mon May 12 19:25:43 2008 +0300 KVM: VMX: Trivial vmcs_write64() code simplification Signed-off-by: Avi Kivity commit 14ae51b6c068ef7ab52dc2d53fe226e6189f2ab2 Author: Chris Lalancette Date: Mon May 5 13:05:16 2008 -0400 KVM: SVM: Fake MSR_K7 performance counters Attached is a patch that fixes a guest crash when booting older Linux kernels. The problem stems from the fact that we are currently emulating MSR_K7_EVNTSEL[0-3], but not emulating MSR_K7_PERFCTR[0-3]. Because of this, setup_k7_watchdog() in the Linux kernel receives a GPF when it attempts to write into MSR_K7_PERFCTR, which causes an OOPs. The patch fixes it by just "fake" emulating the appropriate MSRs, throwing away the data in the process. This causes the NMI watchdog to not actually work, but it's not such a big deal in a virtualized environment. When we get a write to one of these counters, we printk_ratelimit() a warning. I decided to print it out for all writes, even if the data is 0; it doesn't seem to make sense to me to special case when data == 0. Tested by myself on a RHEL-4 guest, and Joerg Roedel on a Windows XP 64-bit guest. Signed-off-by: Chris Lalancette Signed-off-by: Avi Kivity commit f697554515b06e8d7264f316b25e6da943407142 Author: Aurelien Jarno Date: Fri May 2 17:02:23 2008 +0200 KVM: PIT: support mode 3 The in-kernel PIT emulation ignores pending timers if operating under mode 3, which for example Hurd uses. This mode should output a square wave, high for (N+1)/2 counts and low for (N-1)/2 counts. As we only care about the resulting interrupts, the period is N, and mode 3 is the same as mode 2 with regard to interrupts. Signed-off-by: Aurelien Jarno Signed-off-by: Avi Kivity commit 2e2e3738af33575cba59597acd5e80cdd5ec11ee Author: Anthony Liguori Date: Wed Apr 30 15:37:07 2008 -0500 KVM: Handle vma regions with no backing page This patch allows VMAs that contain no backing page to be used for guest memory. This is useful for assigning mmio regions to a guest. Signed-off-by: Anthony Liguori Signed-off-by: Avi Kivity commit d2ebb4103ff349af6dac14955bf93e57487a6694 Author: Joerg Roedel Date: Wed Apr 30 17:56:04 2008 +0200 KVM: SVM: add tracing support for TDP page faults To distinguish between real page faults and nested page faults they should be traced as different events. This is implemented by this patch. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit af9ca2d703f4cefbf6441bfe127c4191092ad394 Author: Joerg Roedel Date: Wed Apr 30 17:56:03 2008 +0200 KVM: SVM: add missing kvmtrace markers This patch adds the missing kvmtrace markers to the svm module of kvm. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 54e445ca8411ec892f986d9f8c11b8c1806ecde4 Author: Joerg Roedel Date: Wed Apr 30 17:56:02 2008 +0200 KVM: add missing kvmtrace bits This patch adds some kvmtrace bits to the generic x86 code where it is instrumented from SVM. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit a069805579a390f0fa91694f6963bcc4b2cecc6b Author: Joerg Roedel Date: Wed Apr 30 17:56:01 2008 +0200 KVM: SVM: implement dedicated INTR exit handler With an exit handler for INTR intercepts its possible to account them using kvmtrace. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit c47f098d69ed2bd7343e54095ff4aa2533253bee Author: Joerg Roedel Date: Wed Apr 30 17:56:00 2008 +0200 KVM: SVM: implement dedicated NMI exit handler With an exit handler for NMI intercepts its possible to account them using kvmtrace. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit c7bf23babc959b186335d2640959a1b8633588de Author: Joerg Roedel Date: Wed Apr 30 17:55:59 2008 +0200 KVM: VMX: move APIC_ACCESS trace entry to generic code This patch moves the trace entry for APIC accesses from the VMX code to the generic lapic code. This way APIC accesses from SVM will also be traced. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 8b2cf73cc11cf29a21c51c453a3205f23d888915 Author: Harvey Harrison Date: Sun Apr 27 12:14:13 2008 -0700 KVM: add statics were possible, function definition in lapic.h Noticed by sparse: arch/x86/kvm/vmx.c:1583:6: warning: symbol 'vmx_disable_intercept_for_msr' was not declared. Should it be static? arch/x86/kvm/x86.c:3406:5: warning: symbol 'kvm_task_switch_16' was not declared. Should it be static? arch/x86/kvm/x86.c:3429:5: warning: symbol 'kvm_task_switch_32' was not declared. Should it be static? arch/x86/kvm/mmu.c:1968:6: warning: symbol 'kvm_mmu_remove_one_alloc_mmu_page' was not declared. Should it be static? arch/x86/kvm/mmu.c:2014:6: warning: symbol 'mmu_destroy_caches' was not declared. Should it be static? arch/x86/kvm/lapic.c:862:5: warning: symbol 'kvm_lapic_get_base' was not declared. Should it be static? arch/x86/kvm/i8254.c:94:5: warning: symbol 'pit_get_gate' was not declared. Should it be static? arch/x86/kvm/i8254.c:196:5: warning: symbol '__pit_timer_fn' was not declared. Should it be static? arch/x86/kvm/i8254.c:561:6: warning: symbol '__inject_pit_timer_intr' was not declared. Should it be static? Signed-off-by: Harvey Harrison Signed-off-by: Avi Kivity commit 1e1c65e03ec817a64153751150f6691db9842acd Author: Christian Borntraeger Date: Mon Apr 21 13:48:24 2008 +0200 KVM: remove long -> void *user -> long cast kvm_dev_ioctl casts the arg value to void __user *, just to recast it again to long. This seems unnecessary. According to objdump the binary code on x86 is unchanged by this patch. Signed-off-by: Christian Borntraeger Signed-off-by: Avi Kivity commit 175f9c1bba9b825d22b142d183c9e175488b260c Author: Jussi Kivilinna Date: Sun Jul 20 00:08:47 2008 -0700 net_sched: Add size table for qdiscs Add size table functions for qdiscs and calculate packet size in qdisc_enqueue(). Based on patch by Patrick McHardy http://marc.info/?l=linux-netdev&m=115201979221729&w=2 Signed-off-by: Jussi Kivilinna Signed-off-by: David S. Miller commit 0abf77e55a2459aa9905be4b226e4729d5b4f0cb Author: Jussi Kivilinna Date: Sun Jul 20 00:08:27 2008 -0700 net_sched: Add accessor function for packet length for qdiscs Signed-off-by: Jussi Kivilinna Signed-off-by: David S. Miller commit 5f86173bdf15981ca49d0434f638b68f70a35644 Author: Jussi Kivilinna Date: Sun Jul 20 00:08:04 2008 -0700 net_sched: Add qdisc_enqueue wrapper Signed-off-by: Jussi Kivilinna Signed-off-by: David S. Miller commit db7a94d60f871ce6a52e97d82dea476cee0c4ea0 Author: David S. Miller Date: Sat Jul 19 22:39:46 2008 -0700 highmem: Export totalhigh_pages. Hash et al. sizing code in SCTP wants to make the calculation totalram_pages - totalhigh_pages, just like TCP. But this requires an export for the CONFIG_HIGHMEM case to work. Signed-off-by: David S. Miller commit a6ffb404dc03f806a257faaab831a6cb55c0b790 Author: YOSHIFUJI Hideaki Date: Sat Jul 19 22:36:07 2008 -0700 ipv6 mcast: Omit redundant address family checks in ip6_mc_source(). The caller has alredy checked for them. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 230b183921ecbaa5fedc0d35ad6ba7bb64b6e06a Author: YOSHIFUJI Hideaki Date: Sat Jul 19 22:35:47 2008 -0700 net: Use standard structures for generic socket address structures. Use sockaddr_storage{} for generic socket address storage and ensures proper alignment. Use sockaddr{} for pointers to omit several casts. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 53b7997fd5c62408d10b9aafb38974ce90fd2356 Author: YOSHIFUJI Hideaki Date: Sat Jul 19 22:35:03 2008 -0700 ipv6 netns: Make several "global" sysctl variables namespace aware. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 721499e8931c5732202481ae24f2dfbf9910f129 Author: YOSHIFUJI Hideaki Date: Sat Jul 19 22:34:43 2008 -0700 netns: Use net_eq() to compare net-namespaces for optimization. Without CONFIG_NET_NS, namespace is always &init_net. Compiler will be able to omit namespace comparisons with this patch. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 407d819cf0fd54c6fc1138a509225696aecafd15 Merge: 7abbcd6... b1235d7... Author: David S. Miller Date: Sat Jul 19 00:30:39 2008 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 commit 7abbcd6a4c8d6179121f2915a761b1133bf1cd99 Author: Denis V. Lunev Date: Sat Jul 19 00:29:42 2008 -0700 ipv6: remove unused macros from net/ipv6.h Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit 725a8ff04a5dc473cd9d8eb7817ca96fc36c7789 Author: Denis V. Lunev Date: Sat Jul 19 00:28:58 2008 -0700 ipv6: remove unused parameter from ip6_ra_control Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit bdccc4ca13a639d759206c5b21ed73f8a813eaba Author: Daniel Lezcano Date: Sat Jul 19 00:15:13 2008 -0700 tcp: fix kernel panic with listening_get_next # BUG: unable to handle kernel NULL pointer dereference at 0000000000000038 IP: [] listening_get_next+0x50/0x1b3 PGD 11e4b9067 PUD 11d16c067 PMD 0 Oops: 0000 [1] SMP last sysfs file: /sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map CPU 3 Modules linked in: bridge ipv6 button battery ac loop dm_mod tg3 ext3 jbd edd fan thermal processor thermal_sys hwmon sg sata_svw libata dock serverworks sd_mod scsi_mod ide_disk ide_core [last unloaded: freq_table] Pid: 3368, comm: slpd Not tainted 2.6.26-rc2-mm1-lxc4 #1 RIP: 0010:[] [] listening_get_next+0x50/0x1b3 RSP: 0018:ffff81011e1fbe18 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff8100be0ad3c0 RCX: ffff8100619f50c0 RDX: ffffffff82475be0 RSI: ffff81011d9ae6c0 RDI: ffff8100be0ad508 RBP: ffff81011f4f1240 R08: 00000000ffffffff R09: ffff8101185b6780 R10: 000000000000002d R11: ffffffff820fdbfa R12: ffff8100be0ad3c8 R13: ffff8100be0ad6a0 R14: ffff8100be0ad3c0 R15: ffffffff825b8ce0 FS: 00007f6a0ebd16d0(0000) GS:ffff81011f424540(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000038 CR3: 000000011dc20000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process slpd (pid: 3368, threadinfo ffff81011e1fa000, task ffff81011f4b8660) Stack: 00000000000002ee ffff81011f5a57c0 ffff81011f4f1240 ffff81011e1fbe90 0000000000001000 0000000000000000 00007fff16bf2590 ffffffff821ed9c8 ffff81011f5a57c0 ffff81011d9ae6c0 000000000000041a ffffffff820b0abd Call Trace: [] ? tcp_seq_next+0x34/0x7e [] ? seq_read+0x1aa/0x29d [] ? proc_reg_read+0x73/0x8e [] ? vfs_read+0xaa/0x152 [] ? sys_read+0x45/0x6e [] ? system_call_after_swapgs+0x7b/0x80 Code: 31 a9 25 00 e9 b5 00 00 00 ff 45 20 83 7d 0c 01 75 79 4c 8b 75 10 48 8b 0e eb 1d 48 8b 51 20 0f b7 45 08 39 02 75 0e 48 8b 41 28 <4c> 39 78 38 0f 84 93 00 00 00 48 8b 09 48 85 c9 75 de 8b 55 1c RIP [] listening_get_next+0x50/0x1b3 RSP CR2: 0000000000000038 This kernel panic appears with CONFIG_NET_NS=y. How to reproduce ? On the buggy host (host A) * ip addr add 1.2.3.4/24 dev eth0 On a remote host (host B) * ip addr add 1.2.3.5/24 dev eth0 * iptables -A INPUT -p tcp -s 1.2.3.4 -j DROP * ssh 1.2.3.4 On host A: * netstat -ta or cat /proc/net/tcp This bug happens when reading /proc/net/tcp[6] when there is a req_sock at the SYN_RECV state. When a SYN is received the minisock is created and the sk field is set to NULL. In the listening_get_next function, we try to look at the field req->sk->sk_net. When looking at how to fix this bug, I noticed that is useless to do the check for the minisock belonging to the namespace. A minisock belongs to a listen point and this one is per namespace, so when browsing the minisock they are always per namespace. Signed-off-by: Daniel Lezcano Signed-off-by: David S. Miller commit 4389dded7767d24290463f2a8302ba3253ebdd56 Author: Adam Langley Date: Sat Jul 19 00:07:02 2008 -0700 tcp: Remove redundant checks when setting eff_sacks Remove redundant checks when setting eff_sacks and make the number of SACKs a compile time constant. Now that the options code knows how many SACK blocks can fit in the header, we don't need to have the SACK code guessing at it. Signed-off-by: Adam Langley Signed-off-by: David S. Miller commit 33ad798c924b4a1afad3593f2796d465040aadd5 Author: Adam Langley Date: Sat Jul 19 00:04:31 2008 -0700 tcp: options clean up This should fix the following bugs: * Connections with MD5 signatures produce invalid packets whenever SACK options are included * MD5 signatures are counted twice in the MSS calculations Behaviour changes: * A SYN with MD5 + SACK + TS elicits a SYNACK with MD5 + SACK This is because we can't fit any SACK blocks in a packet with MD5 + TS options. There was discussion about disabling SACK rather than TS in order to fit in better with old, buggy kernels, but that was deemed to be unnecessary. * SYNs with MD5 don't include a TS option See above. Additionally, it removes a bunch of duplicated logic for calculating options, which should help avoid these sort of issues in the future. Signed-off-by: Adam Langley Signed-off-by: David S. Miller commit 49a72dfb8814c2d65bd9f8c9c6daf6395a1ec58d Author: Adam Langley Date: Sat Jul 19 00:01:42 2008 -0700 tcp: Fix MD5 signatures for non-linear skbs Currently, the MD5 code assumes that the SKBs are linear and, in the case that they aren't, happily goes off and hashes off the end of the SKB and into random memory. Reported by Stephen Hemminger in [1]. Advice thanks to Stephen and Evgeniy Polyakov. Also includes a couple of missed route_caps from Stephen's patch in [2]. [1] http://marc.info/?l=linux-netdev&m=121445989106145&w=2 [2] http://marc.info/?l=linux-netdev&m=121459157816964&w=2 Signed-off-by: Adam Langley Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 845525a642c1c9e1335c33a274d4273906ee58eb Author: Vlad Yasevich Date: Fri Jul 18 23:08:21 2008 -0700 sctp: Update sctp global memory limit allocations. Update sctp global memory limit allocations to be the same as TCP. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 336d3262df71fcd2661180bb35d5ea41b4cbca58 Author: Harvey Harrison Date: Fri Jul 18 23:07:09 2008 -0700 sctp: remove unnecessary byteshifting, calculate directly in big-endian Signed-off-by: Harvey Harrison Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 4e54064e0a13b7a7d4a481123c1783f770538e30 Author: Vlad Yasevich Date: Fri Jul 18 23:06:32 2008 -0700 sctp: Allow only 1 listening socket with SO_REUSEADDR When multiple socket bind to the same port with SO_REUSEADDR, only 1 can be listining. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 23b29ed80bd7184398317a111dc488605cb66c7f Author: Vlad Yasevich Date: Fri Jul 18 23:06:07 2008 -0700 sctp: Do not leak memory on multiple listen() calls SCTP permits multiple listen call and on subsequent calls we leak he memory allocated for the crypto transforms. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 7dab83de50c7b2b7ceac695a0b56fa6c0f95b0bc Author: Vlad Yasevich Date: Fri Jul 18 23:05:40 2008 -0700 sctp: Support ipv6only AF_INET6 sockets. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 6d0ccbac688207ca0616ab5094932af4db4747b3 Author: Florian Westphal Date: Fri Jul 18 23:04:39 2008 -0700 sctp: Prevent uninitialized memory access valgrind reports uninizialized memory accesses when running sctp inside the network simulation cradle simulator: Conditional jump or move depends on uninitialised value(s) at 0x570E34A: sctp_assoc_sync_pmtu (associola.c:1324) by 0x57427DA: sctp_packet_transmit (output.c:403) by 0x5710EFF: sctp_outq_flush (outqueue.c:824) by 0x5710B88: sctp_outq_uncork (outqueue.c:701) by 0x5745262: sctp_cmd_interpreter (sm_sideeffect.c:1548) by 0x57444B7: sctp_side_effects (sm_sideeffect.c:976) by 0x5744460: sctp_do_sm (sm_sideeffect.c:945) by 0x572157D: sctp_primitive_ASSOCIATE (primitive.c:94) by 0x5725C04: __sctp_connect (socket.c:1094) by 0x57297DC: sctp_connect (socket.c:3297) Conditional jump or move depends on uninitialised value(s) at 0x575D3A5: mod_timer (timer.c:630) by 0x5752B78: sctp_cmd_hb_timers_start (sm_sideeffect.c:555) by 0x5754133: sctp_cmd_interpreter (sm_sideeffect.c:1448) by 0x5753607: sctp_side_effects (sm_sideeffect.c:976) by 0x57535B0: sctp_do_sm (sm_sideeffect.c:945) by 0x571E9AE: sctp_endpoint_bh_rcv (endpointola.c:474) by 0x573347F: sctp_inq_push (inqueue.c:104) by 0x572EF93: sctp_rcv (input.c:256) by 0x5689623: ip_local_deliver_finish (ip_input.c:230) by 0x5689759: ip_local_deliver (ip_input.c:268) by 0x5689CAC: ip_rcv_finish (dst.h:246) #1 is due to "if (t->pmtu_pending)". 8a4794914f9cf2681235ec2311e189fe307c28c7 "[SCTP] Flag a pmtu change request" suggests it should be initialized to 0. #2 is the heartbeat timer 'expires' value, which is uninizialised, but test by mod_timer(). T3_rtx_timer seems to be affected by the same problem, so initialize it, too. Signed-off-by: Florian Westphal Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit c4e85f82edcd6027cfe67331a2e00741b009756b Author: Florian Westphal Date: Fri Jul 18 23:03:44 2008 -0700 sctp: Don't abort initialization when CONFIG_PROC_FS=n This puts CONFIG_PROC_FS defines around the proc init/exit functions and also avoids compiling proc.c if procfs is not supported. Also make SCTP_DBG_OBJCNT depend on procfs. Signed-off-by: Florian Westphal Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit c1e20f7c8b9ccbafc9ea78f2b406738728ce6b81 Author: Stephen Hemminger Date: Fri Jul 18 23:02:15 2008 -0700 tcp: RTT metrics scaling Some of the metrics (RTT, RTTVAR and RTAX_RTO_MIN) are stored in kernel units (jiffies) and this leaks out through the netlink API to user space where the units for jiffies are unknown. This patches changes the kernel to convert to/from milliseconds. This changes the ABI, but milliseconds seemed like the most natural unit for these parameters. Values available via syscall in /proc/net/rt_cache and netlink will be in milliseconds. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 30ee42be00b7a50929a73cb617f70b1d3219eb69 Author: David S. Miller Date: Fri Jul 18 23:00:11 2008 -0700 pkt_sched: Fix noqueue_qdisc initialization. Like noop_qdisc, it needs a dummy backpointer and explicit qdisc->q.lock initialization. Based upon a report by Stephen Hemminger. Signed-off-by: David S. Miller commit 3072367300aa8c779e3a14ee8e89de079e90f3ad Author: David S. Miller Date: Fri Jul 18 22:50:15 2008 -0700 pkt_sched: Manage qdisc list inside of root qdisc. Idea is from Patrick McHardy. Instead of managing the list of qdiscs on the device level, manage it in the root qdisc of a netdev_queue. This solves all kinds of visibility issues during qdisc destruction. The way to iterate over all qdiscs of a netdev_queue is to visit the netdev_queue->qdisc, and then traverse it's list. The only special case is to ignore builting qdiscs at the root when dumping or doing a qdisc_lookup(). That was not needed previously because builtin qdiscs were not added to the device's qdisc_list. Signed-off-by: David S. Miller commit 72b25a913ed9b1ab49c7022adaf3f271a65ea219 Author: David S. Miller Date: Fri Jul 18 20:54:17 2008 -0700 pkt_sched: Get rid of u32_list. The u32_list is just an indirect way of maintaining a reference to a U32 node on a per-qdisc basis. Just add an explicit node pointer for u32 to struct Qdisc an do away with this global list. Signed-off-by: David S. Miller commit 8913336a7e8d56e984109a3137d6c0e3362596a4 Author: Patrick McHardy Date: Fri Jul 18 18:05:19 2008 -0700 packet: add PACKET_RESERVE sockopt Add new sockopt to reserve some headroom in the mmaped ring frames in front of the packet payload. This can be used f.i. when the VLAN header needs to be (re)constructed to avoid moving the entire payload. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3ca4095f246c21c285d9e4be2ea4d3ee7fbacebd Author: Benjamin Li Date: Fri Jul 18 17:58:57 2008 -0700 bnx2: Update version to 1.7.9. Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8a31329eae0949a8a73b64fcead84bb44a350591 Author: Benjamin Li Date: Fri Jul 18 17:57:26 2008 -0700 bnx2: Fix Sparse warnings This patch will fix the following sparse warnings: /home/benli/sparse/bnx2.c:297:8: warning: symbol 'val' shadows an earlier one /home/benli/sparse/bnx2.c:286:60: originally declared here /home/benli/sparse/bnx2.c:7461:7: warning: symbol 'i' shadows an earlier one /home/benli/sparse/bnx2.c:7265:10: originally declared here Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 706bf24038ba88ec77503b4829b16da712a32f04 Author: Benjamin Li Date: Fri Jul 18 17:55:11 2008 -0700 bnx2: Add TX multiqueue support. Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4f83ec19bbd0c78a2158c7a5d28f70d8b4417803 Author: Benjamin Li Date: Fri Jul 18 17:54:17 2008 -0700 bnx2: Update TPAT firmware This change allows the first TX ring (CID 16) and the first TSS TX ring (CID 32) to be used concurrently. Before this change, we could get TSO errors when both TX rings were used concurrently. Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 076152d534c6d99ccfe59190d085781a2d4a419b Author: Ben Hutchings Date: Fri Jul 18 17:50:57 2008 -0700 e1000: resolve tx multiqueue bug With the recent changes to tx mutiqueue, e1000 was not calling netif_start_queue() before calling netif_wake_queue(). This causes an oops during loading of the driver. (Based on commit d55b53fff0c2ddb639dca04c3f5a0854f292d982 ("igb/ixgbe/e1000e: resolve tx multiqueue bug").) Signed-off-by: Ben Hutchings Acked-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5108b27651727b5aba0826e8fd7be71b42428701 Author: Harvey Harrison Date: Thu Jul 17 21:33:04 2008 -0700 nfsd: nfs4xdr.c do-while is not a compound statement The WRITEMEM macro produces sparse warnings of the form: fs/nfsd/nfs4xdr.c:2668:2: warning: do-while statement is not a compound statement Signed-off-by: Harvey Harrison Cc: Benny Halevy Signed-off-by: J. Bruce Fields commit ad1060c89cfe451de849373d98e42fad58dd25ae Author: J. Bruce Fields Date: Fri Jul 18 15:04:16 2008 -0400 nfsd: Use C99 initializers in fs/nfsd/nfs4xdr.c Thanks to problem report and original patch from Harvey Harrison. Signed-off-by: J. Bruce Fields Cc: Harvey Harrison Cc: Benny Halevy commit d55b53fff0c2ddb639dca04c3f5a0854f292d982 Author: Jeff Kirsher Date: Fri Jul 18 04:33:03 2008 -0700 igb/ixgbe/e1000e: resolve tx multiqueue bug With the recent changes to tx mutiqueue, igb/ixgbe/e1000e was not calling netif_tx_start_all_queues() before calling netif_tx_wake_all_queues(). This causes an issue during loading of the driver. In addition, updated e1000e to use the updated tx mutliqueue api. Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b6fcbdb4f283f7ba67cec3cda6be23da8e959031 Author: Pavel Emelyanov Date: Fri Jul 18 04:07:44 2008 -0700 proc: consolidate per-net single-release callers They are symmetrical to single_open ones :) Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit de05c557b24c7dffc6d392e3db120cf11c9f6ae7 Author: Pavel Emelyanov Date: Fri Jul 18 04:07:21 2008 -0700 proc: consolidate per-net single_open callers There are already 7 of them - time to kill some duplicate code. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 60bdde95807e982a824be9cfdd35055cc721a88a Author: Pavel Emelyanov Date: Fri Jul 18 04:06:50 2008 -0700 proc: clean the ip_misc_proc_init and ip_proc_init_net error paths After all this stuff is moved outside, this function can look better. Besides, I tuned the error path in ip_proc_init_net to make it have only 2 exit points, not 3. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 8e3461d01bdbc3dbf993448ed9ad4acaaeb6495d Author: Pavel Emelyanov Date: Fri Jul 18 04:06:26 2008 -0700 proc: show per-net ip_devconf.forwarding in /proc/net/snmp This one has become per-net long ago, but the appropriate file is per-net only now. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 229bf0cbaa054f1502ab4ee219f05985d2c838d1 Author: Pavel Emelyanov Date: Fri Jul 18 04:06:04 2008 -0700 proc: create /proc/net/snmp file in each net All the statistics shown in this file have been made per-net already. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 7b7a9dfdf6ccda647f54ea5fa3bd0ac17a189eeb Author: Pavel Emelyanov Date: Fri Jul 18 04:05:17 2008 -0700 proc: create /proc/net/netstat file in each net Now all the shown in it statistics is netnsizated, time to show it in appropriate net. The appropriate net init/exit ops already exist - they make the sockstat file per net - so just extend them. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit d89cbbb1e69a3bfea38038fb058bd51013902ef3 Author: Pavel Emelyanov Date: Fri Jul 18 04:04:51 2008 -0700 ipv4: clean the init_ipv4_mibs error paths After moving all the stuff outside this function it looks a bit ugly - make it look better. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 923c6586b0dc0a00df07a1608185437145a0c68b Author: Pavel Emelyanov Date: Fri Jul 18 04:04:22 2008 -0700 mib: put icmpmsg statistics on struct net Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit b60538a0d737609213e4b758881913498d3ff0b4 Author: Pavel Emelyanov Date: Fri Jul 18 04:04:02 2008 -0700 mib: put icmp statistics on struct net Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 386019d3514b3ed9de8d0b05b67e638a7048375b Author: Pavel Emelyanov Date: Fri Jul 18 04:03:45 2008 -0700 mib: put udplite statistics on struct net Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 2f275f91a438abd8eec5321798d66a4ffe6869fa Author: Pavel Emelyanov Date: Fri Jul 18 04:03:27 2008 -0700 mib: put udp statistics on struct net Similar to... ouch, I repeat myself. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 61a7e26028b94805fd686a6dc9dbd9941f8f19b0 Author: Pavel Emelyanov Date: Fri Jul 18 04:03:08 2008 -0700 mib: put net statistics on struct net Similar to ip and tcp ones :) Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit a20f5799ca7ceb24d63c74b6fdad4b0c0ee91f4f Author: Pavel Emelyanov Date: Fri Jul 18 04:02:42 2008 -0700 mib: put ip statistics on struct net Similar to tcp one. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 57ef42d59d1c1d79be59fc3c6380ae14234e38c3 Author: Pavel Emelyanov Date: Fri Jul 18 04:02:08 2008 -0700 mib: put tcp statistics on struct net Proc temporary uses stats from init_net. BTW, TCP_XXX_STATS are beautiful (w/o do { } while (0) facing) again :) Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 9b4661bd6e5437508e0920608f3213c23212cd1b Author: Pavel Emelyanov Date: Fri Jul 18 04:01:44 2008 -0700 ipv4: add pernet mib operations These ones are currently empty, but stuff from init_ipv4_mibs will sequentially migrate there. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 852566f53ccdc9d1c149ffa28daa9778e13fa3da Author: Pavel Emelyanov Date: Fri Jul 18 04:01:24 2008 -0700 mib: add netns/mib.h file The only structure declared within is the netns_mib, which will carry all our mibs within. I didn't put the mibs in the existing netns_xxx structures to make it possible to mark this one as properly aligned and get in a separate "read-mostly" cache-line. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit a60f28fa934ccadbf526f4dab8d73079480002a4 Author: David S. Miller Date: Fri Jul 18 03:58:52 2008 -0700 Revert "remove the strip driver" This reverts commit 94d9842403f770239a656586442454b7a8f2df29. Alan says it's not appropriate to remove this driver, Adrian Bunk also agrees with this revert. Signed-off-by: David S. Miller commit 49997d75152b3d23c53b0fa730599f2f74c92c65 Merge: a0c80b8... 5b664cb... Author: David S. Miller Date: Fri Jul 18 02:39:39 2008 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c commit a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d Author: David S. Miller Date: Thu Jul 17 01:46:06 2008 -0700 pkt_sched: Make default qdisc nonshared-multiqueue safe. Instead of 'pfifo_fast' we have just plain 'fifo_fast'. No priority queues, just a straight FIFO. This is necessary in order to legally have a seperate qdisc per queue in multi-TX-queue setups, and thus get full parallelization. Signed-off-by: David S. Miller commit 93245dd6d356b864f6676396a9f3edecbd378ed0 Author: David S. Miller Date: Thu Jul 17 04:03:43 2008 -0700 pkt_sched: Don't used locked skb_queue_purge() in __qdisc_reset_queue() We have to have exclusive access to the given qdisc anyways, so doing even more locking is superfluous. Signed-off-by: David S. Miller commit 99194cff398d056e5ee469647c294466c246c88a Author: David S. Miller Date: Thu Jul 17 04:54:10 2008 -0700 pkt_sched: Add multiqueue handling to qdisc_graft(). Move the destruction of the old queue into qdisc_graft(). When operating on a root qdisc (ie. "parent == NULL"), apply the operation to all queues. The caller has grabbed a single implicit reference for this graft, therefore when we apply the change to more than one queue we must grab additional qdisc references. Otherwise, we are operating on a class of a specific parent qdisc, and therefore no multiqueue handling is necessary. Signed-off-by: David S. Miller commit 83874000929ed63aef30b44083a9f713135ff040 Author: David S. Miller Date: Thu Jul 17 00:53:03 2008 -0700 pkt_sched: Kill netdev_queue lock. We can simply use the qdisc->q.lock for all of the qdisc tree synchronization. Signed-off-by: David S. Miller commit c7e4f3bbb4ba4e48ab3b529d5016e454cee1ccd6 Author: David S. Miller Date: Wed Jul 16 03:22:39 2008 -0700 pkt_sched: Kill qdisc_lock_tree and qdisc_unlock_tree. No longer used. Signed-off-by: David S. Miller commit 78a5b30b7324b2d66bcf7d2e3935877d3c26497c Author: David S. Miller Date: Wed Jul 16 03:12:24 2008 -0700 pkt_sched: Rework {sch,tbf}_tree_lock(). Make sch_tree_lock() lock the qdisc's root. All of the users hold the RTNL semaphore and the root qdisc is not changing. Implement tbf_tree_{lock,unlock}() simply in terms of sch_tree_{lock,unlock}(). Signed-off-by: David S. Miller commit 53049978df1d9ae55bf397c9879e6b33218352db Author: David S. Miller Date: Wed Jul 16 03:00:19 2008 -0700 pkt_sched: Make qdisc grafting locking more specific. Lock the root of the qdisc being operated upon. All explicit references to qdisc_tree_lock() are now gone. The only remaining uses are via the sch_tree_{lock,unlock}() and tcf_tree_{lock,unlock}() macros. Signed-off-by: David S. Miller commit ead81cc5fc6d996db6afb20f211241612610a07a Author: David S. Miller Date: Thu Jul 17 00:50:32 2008 -0700 netdevice: Move qdisc_list back into net_device proper. And give it it's own lock. Signed-off-by: David S. Miller commit 15b458fa65cbba395724a99ab1b7d3785ca76c1c Author: David S. Miller Date: Wed Jul 16 02:42:51 2008 -0700 pkt_sched: Kill qdisc_lock_tree usage in cls_route.c It just wants the qdisc tree to be synchronized, so grabbing qdisc_root_lock() is sufficient. Signed-off-by: David S. Miller commit 55dbc640c31db373fa07eb1e3af9b8eadbdf80db Author: David S. Miller Date: Wed Jul 16 02:40:45 2008 -0700 pkt_sched: Remove qdisc_lock_tree usage in cls_api.c It just wants the qdisc tree for the filter to be synchronized. So just BH lock qdisc_root_lock(q) instead. Signed-off-by: David S. Miller commit 17715e62a5e5c7224e5f906a4b8f9e5084100118 Author: David S. Miller Date: Wed Jul 16 02:36:04 2008 -0700 pkt_sched: Use per-queue locking in shutdown_scheduler_queue. This eliminates another qdisc_lock_tree user. Signed-off-by: David S. Miller commit 8a34c5dc3a7c6431f1cd94c0904be81b296e08ca Author: David S. Miller Date: Thu Jul 17 00:47:45 2008 -0700 pkt_sched: Perform bulk of qdisc destruction in RCU. This allows less strict control of access to the qdisc attached to a netdev_queue. It is even allowed to enqueue into a qdisc which is in the process of being destroyed. The RCU handler will toss out those packets. We will need this to handle sharing of a qdisc amongst multiple TX queues. In such a setup the lock has to be shared, so will be inside of the qdisc itself. At which point the netdev_queue lock cannot be used to hard synchronize access to the ->qdisc pointer. One operation we have to keep inside of qdisc_destroy() is the list deletion. It is the only piece of state visible after the RCU quiesce period, so we have to undo it early and under the appropriate locking. The operations in the RCU handler do not need any looking because the qdisc tree is no longer visible to anything at that point. Signed-off-by: David S. Miller commit 16361127ebed0fb8f9d7cc94c6e137eaf710f676 Author: David S. Miller Date: Wed Jul 16 02:23:17 2008 -0700 pkt_sched: dev_init_scheduler() does not need to lock qdisc tree. We are registering the device, there is no way anyone can get at this object's qdiscs yet in any meaningful way. Signed-off-by: David S. Miller commit 37437bb2e1ae8af470dfcd5b4ff454110894ccaf Author: David S. Miller Date: Wed Jul 16 02:15:04 2008 -0700 pkt_sched: Schedule qdiscs instead of netdev_queue. When we have shared qdiscs, packets come out of the qdiscs for multiple transmit queues. Therefore it doesn't make any sense to schedule the transmit queue when logically we cannot know ahead of time the TX queue of the SKB that the qdisc->dequeue() will give us. Just for sanity I added a BUG check to make sure we never get into a state where the noop_qdisc is scheduled. Signed-off-by: David S. Miller commit 7698b4fcabcd790efc4f226bada1e7b5870653af Author: David S. Miller Date: Wed Jul 16 01:42:40 2008 -0700 pkt_sched: Add and use qdisc_root() and qdisc_root_lock(). When code wants to lock the qdisc tree state, the logic operation it's doing is locking the top-level qdisc that sits of the root of the netdev_queue. Add qdisc_root_lock() to represent this and convert the easiest cases. In order for this to work out in all cases, we have to hook up the noop_qdisc to a dummy netdev_queue. Signed-off-by: David S. Miller commit e2627c8c2241bce45e368e150654d076b58a4595 Author: David S. Miller Date: Wed Jul 16 00:56:32 2008 -0700 pkt_sched: Make QDISC_RUNNING a qdisc state. Currently it is associated with a netdev_queue, but when we have qdisc sharing that no longer makes any sense. Signed-off-by: David S. Miller commit d3b753db7c4f1f37a98b51974d484fda5d86dab5 Author: David S. Miller Date: Tue Jul 15 20:14:35 2008 -0700 pkt_sched: Move gso_skb into Qdisc. We liberate any dangling gso_skb during qdisc destruction. It really only matters for the root qdisc. But when qdiscs can be shared by multiple netdev_queue objects, we can't have the gso_skb in the netdev_queue any more. Signed-off-by: David S. Miller commit b4c21639ab0f6df07ab7624a8c2f974936708ae5 Author: David S. Miller Date: Tue Jul 15 03:48:19 2008 -0700 niu: Add TX multiqueue support. Signed-off-by: David S. Miller commit 92831bc395ac8390bf759775c50cb6f90c6eb03d Author: David S. Miller Date: Tue Jul 15 03:48:01 2008 -0700 netdev: Kill plain netif_schedule() No more users. Signed-off-by: David S. Miller commit 263ba3204a434d0ca851e1321b31cd58376b86cb Author: David S. Miller Date: Tue Jul 15 03:47:41 2008 -0700 netdev: Convert all drivers away from netif_schedule(). They logically all want to trigger a schedule for all device TX queues. Signed-off-by: David S. Miller commit 8f0f2223cc08a5ae9a77f40edfe02e8a9f1abd77 Author: David S. Miller Date: Tue Jul 15 03:47:03 2008 -0700 net: Implement simple sw TX hashing. It just xor hashes over IPv4/IPv6 addresses and ports of transport. The only assumption it makes is that skb_network_header() is set correctly. With bug fixes from Eric Dumazet. Signed-off-by: David S. Miller commit 51cb6db0f5654f08a4a6bfa3888dc36a51c2df3e Author: David S. Miller Date: Tue Jul 15 03:34:57 2008 -0700 mac80211: Reimplement WME using ->select_queue(). The only behavior change is that we do not drop packets under any circumstances. If that is absolutely needed, we could easily add it back. With cleanups and help from Johannes Berg. Signed-off-by: David S. Miller commit eae792b722fef08dcf3aee88266ee7def9710757 Author: David S. Miller Date: Tue Jul 15 03:03:33 2008 -0700 netdev: Add netdev->select_queue() method. Devices or device layers can set this to control the queue selection performed by dev_pick_tx(). This function runs under RCU protection, which allows overriding functions to have some way of synchronizing with things like dynamic ->real_num_tx_queues adjustments. This makes the spinlock prefetch in dev_queue_xmit() a little bit less effective, but that's the price right now for correctness. Signed-off-by: David S. Miller commit e3c50d5d25ac09efd9acbe2b2a3e365466de84ed Author: David S. Miller Date: Tue Jul 15 02:58:39 2008 -0700 netdev: netdev_priv() can now be sane again. The private area of a netdev is now at a fixed offset once more. Unfortunately, some assumptions that netdev_priv() == netdev->priv crept back into the tree. In particular this happened in the loopback driver. Make it use netdev->ml_priv. Signed-off-by: David S. Miller commit 6b0fb1261a4655613bed5dac0e935e733969e999 Author: David S. Miller Date: Tue Jul 15 02:58:10 2008 -0700 netdev: Kill struct net_device_subqueue and netdev->egress_subqueue* No longer used. Signed-off-by: David S. Miller commit fd2ea0a79faad824258af5dcec1927aa24d81c16 Author: David S. Miller Date: Thu Jul 17 01:56:23 2008 -0700 net: Use queue aware tests throughout. This effectively "flips the switch" by making the core networking and multiqueue-aware drivers use the new TX multiqueue structures. Non-multiqueue drivers need no changes. The interfaces they use such as netif_stop_queue() degenerate into an operation on TX queue zero. So everything "just works" for them. Code that really wants to do "X" to all TX queues now invokes a routine that does so, such as netif_tx_wake_all_queues(), netif_tx_stop_all_queues(), etc. pktgen and netpoll required a little bit more surgery than the others. In particular the pktgen changes, whilst functional, could be largely improved. The initial check in pktgen_xmit() will sometimes check the wrong queue, which is mostly harmless. The thing to do is probably to invoke fill_packet() earlier. The bulk of the netpoll changes is to make the code operate solely on the TX queue indicated by by the SKB queue mapping. Setting of the SKB queue mapping is entirely confined inside of net/core/dev.c:dev_pick_tx(). If we end up needing any kind of special semantics (drops, for example) it will be implemented here. Finally, we now have a "real_num_tx_queues" which is where the driver indicates how many TX queues are actually active. With IGB changes from Jeff Kirsher. Signed-off-by: David S. Miller commit 24344d2600108b9b79a60c0e4c43b3c499856d14 Author: David S. Miller Date: Tue Jul 15 02:53:04 2008 -0700 mac80211: Temporarily mark QoS support BROKEN. We will undo this after a few changsets. Signed-off-by: David S. Miller commit 1d8ae3fdeb001b8f534a6782c261aba6ec1779f5 Author: David S. Miller Date: Tue Jul 15 02:52:19 2008 -0700 pkt_sched: Remove RR scheduler. This actually fixes a bug added by the RR scheduler changes. The ->bands and ->prio2band parameters were being set outside of the sch_tree_lock() and thus could result in strange behavior and inconsistencies. It might be possible, in the new design (where there will be one qdisc per device TX queue) to allow similar functionality via a TX hash algorithm for RR but I really see no reason to export this aspect of how these multiqueue cards actually implement the scheduling of the the individual DMA TX rings and the single physical MAC/PHY port. Signed-off-by: David S. Miller commit 09e83b5d7d1878065e2453239b49b684cd0fe4e5 Author: David S. Miller Date: Thu Jul 17 01:52:12 2008 -0700 netdev: Kill NETIF_F_MULTI_QUEUE. There is no need for a feature bit for something that can be tested by simply checking the TX queue count. Signed-off-by: David S. Miller commit e8a0464cc950972824e2e128028ae3db666ec1ed Author: David S. Miller Date: Thu Jul 17 00:34:19 2008 -0700 netdev: Allocate multiple queues for TX. alloc_netdev_mq() now allocates an array of netdev_queue structures for TX, based upon the queue_count argument. Furthermore, all accesses to the TX queues are now vectored through the netdev_get_tx_queue() and netdev_for_each_tx_queue() interfaces. This makes it easy to grep the tree for all things that want to get to a TX queue of a net device. Problem spots which are not really multiqueue aware yet, and only work with one queue, can easily be spotted by grepping for all netdev_get_tx_queue() calls that pass in a zero index. Signed-off-by: David S. Miller commit 070825b3840a743e21ebcc44f8279708a4fed977 Author: David S. Miller Date: Thu Jul 17 01:50:11 2008 -0700 igb: Kill CONFIG_NETDEVICES_MULTIQUEUE references, no longer exists. Signed-off-by: David S. Miller commit a6795e9ebb420d87af43789174689af0d66d1d35 Author: Joel Becker Date: Thu Jul 17 15:21:29 2008 -0700 configfs: Allow ->make_item() and ->make_group() to return detailed errors. The configfs operations ->make_item() and ->make_group() currently return a new item/group. A return of NULL signifies an error. Because of this, -ENOMEM is the only return code bubbled up the stack. Multiple folks have requested the ability to return specific error codes when these operations fail. This patch adds that ability by changing the ->make_item/group() ops to return ERR_PTR() values. These errors are bubbled up appropriately. NULL returns are changed to -ENOMEM for compatibility. Also updated are the in-kernel users of configfs. This is a rework of reverted commit 11c3b79218390a139f2d474ee1e983a672d5839a. Signed-off-by: Joel Becker commit f89ab8619e5320cc9c2576f5f8dcbaf6c0ba3950 Author: Joel Becker Date: Thu Jul 17 14:53:48 2008 -0700 Revert "configfs: Allow ->make_item() and ->make_group() to return detailed errors." This reverts commit 11c3b79218390a139f2d474ee1e983a672d5839a. The code will move to PTR_ERR(). Signed-off-by: Joel Becker commit 5b664cb235e97afbf34db9c4d77f08ebd725335e Merge: f39548a... c0420ad... Author: Linus Torvalds Date: Thu Jul 17 10:55:51 2008 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: [PATCH] ocfs2: fix oops in mmap_truncate testing configfs: call drop_link() to cleanup after create_link() failure configfs: Allow ->make_item() and ->make_group() to return detailed errors. configfs: Fix failing mkdir() making racing rmdir() fail configfs: Fix deadlock with racing rmdir() and rename() configfs: Make configfs_new_dirent() return error code instead of NULL configfs: Protect configfs_dirent s_links list mutations configfs: Introduce configfs_dirent_lock ocfs2: Don't snprintf() without a format. ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs ocfs2/net: Silence build warnings on sparc64 ocfs2: Handle error during journal load ocfs2: Silence an error message in ocfs2_file_aio_read() ocfs2: use simple_read_from_buffer() ocfs2: fix printk format warnings with OCFS2_FS_STATS=n [PATCH 2/2] ocfs2: Instrument fs cluster locks [PATCH 1/2] ocfs2: Add CONFIG_OCFS2_FS_STATS config option commit f39548a6ad1dbdfaab552419386ec5bb1d76fa0d Merge: 2b04be7... 417e149... Author: Linus Torvalds Date: Thu Jul 17 10:55:07 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6: pcmcia: ide-cs: Remove outdated comment pcmcia: fix cisinfo_t removal pcmcia: fix return value in cm4000_cs.c commit 2b04be7e8ab5756ea36e137dd03c8773d184e67e Merge: bdec6ca... 2567d71... Author: Linus Torvalds Date: Thu Jul 17 10:38:59 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 asm/e820.h for userspace inclusion x86: fix numaq_tsc_disable x86: fix kernel_physical_mapping_init() for large x86 systems commit bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f Merge: 2f73cca... 2464a60... Author: Linus Torvalds Date: Thu Jul 17 10:37:10 2008 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: do not trace library functions ftrace: do not trace scheduler functions ftrace: fix lockup with MAXSMP ftrace: fix merge buglet commit 2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c Author: Rusty Russell Date: Tue Jul 15 15:02:27 2008 +1000 x86: fix asm/e820.h for userspace inclusion asm-x86/e820.h is included from userspace. 'x86: make e820.c to have common functions' (b79cd8f1268bab57ff85b19d131f7f23deab2dee) broke it: make -C Documentation/lguest cc -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include lguest.c -lz -o lguest In file included from ../../include/asm-x86/bootparam.h:8, from lguest.c:45: ../../include/asm/e820.h:66: error: expected ‘)’ before ‘start’ ../../include/asm/e820.h:67: error: expected ‘)’ before ‘start’ ../../include/asm/e820.h:68: error: expected ‘)’ before ‘start’ ../../include/asm/e820.h:72: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘e820_update_range’ ... Signed-off-by: Rusty Russell Cc: Yinghai Lu Signed-off-by: Ingo Molnar commit 9354094a95aed456a46b353b1051a7e2fab29045 Author: Yinghai Lu Date: Mon Jul 14 23:29:01 2008 -0700 x86: fix numaq_tsc_disable fix: arch/x86/kernel/numaq_32.c: In function ‘numaq_tsc_disable’: arch/x86/kernel/numaq_32.c:99: warning: ‘return’ with a value, in function returning void Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit c43c1be0f7e0ac3d2fe1d4a5b37041c4c4463af1 Merge: e22146e... a3cf859... Author: Ingo Molnar Date: Thu Jul 17 19:24:56 2008 +0200 Merge branch 'linus' into x86/urgent commit 2f73ccab5628b4f8e8f4b93fea8082dd31a87a10 Author: Takashi Iwai Date: Thu Jul 17 18:09:12 2008 +0200 fix build error of arch/ia64/kvm/* Fix calls of smp_call_function*() in arch/ia64/kvm for recent API changes. CC [M] arch/ia64/kvm/kvm-ia64.o arch/ia64/kvm/kvm-ia64.c: In function 'handle_global_purge': arch/ia64/kvm/kvm-ia64.c:398: error: too many arguments to function 'smp_call_function_single' arch/ia64/kvm/kvm-ia64.c: In function 'kvm_vcpu_kick': arch/ia64/kvm/kvm-ia64.c:1696: error: too many arguments to function 'smp_call_function_single' Signed-off-by: Takashi Iwai Acked-by Xiantao Zhang Signed-off-by: Linus Torvalds commit 42fea1f385e99a1db979eb75c8a53c0baad0d9f6 Merge: 7259d93... 666f164... Author: Linus Torvalds Date: Thu Jul 17 09:15:23 2008 -0700 Merge branch 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace * 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace: fix dangling zombie when new parent ignores children do_wait: return security_task_wait() error code in place of -ECHILD ptrace children revamp do_wait reorganization commit 7259d936c6af216198ae6af3a25ac6c9dbdbe779 Author: David Woodhouse Date: Wed Jul 16 23:44:32 2008 -0700 Update scripts/Makefile.fwinst to cope with older make Also fix unwanted rebuilds of the firmware/ihex2fw tool by including the .ihex2fw.cmd file when present. Signed-off-by: David Woodhouse Reported-and-tested-by: Wang Chen Signed-off-by: Linus Torvalds commit ee723cb3d419afcc8b6c7ccc0f73a34b0eb5ac7b Merge: 7023cc6... 8586cb6... Author: Linus Torvalds Date: Thu Jul 17 09:05:38 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: [S390] dasd: use -EOPNOTSUPP instead of -ENOTSUPP [S390] qdio: new qdio driver. [S390] cio: Export chsc_error_from_response(). [S390] vmur: Fix return code handling. [S390] Fix stacktrace compile bug. [S390] Increase default warning stacksize. [S390] dasd: Fix cleanup in dasd_{fba,diag}_check_characteristics(). [S390] chsc headers userspace cleanup [S390] dasd: fix unsolicited SIM handling. [S390] zfcpdump: Make SCSI disk dump tool recognize storage holes commit 7023cc61292f9cd61d99521206480f6e387132ff Author: Grant Likely Date: Thu Jul 17 01:06:55 2008 -0600 Fix collateral damage to top level Makefile The patch named "powerpc/mpc5121: Add clock driver", also contained an unrelated and bogus change to the top-level makefile. This patch backs out the bad bit. SHA1 of offending patch: 137e95906e294913fab02162e8a1948ade49acb5) Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Repented-by: John Rigby [ Heh. Normally I pick these out from the diffstats, but I guess I've grown to trust the ppc tree too much ;) - Linus ] Signed-off-by: Linus Torvalds commit 2464a609ded094204a3aed24823745ec58e3c879 Author: Ingo Molnar Date: Thu Jul 17 17:40:48 2008 +0200 ftrace: do not trace library functions make function tracing more robust: do not trace library functions. We've already got a sizable list of exceptions: ifdef CONFIG_FTRACE # Do not profile string.o, since it may be used in early boot or vdso CFLAGS_REMOVE_string.o = -pg # Also do not profile any debug utilities CFLAGS_REMOVE_spinlock_debug.o = -pg CFLAGS_REMOVE_list_debug.o = -pg CFLAGS_REMOVE_debugobjects.o = -pg CFLAGS_REMOVE_find_next_bit.o = -pg CFLAGS_REMOVE_cpumask.o = -pg CFLAGS_REMOVE_bitmap.o = -pg endif ... and the pattern has been that random library functionality showed up in ftrace's critical path (outside of its recursion check), causing hard to debug lockups. So be a bit defensive about it and exclude all lib/*.o functions by default. It's not that they are overly interesting for tracing purposes anyway. Specific ones can still be traced, in an opt-in manner. Signed-off-by: Ingo Molnar commit c349e0a01c3e0f70913db6a5bb61ab204e0602de Author: Ingo Molnar Date: Tue Apr 15 22:39:31 2008 +0200 ftrace: do not trace scheduler functions do not trace scheduler functions - it's still a bit fragile and can lock up with: http://redhat.com/~mingo/misc/config-Thu_Jul_17_13_34_52_CEST_2008 Signed-off-by: Ingo Molnar commit 9fa111372a54f695f65e0de2f2a2108fe6cf3584 Author: Ingo Molnar Date: Thu Jul 17 17:38:17 2008 +0200 ftrace: fix lockup with MAXSMP MAXSMP brings in lots of use of various bitops in smp_processor_id() and friends - causing ftrace to lock up during bootup: calling anon_inode_init+0x0/0x130 initcall anon_inode_init+0x0/0x130 returned 0 after 0 msecs calling acpi_event_init+0x0/0x57 [ hard hang ] So exclude the bitops facilities from tracing. Signed-off-by: Ingo Molnar commit 8586cb60ce85f40431cf06fe97512269d3992f03 Author: Stefan Haberland Date: Thu Jul 17 17:16:49 2008 +0200 [S390] dasd: use -EOPNOTSUPP instead of -ENOTSUPP return value -ENOTSUPP is not valid in userspace context, use -EOPNOTSUPP instead Signed-off-by: Stefan Haberland Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens commit 779e6e1c724d30e0fd1baca78b852e41e3a23c1d Author: Jan Glauber Date: Thu Jul 17 17:16:48 2008 +0200 [S390] qdio: new qdio driver. List of major changes: - split qdio driver into several files - seperation of thin interrupt code - improved handling for multiple thin interrupt devices - inbound and outbound processing now always runs in tasklet context - significant less tasklet schedules per interrupt needed - merged qebsm with non-qebsm handling - cleanup qdio interface and added kerneldoc - coding style Reviewed-by: Cornelia Huck Reviewed-by: Utz Bacher Reviewed-by: Ursula Braun Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens commit dae39843f478d181da5b5e1c2c703dfcaaf838c1 Author: Cornelia Huck Date: Thu Jul 17 17:16:47 2008 +0200 [S390] cio: Export chsc_error_from_response(). Make chsc_error_from_response() available to chsc callers outside of chsc.c (namely qdio) to avoid duplicating error checking code. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens commit b9993a38a9b491a9df48a5bc82d2e03ab44e352a Author: Frank Munzert Date: Thu Jul 17 17:16:46 2008 +0200 [S390] vmur: Fix return code handling. Use -EOPNOTSUPP instead of -ENOTSUPP. Signed-off-by: Frank Munzert Signed-off-by: Heiko Carstens Cc: Martin Schwidefsky commit 8de2ce86cdde64d00fc4a4034008b35d8fc0dc83 Author: Heiko Carstens Date: Thu Jul 17 17:16:45 2008 +0200 [S390] Fix stacktrace compile bug. Add missing module.h include to fix this: CC arch/s390/kernel/stacktrace.o arch/s390/kernel/stacktrace.c:84: warning: data definition has no type or storage class arch/s390/kernel/stacktrace.c:84: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/s390/kernel/stacktrace.c:84: warning: parameter names (without types) in function declaration arch/s390/kernel/stacktrace.c:97: warning: data definition has no type or storage class arch/s390/kernel/stacktrace.c:97: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/s390/kernel/stacktrace.c:97: warning: parameter names (without types) in function declaration Signed-off-by: Heiko Carstens Cc: Martin Schwidefsky commit c5a37255493a3a8bf527534c8700dd73bd591fc7 Author: Heiko Carstens Date: Thu Jul 17 17:16:44 2008 +0200 [S390] Increase default warning stacksize. Compiling a kernel with allmodconfig or allyesconfig results in tons of gcc warnings, because the default maximum stacksize from which on gcc will emit a warning is just 256 bytes. Increase this to 2048, so these warnings don't distract from the real warnings that we need to watch at. Signed-off-by: Heiko Carstens Cc: Martin Schwidefsky commit 7337194f708bac977511c7890d7038ded187041a Author: Cornelia Huck Date: Thu Jul 17 17:16:43 2008 +0200 [S390] dasd: Fix cleanup in dasd_{fba,diag}_check_characteristics(). Signed-off-by: Cornelia Huck Signed-off-by: Heiko Carstens Cc: Martin Schwidefsky commit 626f311737770f0fb5c09a6da2ea795a559aa42a Author: Adrian Bunk Date: Thu Jul 17 17:16:42 2008 +0200 [S390] chsc headers userspace cleanup Kernel headers shouldn't expose functions to userspace. Cc: Cornelia Huck Signed-off-by: Adrian Bunk Signed-off-by: Heiko Carstens Cc: Martin Schwidefsky commit 9d853caf44e6f969a9ad056a9937e8d97bc2c761 Author: Stefan Haberland Date: Thu Jul 17 17:16:41 2008 +0200 [S390] dasd: fix unsolicited SIM handling. Add missing schedule_bh and check that there is 32 bit sense data. Signed-off-by: Stefan Haberland Signed-off-by: Heiko Carstens Cc: Martin Schwidefsky commit 12e0c95e0ca99f633c9d9f90773037eb178685ad Author: Frank Munzert Date: Thu Jul 17 17:16:40 2008 +0200 [S390] zfcpdump: Make SCSI disk dump tool recognize storage holes The kernel part of zfcpdump establishes a new debugfs file zcore/memmap which exports information on memory layout (start address and length of each memory chunk) to its userspace counterpart. Signed-off-by: Frank Munzert Signed-off-by: Heiko Carstens Cc: Martin Schwidefsky commit 8e9509c827a28e2f365c203c04224f9e9dd1b63a Author: Ingo Molnar Date: Thu Jul 17 13:26:50 2008 +0200 ftrace: fix merge buglet -tip testing found a bootup hang here: initcall anon_inode_init+0x0/0x130 returned 0 after 0 msecs calling acpi_event_init+0x0/0x57 the bootup should have continued with: initcall acpi_event_init+0x0/0x57 returned 0 after 45 msecs but it hung hard there instead. bisection led to this commit: | commit 5806b81ac1c0c52665b91723fd4146a4f86e386b | Merge: d14c8a6... 6712e29... | Author: Ingo Molnar | Date: Mon Jul 14 16:11:52 2008 +0200 | Merge branch 'auto-ftrace-next' into tracing/for-linus turns out that i made this mistake in the merge: ifdef CONFIG_FTRACE # Do not profile debug utilities CFLAGS_REMOVE_tsc_64.o = -pg CFLAGS_REMOVE_tsc_32.o = -pg those two files got unified meanwhile - so the dont-profile annotation got lost. The proper rule is: CFLAGS_REMOVE_tsc.o = -pg i guess this could have been caught sooner if the CFLAGS_REMOVE* kbuild rule aborted the build if it met a target that does not exist anymore? Signed-off-by: Ingo Molnar commit 51ce7ec92187b22ab1598987bb5f9776f6e0ebad Author: Patrick McHardy Date: Wed Jul 16 20:51:47 2008 -0700 garp: retry sending JoinIn messages after allocation failures Increase reliability by retrying to send JoinIn messages after memory allocation failures on each TRANSMIT_PDU event until it succeeds. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9a6d276e85aa3d8f308fc5e8de6892daeb60ae5f Author: Neil Horman Date: Wed Jul 16 20:50:49 2008 -0700 core: add stat to track unresolved discards in neighbor cache in __neigh_event_send, if we have a neighbour entry which is in NUD_INCOMPLETE state, we enqueue any outbound frames to that neighbour to the neighbours arp_queue, which is default capped to a length of 3 skbs. If that queue exceeds its set length, it will drop an skb on the queue to enqueue the newly arrived skb. This results in a drop for which we have no statistics incremented. This patch adds an unresolved_discards stat to /proc/net/stat/ndisc_cache to track these lost frames. Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit ed88098e25d77bef3b2ad8c9d8e2ebf454d9ccbf Author: Pavel Emelyanov Date: Wed Jul 16 20:32:45 2008 -0700 mib: add net to NET_ADD_STATS_USER Done with NET_XXX_STATS macros :) To be continued... Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit f2bf415cfed703de5ba94d25cdb160920c01fb00 Author: Pavel Emelyanov Date: Wed Jul 16 20:32:25 2008 -0700 mib: add net to NET_ADD_STATS_BH This one is tricky. The thing is that this macro is only used when killing tw buckets, but since this killer is promiscuous wrt to which net each particular tw belongs to, I have to use it only when NET_NS is off. When the net namespaces are on, I use the INET_INC_STATS_BH for each bucket. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 6f67c817fcfd94f5ca0f14b114b7fa25c0210c8b Author: Pavel Emelyanov Date: Wed Jul 16 20:31:39 2008 -0700 mib: add net to NET_INC_STATS_USER Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit de0744af1fe2d0a3d428f6af0f2fe1f6179b1a9c Author: Pavel Emelyanov Date: Wed Jul 16 20:31:16 2008 -0700 mib: add net to NET_INC_STATS_BH Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 4e6734447dbc7a0a85e09616821c0782d9fb1141 Author: Pavel Emelyanov Date: Wed Jul 16 20:30:14 2008 -0700 mib: add net to NET_INC_STATS Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 1ed834655a0d42ecd80ff051e681e2ea44747b6c Author: Pavel Emelyanov Date: Wed Jul 16 20:29:51 2008 -0700 tcp: replace tcp_sock argument with sock in some places These places have a tcp_sock, but we'd prefer the sock itself to get net from it. Fortunately, tcp_sk macro is just a type cast, so this replace is really cheap. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit ca12a1a443a51298afcca627ad0bcbd8ad1dcddc Author: Pavel Emelyanov Date: Wed Jul 16 20:28:42 2008 -0700 inet: prepare net on the stack for NET accounting macros Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 5c52ba170f8167511bdb65b981f4582100c40675 Author: Pavel Emelyanov Date: Wed Jul 16 20:28:10 2008 -0700 sock: add net to prot->enter_memory_pressure callback The tcp_enter_memory_pressure calls NET_INC_STATS, but doesn't have where to get the net from. I decided to add a sk argument, not the net itself, only to factor all the required sock_net(sk) calls inside the enter_memory_pressure callback itself. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit cf1100a7a4f2573f50f9a923b53373977328e3c8 Author: Pavel Emelyanov Date: Wed Jul 16 20:27:38 2008 -0700 mib: add net to TCP_ADD_STATS_USER Now we're done with the TCP_XXX_STATS macros. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 74688e487a407a33d42879957b478601aca616b8 Author: Pavel Emelyanov Date: Wed Jul 16 20:22:46 2008 -0700 mib: add net to TCP_DEC_STATS Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 63231bddf6514778792d3784f63822473d250fc0 Author: Pavel Emelyanov Date: Wed Jul 16 20:22:25 2008 -0700 mib: add net to TCP_INC_STATS_BH Same as before - the sock is always there to get the net from, but there are also some places with the net already saved on the stack. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 81cc8a75d944fa39fc333c2c329c8e8b3c62cada Author: Pavel Emelyanov Date: Wed Jul 16 20:22:04 2008 -0700 mib: add net to TCP_INC_STATS Fortunately (almost) all the TCP code has a sock to get the net from :) Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit a9c19329eccdb145a08a4a2e969d7b40c54c9bcc Author: Pavel Emelyanov Date: Wed Jul 16 20:21:42 2008 -0700 tcp: add net to tcp_mib_init This one sets TCP MIBs after zeroing them, and thus requires the net. The existing single caller can use init_net (temporarily). Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit f10f84314d5adc0ba6ca2a0877442de63e226130 Author: Pavel Emelyanov Date: Wed Jul 16 20:21:20 2008 -0700 mib: drop unused TCP_XXX_STATS macros TCP_INC_STATS_USER and TCP_ADD_STATS_BH are currently unused. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit a86b1e3019455283a677c2485cfeda2dc36df3eb Author: Pavel Emelyanov Date: Wed Jul 16 20:20:58 2008 -0700 inet: prepare struct net for TCP MIB accounting This is the same as the first patch in the set, but preparing the net for TCP_XXX_STATS - save the struct net on the stack where required and possible. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit c5346fe396f5e22bbfb3ec037c43891c3c57d3e6 Author: Pavel Emelyanov Date: Wed Jul 16 20:20:33 2008 -0700 mib: add net to IP_ADD_STATS_BH Very simple - only ip_evictor (fragments) requires such. This patch ends up the IP_XXX_STATS patching. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 7c73a6faffae0bfae70639113aecf06af666e714 Author: Pavel Emelyanov Date: Wed Jul 16 20:20:11 2008 -0700 mib: add net to IP_INC_STATS_BH Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 5e38e270444f2629de7a706b5a9ca1b333d14517 Author: Pavel Emelyanov Date: Wed Jul 16 20:19:49 2008 -0700 mib: add net to IP_INC_STATS All the callers already have either the net itself, or the place where to get it from. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit c6f8f7e3bb4b2c1886ef3743e8f24521f7a60abc Author: Pavel Emelyanov Date: Wed Jul 16 20:19:26 2008 -0700 mib: drop unused IP_INC_STATS_USER Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 84a3aa000eacbaf841d745b07ef3a3280899056b Author: Pavel Emelyanov Date: Wed Jul 16 20:19:08 2008 -0700 ipv4: prepare net initialization for IP accounting Some places, that deal with IP statistics already have where to get a struct net from, but use it directly, without declaring a separate variable on the stack. So, save this net on the stack for future IP_XXX_STATS macros. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 78ed11a56bd8679aa6d51eb36b448342c59a7824 Author: Patrick McHardy Date: Wed Jul 16 20:16:14 2008 -0700 netdrv intel: always enable VLAN filtering except in promiscous mode Currently VLAN filtering is enabled when the first VLAN is added. Obviously before that there's no point in receiving any VLAN packets. Now that we disable VLAN filtering in promiscous mode, we can keep the VLAN filters enabled the remaining time. Signed-off-by: Patrick McHardy Acked-by: Jeff Kirsher Acked-by: Peter P Waskiewicz Jr Signed-off-by: David S. Miller commit 746b9f0228a1c607b3db67c80da1c2a963321926 Author: Patrick McHardy Date: Wed Jul 16 20:15:45 2008 -0700 netdrv intel: disable VLAN filtering in promiscous mode As discussed in this thread: http://www.mail-archive.com/netdev@vger.kernel.org/msg53976.html promiscous mode means to disable *all* filters. Currently only unicast and multicast filtering is disabled. This patch changes all Intel drivers to also disable VLAN filtering. Signed-off-by: Patrick McHardy Acked-by: Jeff Kirsher Acked-by: Peter P Waskiewicz Jr Signed-off-by: David S. Miller commit 70efce27fc3d54271519244dc5e47da4ed711dd4 Author: Will Newton Date: Wed Jul 16 20:13:43 2008 -0700 net/ipv4/tcp.c: Fix use of PULLHUP instead of POLLHUP in comments. Change PULLHUP to POLLHUP in tcp_poll comments and clean up another comment for grammar and coding style. Signed-off-by: Will Newton Signed-off-by: David S. Miller commit 7b1c65faa27f5ade3915e4bbc9186b6e64d2d6ec Author: Harvey Harrison Date: Wed Jul 16 20:12:30 2008 -0700 net: make __skb_splice_bits static net/core/skbuff.c:1335:5: warning: symbol '__skb_splice_bits' was not declared. Should it be static? Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit 885a4c966bcc11a1470c2b85a90360f6518a507a Merge: 9d3a0de... 375c6bb... Author: David S. Miller Date: Wed Jul 16 20:07:06 2008 -0700 Merge branch 'stealer/ipvs/sync-daemon-cleanup-for-next' of git://git.stealer.net/linux-2.6 commit 9d3a0de7dc3c1c4456db5ceb92c445bef0a47681 Author: Rumen G. Bogdanovski Date: Wed Jul 16 20:04:23 2008 -0700 ipvs: More reliable synchronization on connection close This patch enhances the synchronization of the closing connections between the master and the backup director. It prevents the closed connections to expire with the 15 min timeout of the ESTABLISHED state on the backup and makes them expire as they would do on the master with much shorter timeouts. Signed-off-by: Rumen G. Bogdanovski Acked-by: Simon Horman Signed-off-by: David S. Miller commit 666f164f4fbfa78bd00fb4b74788b42a39842c64 Author: Roland McGrath Date: Tue Apr 8 23:12:30 2008 -0700 fix dangling zombie when new parent ignores children This fixes an arcane bug that we think was a regression introduced by commit b2b2cbc4b2a2f389442549399a993a8306420baf. When a parent ignores SIGCHLD (or uses SA_NOCLDWAIT), its children would self-reap but they don't if it's using ptrace on them. When the parent thread later exits and ceases to ptrace a child but leaves other live threads in the parent's thread group, any zombie children are left dangling. The fix makes them self-reap then, as they would have done earlier if ptrace had not been in use. Signed-off-by: Roland McGrath commit 14dd0b81414a58caf0296dbeace016bb0a5d11ab Author: Roland McGrath Date: Sun Mar 30 18:41:25 2008 -0700 do_wait: return security_task_wait() error code in place of -ECHILD This reverts the effect of commit f2cc3eb133baa2e9dc8efd40f417106b2ee520f3 "do_wait: fix security checks". That change reverted the effect of commit 73243284463a761e04d69d22c7516b2be7de096c. The rationale for the original commit still stands. The inconsistent treatment of children hidden by ptrace was an unintended omission in the original change and in no way invalidates its purpose. This makes do_wait return the error returned by security_task_wait() (usually -EACCES) in place of -ECHILD when there are some children the caller would be able to wait for if not for the permission failure. A permission error will give the user a clue to look for security policy problems, rather than for mysterious wait bugs. Signed-off-by: Roland McGrath commit f470021adb9190819c03d6d8c5c860a17480aa6d Author: Roland McGrath Date: Mon Mar 24 18:36:23 2008 -0700 ptrace children revamp ptrace no longer fiddles with the children/sibling links, and the old ptrace_children list is gone. Now ptrace, whether of one's own children or another's via PTRACE_ATTACH, just uses the new ptraced list instead. There should be no user-visible difference that matters. The only change is the order in which do_wait() sees multiple stopped children and stopped ptrace attachees. Since wait_task_stopped() was changed earlier so it no longer reorders the children list, we already know this won't cause any new problems. Signed-off-by: Roland McGrath commit 98abed02007b19bbfd68b6d06a5485afc3eeb01b Author: Roland McGrath Date: Wed Mar 19 19:24:59 2008 -0700 do_wait reorganization This breaks out the guts of do_wait into three subfunctions. The control flow is less nonobvious without so much goto. do_wait_thread and ptrace_do_wait contain the main work of the outer loop. wait_consider_task contains the main work of the inner loop. Signed-off-by: Roland McGrath commit 33af79d12e0fa25545d49e86afc67ea8ad5f2f40 Author: Chandra Seetharaman Date: Wed Jul 16 17:35:08 2008 -0700 scsi_dh: Verify "dev" is a sdev before accessing it. Before accessing the device data structure in hardware handlers, make sure it is a indeed a sdev device. Yinghai Lu found the bug on Jul 16, 2008, and later tested/verified the following fix. Signed-off-by: Chandra Seetharaman Signed-off-by: Linus Torvalds commit dc7c65db2845a8d17432d89252c4227a9a7cb15f Merge: 8a0ca91... 58b6e55... Author: Linus Torvalds Date: Wed Jul 16 17:25:46 2008 -0700 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (72 commits) Revert "x86/PCI: ACPI based PCI gap calculation" PCI: remove unnecessary volatile in PCIe hotplug struct controller x86/PCI: ACPI based PCI gap calculation PCI: include linux/pm_wakeup.h for device_set_wakeup_capable PCI PM: Fix pci_prepare_to_sleep x86/PCI: Fix PCI config space for domains > 0 Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n PCI: Simplify PCI device PM code PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep PCI ACPI: Rework PCI handling of wake-up ACPI: Introduce new device wakeup flag 'prepared' ACPI: Introduce acpi_device_sleep_wake function PCI: rework pci_set_power_state function to call platform first PCI: Introduce platform_pci_power_manageable function ACPI: Introduce acpi_bus_power_manageable function PCI: make pci_name use dev_name PCI: handle pci_name() being const PCI: add stub for pci_set_consistent_dma_mask() PCI: remove unused arch pcibios_update_resource() functions PCI: fix pci_setup_device()'s sprinting into a const buffer ... Fixed up conflicts in various files (arch/x86/kernel/setup_64.c, arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c, drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86 and ACPI updates manually. commit 58b6e5538460be358fdf1286d9a2fbcfcc2cfaba Author: Jesse Barnes Date: Wed Jul 16 16:21:47 2008 -0700 Revert "x86/PCI: ACPI based PCI gap calculation" This reverts commit 809d9a8f93bd8504dcc34b16bbfdfd1a8c9bb1ed. This one isn't quite ready for prime time. It needs more testing and additional feedback from the ACPI guys. commit c0420ad2ca514551ca086510b0e7d17a05c70492 Author: Coly Li Date: Mon Jun 30 18:45:45 2008 +0800 [PATCH] ocfs2: fix oops in mmap_truncate testing This patch fixes a mmap_truncate bug which was found by ocfs2 test suite. In an ocfs2 cluster more than 1 node, run program mmap_truncate, which races mmap writes and truncates from multiple processes. While the test is running, a stat from another node forces writeout, causing an oops in ocfs2_get_block() because it sees a buffer to write which isn't allocated. This patch fixed the bug by clear dirty and uptodate bits in buffer, leave the buffer unmapped and return. Fix is suggested by Mark Fasheh, and I code up the patch. Signed-off-by: Coly Li Signed-off-by: Mark Fasheh commit 375c6bbabf210ded3151481ca1ac7f730903512b Author: Sven Wegener Date: Wed Jul 16 11:14:03 2008 +0000 ipvs: Use schedule_timeout_interruptible() instead of msleep_interruptible() So that kthread_stop() can wake up the thread and we don't have to wait one second in the worst case for the daemon to actually stop. Signed-off-by: Sven Wegener Acked-by: Simon Horman commit ba6fd85021dec97d58373d9aea4bea8fc24258be Author: Sven Wegener Date: Wed Jul 16 11:13:56 2008 +0000 ipvs: Put backup thread on mcast socket wait queue Instead of doing an endless loop with sleeping for one second, we now put the backup thread onto the mcast socket wait queue and it gets woken up as soon as we have data to process. Signed-off-by: Sven Wegener Acked-by: Simon Horman commit 998e7a76804b7a273a0460c2cdd5a51fa9856717 Author: Sven Wegener Date: Wed Jul 16 11:13:50 2008 +0000 ipvs: Use kthread_run() instead of doing a double-fork via kernel_thread() This also moves the setup code out of the daemons, so that we're able to return proper error codes to user space. The current code will return success to user space when the daemon is started with an invald mcast interface. With these changes we get an appropriate "No such device" error. We longer need our own completion to be sure the daemons are actually running, because they no longer contain code that can fail and kthread_run() takes care of the rest. Signed-off-by: Sven Wegener Acked-by: Simon Horman commit e6dd731c75cba986a485924f908e6e05b088ea9e Author: Sven Wegener Date: Wed Jul 16 11:13:43 2008 +0000 ipvs: Use ERR_PTR for returning errors from make_receive_sock() and make_send_sock() The additional information we now return to the caller is currently not used, but will be used to return errors to user space. Signed-off-by: Sven Wegener Acked-by: Simon Horman commit d56400504a40a4aa197af629300d76544169e821 Author: Sven Wegener Date: Wed Jul 16 11:13:35 2008 +0000 ipvs: Initialize mcast addr at compile time There's no need to do it at runtime, the values are constant. Signed-off-by: Sven Wegener Acked-by: Simon Horman commit 8a0ca91e1db5de5eb5b18cfa919d52ff8be375af Merge: 9c1be0c... c43d863... Author: Linus Torvalds Date: Wed Jul 16 15:11:07 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: (68 commits) sdio_uart: Fix SDIO break control to now return success or an error mmc: host driver for Ricoh Bay1Controllers sdio: sdio_io.c Fix sparse warnings sdio: fix the use of hard coded timeout value. mmc: OLPC: update vdd/powerup quirk comment mmc: fix spares errors of sdhci.c mmc: remove multiwrite capability wbsd: fix bad dma_addr_t conversion atmel-mci: Driver for Atmel on-chip MMC controllers mmc: fix sdio_io sparse errors mmc: wbsd.c fix shadowing of 'dma' variable MMC: S3C24XX: Refuse incorrectly aligned transfers MMC: S3C24XX: Add maintainer entry MMC: S3C24XX: Update error debugging. MMC: S3C24XX: Add media presence test to request handling. MMC: S3C24XX: Fix use of msecs where jiffies are needed MMC: S3C24XX: Add MODULE_ALIAS() entries for the platform devices MMC: S3C24XX: Fix s3c2410_dma_request() return code check. MMC: S3C24XX: Allow card-detect on non-IRQ capable pin MMC: S3C24XX: Ensure host->mrq->data is valid ... Manually fixed up bogus executable bits on drivers/mmc/core/sdio_io.c and include/linux/mmc/sdio_func.h when merging. commit 9c1be0c4712fe760d8969427ef91107e9c062d91 Merge: 42fdd14... 0d7eff8... Author: Linus Torvalds Date: Wed Jul 16 15:02:57 2008 -0700 Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6 * 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6: UBIFS: include to compilation UBIFS: add new flash file system UBIFS: add brief documentation MAINTAINERS: add UBIFS section do_mounts: allow UBI root device name VFS: export sync_sb_inodes VFS: move inode_lock into sync_sb_inodes commit 42fdd144a40f3afaccaa7ea538268bad3596439e Merge: 4314652... 64a8f00... Author: Linus Torvalds Date: Wed Jul 16 14:53:54 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: (76 commits) IDE: Report errors during drive reset back to user space Update documentation of HDIO_DRIVE_RESET ioctl IDE: Remove unused code IDE: Fix HDIO_DRIVE_RESET handling hd.c: remove the #include update the BLK_DEV_HD help text move ide/legacy/hd.c to drivers/block/ ide/legacy/hd.c: use late_initcall() remove BLK_DEV_HD_ONLY ide: endian annotations in ide-floppy.c ide-floppy: zero out the whole struct ide_atapi_pc on init ide-floppy: fold idefloppy_create_test_unit_ready_cmd into idefloppy_open ide-cd: move request prep chunk from cdrom_do_newpc_cont to rq issue path ide-cd: move request prep from cdrom_start_rw_cont to rq issue path ide-cd: move request prep from cdrom_start_seek_continuation to rq issue path ide-cd: fold cdrom_start_seek into ide_cd_do_request ide-cd: simplify request issuing path ide-cd: mv ide_do_rw_cdrom ide_cd_do_request ide-cd: cdrom_start_seek: remove unused argument block ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else block ... commit 4314652bb41df08ad65bd25176ba1dfd24b14a51 Merge: d442cc4... 01a5bba... Author: Linus Torvalds Date: Wed Jul 16 14:52:12 2008 -0700 Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-merge-2.6 * 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-merge-2.6: (87 commits) Fix FADT parsing Add the ability to reset the machine using the RESET_REG in ACPI's FADT table. ACPI: use dev_printk when possible PNPACPI: add support for HP vendor-specific CCSR descriptors PNP: avoid legacy IDE IRQs PNP: convert resource options to single linked list ISAPNP: handle independent options following dependent ones PNP: remove extra 0x100 bit from option priority PNP: support optional IRQ resources PNP: rename pnp_register_*_resource() local variables PNPACPI: ignore _PRS interrupt numbers larger than PNP_IRQ_NR PNP: centralize resource option allocations PNP: remove redundant pnp_can_configure() check PNP: make resource assignment functions return 0 (success) or -EBUSY (failure) PNP: in debug resource dump, make empty list obvious PNP: improve resource assignment debug PNP: increase I/O port & memory option address sizes PNP: introduce pnp_irq_mask_t typedef PNP: make resource option structures private to PNP subsystem PNP: define PNP-specific IORESOURCE_IO_* flags alongside IRQ, DMA, MEM ... commit d442cc44c0db56e84ef6aa244a88427d2efe06cd Author: Martin K. Petersen Date: Wed Jul 16 16:09:06 2008 -0400 block: Trivial fix for blk_integrity_rq() Fail integrity check gracefully when request does not have a bio attached (BLOCK_PC). Signed-off-by: Martin K. Petersen Signed-off-by: Linus Torvalds commit 8df1b049bc86495a40e421abc8b9cf1dda32f0d9 Merge: a3cf859... cadc723... Author: Linus Torvalds Date: Wed Jul 16 14:49:49 2008 -0700 Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (82 commits) NFSv4: Remove BKL from the nfsv4 state recovery SUNRPC: Remove the BKL from the callback functions NFS: Remove BKL from the readdir code NFS: Remove BKL from the symlink code NFS: Remove BKL from the sillydelete operations NFS: Remove the BKL from the rename, rmdir and unlink operations NFS: Remove BKL from NFS lookup code NFS: Remove the BKL from nfs_link() NFS: Remove the BKL from the inode creation operations NFS: Remove BKL usage from open() NFS: Remove BKL usage from the write path NFS: Remove the BKL from the permission checking code NFS: Remove attribute update related BKL references NFS: Remove BKL requirement from attribute updates NFS: Protect inode->i_nlink updates using inode->i_lock nfs: set correct fl_len in nlmclnt_test() SUNRPC: Support registering IPv6 interfaces with local rpcbind daemon SUNRPC: Refactor rpcb_register to make rpcbindv4 support easier SUNRPC: None of rpcb_create's callers wants a privileged source port SUNRPC: Introduce a specific rpcb_create for contacting localhost ... commit 01a5bba576b9364b33f61f0cd9fa70c2cf5535e2 Author: Jan Beulich Date: Wed Jul 16 23:27:08 2008 +0200 Fix FADT parsing The (1.0 inherited) separate length fields in the FADT are byte granular. Further, PM1a/b may have distinct lengths and live in distinct address spaces. acpi_tb_convert_fadt() should account for all of these conditions. Apart from these changes I'm puzzled by the fact that, not just for acpi_gbl_xpm1{a,b}_enable, acpi_hw_low_level_{read,write}() get an explicit size passed rather than using the size found in the passed GAS. What happens on a platform that defines PM1{a,b} wider than 16 bits? Of course, acpi_hw_low_level_{read,write}() at present are entirely un-prepared to deal with sizes other than 8, 16, or 32, not to speak of a non-zero bit_offset or access_width... Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Cc: Len Brown Signed-off-by: Andrew Morton commit 4d3870431d17346c4fdd80e087b7d76f1b5941d5 Author: Aaron Durbin Date: Wed Jul 16 23:27:08 2008 +0200 Add the ability to reset the machine using the RESET_REG in ACPI's FADT table. Signed-off-by: Aaron Durbin Signed-off-by: Andi Kleen Cc: Len Brown Cc: Andi Kleen Signed-off-by: Andrew Morton commit c83642d5123225a22cccd75adea6e97c245714cb Author: Bjorn Helgaas Date: Fri Jun 27 08:45:39 2008 -0600 ACPI: use dev_printk when possible Convert printks to use dev_printk(). The most obvious change will be messages like this: -ACPI: PCI Interrupt 0000:00:04.0[A] -> GSI 31 (level, low) -> IRQ 31 +cciss 0000:00:04.0: PCI INT A -> GSI 31 (level, low) -> IRQ 31 Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 40ab4f4c1d843362eb26d83425317e91fbd98b17 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:19 2008 -0600 PNPACPI: add support for HP vendor-specific CCSR descriptors The HP CCSR descriptor describes MMIO address space that should appear as a MEM resource. This patch adds support for parsing these descriptors in the _CRS data. The visible effect of this is that these MEM resources will appear in /sys/devices/pnp0/.../resources, which means that "lspnp -v" will report it, user applications can use this to locate device CSR space, and kernel drivers can use the normal PNP resource accessors to locate them. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 84684c7469a2e6fcbf8c808ac5030ba2de14ff77 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:18 2008 -0600 PNP: avoid legacy IDE IRQs If an IDE controller is in compatibility mode, it expects to use IRQs 14 and 15, so PNP should avoid them. This patch should resolve this problem report: parallel driver grabs IRQ14 preventing legacy SFF ATA controller from working https://bugzilla.novell.com/show_bug.cgi?id=375836 Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 1f32ca31e7409d37c1b25e5f81840fb184380cdf Author: Bjorn Helgaas Date: Fri Jun 27 16:57:17 2008 -0600 PNP: convert resource options to single linked list ISAPNP, PNPBIOS, and ACPI describe the "possible resource settings" of a device, i.e., the possibilities an OS bus driver has when it assigns I/O port, MMIO, and other resources to the device. PNP used to maintain this "possible resource setting" information in one independent option structure and a list of dependent option structures for each device. Each of these option structures had lists of I/O, memory, IRQ, and DMA resources, for example: dev independent options ind-io0 -> ind-io1 ... ind-mem0 -> ind-mem1 ... ... dependent option set 0 dep0-io0 -> dep0-io1 ... dep0-mem0 -> dep0-mem1 ... ... dependent option set 1 dep1-io0 -> dep1-io1 ... dep1-mem0 -> dep1-mem1 ... ... ... This data structure was designed for ISAPNP, where the OS configures device resource settings by writing directly to configuration registers. The OS can write the registers in arbitrary order much like it writes PCI BARs. However, for PNPBIOS and ACPI devices, the OS uses firmware interfaces that perform device configuration, and it is important to pass the desired settings to those interfaces in the correct order. The OS learns the correct order by using firmware interfaces that return the "current resource settings" and "possible resource settings," but the option structures above doesn't store the ordering information. This patch replaces the independent and dependent lists with a single list of options. For example, a device might have possible resource settings like this: dev options ind-io0 -> dep0-io0 -> dep1->io0 -> ind-io1 ... All the possible settings are in the same list, in the order they come from the firmware "possible resource settings" list. Each entry is tagged with an independent/dependent flag. Dependent entries also have a "set number" and an optional priority value. All dependent entries must be assigned from the same set. For example, the OS can use all the entries from dependent set 0, or all the entries from dependent set 1, but it cannot mix entries from set 0 with entries from set 1. Prior to this patch PNP didn't keep track of the order of this list, and it assigned all independent options first, then all dependent ones. Using the example above, that resulted in a "desired configuration" list like this: ind->io0 -> ind->io1 -> depN-io0 ... instead of the list the firmware expects, which looks like this: ind->io0 -> depN-io0 -> ind-io1 ... Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit bbe413b4fc7f791248c7ee00ce7b3778491a3700 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:16 2008 -0600 ISAPNP: handle independent options following dependent ones The ISAPNP spec recommends that independent options precede dependent ones, but this is not actually required. The current ISAPNP code incorrectly puts such trailing independent options at the end of the last dependent option list. This patch fixes that bug by resetting the current option list to the independent list when we see an "End Dependent Functions" tag. PNPBIOS and PNPACPI handle this the same way. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit e2a1a6f1cfaf6ee770a8700e5df8a3708dae503b Author: Bjorn Helgaas Date: Fri Jun 27 16:57:15 2008 -0600 PNP: remove extra 0x100 bit from option priority When building resource options, ISAPNP and PNPBIOS set the priority to something like "0x100 | PNP_RES_PRIORITY_ACCEPTABLE", but we immediately mask off the 0x100 again in pnp_build_option(), so that bit looks superfluous. Thanks to Rene Herman for pointing this out. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit d5ebde6ef5c2d51828f975a81d7d0e58bccfd833 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:14 2008 -0600 PNP: support optional IRQ resources This patch adds an IORESOURCE_IRQ_OPTIONAL flag for use when assigning resources to a device. If the flag is set and we are unable to assign an IRQ to the device, we can leave the IRQ disabled but allow the overall resource allocation to succeed. Some devices request an IRQ, but can run without an IRQ (possibly with degraded performance). This flag lets us run the device without the IRQ instead of just leaving the device disabled. This is a reimplementation of this previous change by Rene Herman : http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3b73a223661ed137c5d3d2635f954382e94f5a43 I reimplemented this for two reasons: - to prepare for converting all resource options into a single linked list, as opposed to the per-resource-type lists we have now, and - to preserve the order and number of resource options. In PNPBIOS and ACPI, we configure a device by giving firmware a list of resource assignments. It is important that this list has exactly the same number of resources, in the same order, as the "template" list we got from the firmware in the first place. The problem of a sound card MPU401 being left disabled for want of an IRQ was reported by Uwe Bugla . Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit 2d29a7a794c5bae982955cd5dd0a76e766e57f39 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:13 2008 -0600 PNP: rename pnp_register_*_resource() local variables No functional change; just rename "data" to something more descriptive. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit fe2cf598e6942abd8fb70fee230d74b1a1eae0d1 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:12 2008 -0600 PNPACPI: ignore _PRS interrupt numbers larger than PNP_IRQ_NR ACPI Extended Interrupt Descriptors can encode 32-bit interrupt numbers, so an interrupt number may exceed the size of the bitmap we use to track possible IRQ settings. To avoid corrupting memory, complain and ignore too-large interrupt numbers. There's similar code in pnpacpi_parse_irq_option(), but I didn't change that because the small IRQ descriptor can only encode IRQs 0-15, which do not exceed bitmap size. In the future, we could handle IRQ numbers greater than PNP_IRQ_NR by replacing the bitmap with a table or list. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit c227536b4cc2600fc9d22ba0067f699165f6621f Author: Bjorn Helgaas Date: Fri Jun 27 16:57:11 2008 -0600 PNP: centralize resource option allocations This patch moves all the option allocations (pnp_mem, pnp_port, etc) into the pnp_register_{mem,port,irq,dma}_resource() functions. This will make it easier to rework the option data structures. The non-trivial part of this patch is the IRQ handling. The backends have to allocate a local pnp_irq_mask_t bitmap, populate it, and pass a pointer to pnp_register_irq_resource(). Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit b08395e5038e3337bb85c7246a635a3be6d5a29c Author: Bjorn Helgaas Date: Fri Jun 27 16:57:10 2008 -0600 PNP: remove redundant pnp_can_configure() check pnp_assign_resources() is static and the only caller checks pnp_can_configure() before calling it, so no need to do it again. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit 6e906f0e1c8633ed357a64e9861f1822789bee3d Author: Bjorn Helgaas Date: Fri Jun 27 16:57:09 2008 -0600 PNP: make resource assignment functions return 0 (success) or -EBUSY (failure) This patch doesn't change any behavior; it just makes the return values more conventional. This changes pnp_assign_dma() from a void function to one that returns an int, just like the other assignment functions. For now, at least, pnp_assign_dma() always returns 0 (success), so it appears to never fail, just like before. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit 819beac3806a5e986d81f476b999b7fffce1a233 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:08 2008 -0600 PNP: in debug resource dump, make empty list obvious If the resource list is empty, say that explicitly. Previously, it was confusing because often the heading was followed by zero resource lines, then some "add resource" lines from auto-assignment, so the "add" lines looked like current resources. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit fcfb7ce3d688d5c15fc9bc0a2a48e1ededdb046f Author: Bjorn Helgaas Date: Fri Jun 27 16:57:07 2008 -0600 PNP: improve resource assignment debug When we fail to assign an I/O or MEM resource, include the min/max in the debug output to help match it with the options. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit 169aaffe885c56745188e7913f212a67beaa3b80 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:06 2008 -0600 PNP: increase I/O port & memory option address sizes ACPI Address Space Descriptors can be up to 64 bits wide. We should keep track of the whole thing when parsing resource options, so this patch changes PNP port and mem option fields from "unsigned short" and "unsigned int" to "resource_size_t". Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit 7aefff51854ccd33599c40b4e360d94cb2b7622f Author: Bjorn Helgaas Date: Fri Jun 27 16:57:05 2008 -0600 PNP: introduce pnp_irq_mask_t typedef This adds a typedef for the IRQ bitmap, which should cause no functional change, but will make it easier to pass a pointer to a bitmap to pnp_register_irq_resource(). Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit a1802c42950403657d07e64558eff612d550ce16 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:04 2008 -0600 PNP: make resource option structures private to PNP subsystem Nothing outside the PNP subsystem should need access to a device's resource options, so this patch moves the option structure declarations to a private header file. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit 08c9f262f268f7948be13bf3a5bda1d635c649b4 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:03 2008 -0600 PNP: define PNP-specific IORESOURCE_IO_* flags alongside IRQ, DMA, MEM PNP previously defined PNP_PORT_FLAG_16BITADDR and PNP_PORT_FLAG_FIXED in a private header file, but put those flags in struct resource.flags fields. Better to make them IORESOURCE_IO_* flags like the existing IRQ, DMA, and MEM flags. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit b72ee1f11e373179ec703e0e5afaf585ed3a950a Author: Bjorn Helgaas Date: Fri Jun 27 16:57:02 2008 -0600 PNP: whitespace/coding style fixes No functional change; just make a couple declarations consistent with the rest of the file. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit 57fd51a8be26921b56747ddd09d1d9e01c11c9e0 Author: Bjorn Helgaas Date: Fri Jun 27 16:57:01 2008 -0600 PNP: add pnp_possible_config() -- can a device could be configured this way? As part of a heuristic to identify modem devices, 8250_pnp.c checks to see whether a device can be configured at any of the legacy COM port addresses. This patch moves the code that traverses the PNP "possible resource options" from 8250_pnp.c to the PNP subsystem. This encapsulation is important because a future patch will change the implementation of those resource options. Signed-off-by: Bjorn Helgaas Signed-off-by: Andi Kleen Acked-by: Rene Herman Signed-off-by: Len Brown commit f61ed7e32d2d6a0a8c3c101da513ccedd542e14d Author: Bjorn Helgaas Date: Fri Jun 27 16:57:00 2008 -0600 PNP: dont sort by type in /sys/.../resources Rather than stepping through all IO resources, then stepping through all MMIO resources, etc., we can just iterate over the resource list once directly. This can change the order in /sys, e.g., # cat /sys/devices/pnp0/00:07/resources # OLD state = active io 0x3f8-0x3ff irq 4 # cat /sys/devices/pnp0/00:07/resources # NEW state = active irq 4 io 0x3f8-0x3ff The old code artificially sorted resources by type; the new code just lists them in the order we read them from the ISAPNP hardware or the BIOS. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 25d39c39d82d062f4be685146abd054a3bafdf12 Author: Bjorn Helgaas Date: Fri Jun 27 16:56:59 2008 -0600 PNP: remove ratelimit on add resource failures We used to have a fixed-size resource table. If a device had twenty resources when the table only had space for ten, we didn't need ten warnings, so we added the ratelimit. Now that we can dynamically allocate new resources, we should only get failures if the allocation fails. That should be rare enough that we don't need to ratelimit the messages. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 5acf91415799025410cc0d13101340d352f34c89 Author: Bjorn Helgaas Date: Fri Jun 27 16:56:58 2008 -0600 PNPACPI: keep disabled resources when parsing current config When we parse a device's _CRS data (the current resource settings), we should keep track of everything we find, even if it's currently disabled or invalid. This is what we already do for ISAPNP and PNPBIOS, and it helps keep things matched up when we subsequently re-encode resources. For example, consider a device with (mem, irq0, irq1, io), where irq0 is disabled. If we drop irq0 when parsing the _CRS, we will mistakenly put irq1 in the irq0 slot when we encode resources for an _SRS call. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit aee3ad815dd291a7193ab01da0f1a30c84d00061 Author: Bjorn Helgaas Date: Fri Jun 27 16:56:57 2008 -0600 PNP: replace pnp_resource_table with dynamically allocated resources PNP used to have a fixed-size pnp_resource_table for tracking the resources used by a device. This table often overflowed, so we've had to increase the table size, which wastes memory because most devices have very few resources. This patch replaces the table with a linked list of resources where the entries are allocated on demand. This removes messages like these: pnpacpi: exceeded the max number of IO resources 00:01: too many I/O port resources References: http://bugzilla.kernel.org/show_bug.cgi?id=9535 http://bugzilla.kernel.org/show_bug.cgi?id=9740 http://lkml.org/lkml/2007/11/30/110 This patch also changes the way PNP uses the IORESOURCE_UNSET, IORESOURCE_AUTO, and IORESOURCE_DISABLED flags. Prior to this patch, the pnp_resource_table entries used the flags like this: IORESOURCE_UNSET This table entry is unused and available for use. When this flag is set, we shouldn't look at anything else in the resource structure. This flag is set when a resource table entry is initialized. IORESOURCE_AUTO This resource was assigned automatically by pnp_assign_{io,mem,etc}(). This flag is set when a resource table entry is initialized and cleared whenever we discover a resource setting by reading an ISAPNP config register, parsing a PNPBIOS resource data stream, parsing an ACPI _CRS list, or interpreting a sysfs "set" command. Resources marked IORESOURCE_AUTO are reinitialized and marked as IORESOURCE_UNSET by pnp_clean_resource_table() in these cases: - before we attempt to assign resources automatically, - if we fail to assign resources automatically, - after disabling a device IORESOURCE_DISABLED Set by pnp_assign_{io,mem,etc}() when automatic assignment fails. Also set by PNPBIOS and PNPACPI for: - invalid IRQs or GSI registration failures - invalid DMA channels - I/O ports above 0x10000 - mem ranges with negative length After this patch, there is no pnp_resource_table, and the resource list entries use the flags like this: IORESOURCE_UNSET This flag is no longer used in PNP. Instead of keeping IORESOURCE_UNSET entries in the resource list, we remove entries from the list and free them. IORESOURCE_AUTO No change in meaning: it still means the resource was assigned automatically by pnp_assign_{port,mem,etc}(), but these functions now set the bit explicitly. We still "clean" a device's resource list in the same places, but rather than reinitializing IORESOURCE_AUTO entries, we just remove them from the list. Note that IORESOURCE_AUTO entries are always at the end of the list, so removing them doesn't reorder other list entries. This is because non-IORESOURCE_AUTO entries are added by the ISAPNP, PNPBIOS, or PNPACPI "get resources" methods and by the sysfs "set" command. In each of these cases, we completely free the resource list first. IORESOURCE_DISABLED In addition to the cases where we used to set this flag, ISAPNP now adds an IORESOURCE_DISABLED resource when it reads a configuration register with a "disabled" value. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 20bfdbba7212d19613b93dcea93f26cb65af91fe Author: Bjorn Helgaas Date: Fri Jun 27 16:56:56 2008 -0600 PNP: make pnp_{port,mem,etc}_start(), et al work for invalid resources Some callers use pnp_port_start() and similar functions without making sure the resource is valid. This patch makes us fall back to returning the initial values if the resource is not valid or not even present. This mostly preserves the previous behavior, where we would just return the initial values set by pnp_init_resource_table(). The original 2.6.25 code didn't range-check the "bar", so it would return garbage if the bar exceeded the table size. This code returns sensible values instead. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 9fdee4e02e3b214cde8e4f3beb6776075a3d08a7 Author: Bjorn Helgaas Date: Fri Jun 27 16:56:55 2008 -0600 PNP: add pnp_resource_type_name() helper function This patch adds a "pnp_resource_type_name(struct resource *)" that returns the string resource type. This will be used by the sysfs "show resources" function and the debug resource dump function. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 940e98dbc616f1df7b63b73858a966969baf261d Author: Bjorn Helgaas Date: Fri Jun 27 16:56:54 2008 -0600 PNP: add pnp_resource_type() internal interface Given a struct resource, this returns the type (IO, MEM, IRQ, DMA). Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 87e4acf3ebc02c9d0a2f7a37b655c49176c4d765 Author: Bjorn Helgaas Date: Fri Jun 27 16:56:53 2008 -0600 PNP: remove pnp_resource.index We used pnp_resource.index to keep track of which ISAPNP configuration register a resource should be written to. We needed this only to handle the case where a register is disabled but a subsequent register in the same set is enabled. Rather than explicitly maintaining the pnp_resource.index, this patch adds a resource every time we read an ISAPNP configuration register and marks the resource as IORESOURCE_DISABLED when appropriate. This makes the position in the pnp_resource_table always correspond to the config register index. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit b897f46cf7941fff8130ccdaf85f39528bff6a51 Author: Bjorn Helgaas Date: Fri Jun 27 16:56:52 2008 -0600 PNP: add detail to debug resource dump In the debug resource dump, decode the flags and indicate when a resource is disabled or has been automatically assigned. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 469778c1740fcf3113498b6fdf4559bdec25c58f Author: Julia Jomantaite Date: Mon Jun 23 22:50:42 2008 +0100 ACPI: video: fix brightness allocation Fix use of uninitialized device->brightness. Signed-off-by: Julia Jomantaite Signed-off-by: Andi Kleen Acked-by: Zhang Rui Signed-off-by: Len Brown commit 8aa863b8ca0855378e3409b5e55ad57a856f6412 Author: Len Brown Date: Fri Jun 27 11:31:50 2008 -0400 ACPI: Andi Kleen maintains the ACPI sub-system ...while Len is on sabbatical from Intel Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 65573ee72e34e767a135a0841ac5380a2be1a390 Author: Len Brown Date: Fri Jun 27 11:22:46 2008 -0400 ACPI: Zhang Rui maintains ACPI THERMAL and FAN Reflect that Zhang-Rui has been the sub-maintainer for ACPI THERMAL and FAN for some time now. Also, the Chinese custom is to speak family name first, so rather than "Rui Zhang", write "Zhang Rui", as he does on e-mail. Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 2a2a64714d9c40f7705c4de1e79a5b855c7211a9 Author: Zhao Yakui Date: Tue Jun 24 18:02:57 2008 +0800 ACPI: Disable MWAIT via DMI on broken Compal board If a system matches in this DMI table, Linux will disable MWAIT support for idle. ie. "idle=nomwait" is automatically invoked and C1_FFH and C2C3_FFH access mode are disabled. http://bugzilla.kernel.org/show_bug.cgi?id=10807 http://bugzilla.kernel.org/show_bug.cgi?id=10914 Signed-off-by: Zhao Yakui Signed-off-by: Li Shaohua Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit da5e09a1b3e5a9fc0b15a3feb64e921ccc55ba74 Author: Zhao Yakui Date: Tue Jun 24 18:01:09 2008 +0800 ACPI : Create "idle=nomwait" bootparam "idle=nomwait" disables the use of the MWAIT instruction from both C1 (C1_FFH) and deeper (C2C3_FFH) C-states. When MWAIT is unavailable, the BIOS and OS generally negotiate to use the HALT instruction for C1, and use IO accesses for deeper C-states. This option is useful for power and performance comparisons, and also to work around BIOS bugs where broken MWAIT support is advertised. http://bugzilla.kernel.org/show_bug.cgi?id=10807 http://bugzilla.kernel.org/show_bug.cgi?id=10914 Signed-off-by: Zhao Yakui Signed-off-by: Li Shaohua Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit c1e3b377ad48febba6f91b8ae42c44ee4d4ab45e Author: Zhao Yakui Date: Tue Jun 24 17:58:53 2008 +0800 ACPI: Create "idle=halt" bootparam "idle=halt" limits the idle loop to using the halt instruction. No MWAIT, no IO accesses, no C-states deeper than C1. If something is broken in the idle code, "idle=halt" is a less severe workaround than "idle=poll" which disables all power savings. Signed-off-by: Zhao Yakui Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 5b53496a5ad79e91052f72761a7c5516b069bc99 Author: Zhao Yakui Date: Tue Jun 17 14:39:59 2008 +0800 ACPI: Disable the C2C3_FFH access mode HW has no MWAIT support 991528d7348667924176f3e29addea0675298944 (ACPI: Processor native C-states using MWAIT) started passing C2C3_FFH to _PDC to tell the BIOS that Linux supports MWAIT for deep C-states. However, we should first double check with the hardware that it actually supports MWAIT before potentially exposing a BIOS bug of an MWAIT _CST on HW that doesn't support MWAIT. Signed-off-by: Zhao Yakui Signed-off-by: Li Shaohua Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 71b58cbb0c30d1f78636a48c4721529449d6ea37 Author: Zhang Rui Date: Fri Jun 20 09:42:47 2008 +0800 ACPI: Enhance /sys/firmware/interrupts to allow enable/disable/clear from user-space Allow users to enable/disable/clear a specific & valid GPE/Fixed Event in user space. This is useful for debugging, especially for some interrupt storm issues. All wakeup GPEs are disabled and they can not be enabled at runtime, and we mark them as invalid. All GPEs that don't have a _Lxx/_Exx method are marked as invalid. All Fixed Events that don't have an event handler are marked as invalid and they can't be enabled until an event handler is registered. Signed-off-by: Zhang Rui Signed-off-by: Ling Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 9c9f6d052dc6f469431461a97d49cf9c5558b8ad Author: Bob Moore Date: Tue Jun 10 14:37:53 2008 +0800 ACPICA: Update version to 20080609 Update version to 20080609. Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit b53ce3f7186e2fc561f02085b5021df10d715ce2 Author: Bob Moore Date: Tue Jun 10 14:30:04 2008 +0800 ACPICA: Fix mutex debug code for wrong loop termination value Loop was terminating one iteration early, missing one of the debugger handshake mutexes. Linn Crosetto. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit fd0a43276dc986e186eb27e5755a18e97e07a7eb Author: Bob Moore Date: Tue Jun 10 14:27:55 2008 +0800 ACPICA: Cleanup of _PRT parsing code Removed extraneous else clauses, other general cleanup. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 71d993e115706a4108bdc7e3cb3cf25309f17aa6 Author: Bob Moore Date: Tue Jun 10 14:25:05 2008 +0800 ACPICA: Cleanup debug operand dump mechanism Eliminated unnecessary operands; eliminated use of negative index in loop. Operands now displayed in correct order, not backwards. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 5a1a57efeb152d6b8a3b2a20f6b192d074e919ec Author: Bob Moore Date: Tue Jun 10 14:21:05 2008 +0800 ACPICA: Fix for invalid large array index on 64-bit systems This problem was introduced in 20080514 as a result of the elimination of the acpi_native_uint type. Code uses a negative array index, which should be eliminated. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 75e5b5fb778646a93d98adb1ca697435362d2856 Author: Bob Moore Date: Tue Jun 10 14:19:32 2008 +0800 ACPICA: Update disassembler for DMAR table changes Now supports the 2007 intel Virtualization Technology for Directed I/O specification. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 19d0cfe9ddfdf7afa8d1765ab0bd2a7dd30e47c9 Author: Bob Moore Date: Tue Jun 10 15:54:40 2008 +0800 ACPICA: Update DMAR and SRAT table definitions Synchronized tables with current specifications. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit d0e184abc5983281ef189db2c759d65d56eb1b80 Author: Bob Moore Date: Tue Jun 10 14:16:47 2008 +0800 ACPICA: Workaround for reversed _PRT entries from BIOS Some BIOSs erroneously reverse the _PRT SourceName and the SourceIndex. Detect and repair this problem. MS ACPI also allows and repairs this problem, thus ACPICA must also. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit b25d2a470bc9ffef4c34248952d914bd6fc0fcf6 Author: Bob Moore Date: Tue Jun 10 14:15:05 2008 +0800 ACPICA: Update version to 20080514 Update version to 20080514 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 4b8ed631679070c183c8ae7519d2bdb9df124ae4 Author: Bob Moore Date: Tue Jun 10 13:55:53 2008 +0800 ACPICA: Add const qualifier for appropriate string constants Mostly MODULE_NAME and printf format strings. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit b52437641edf63cee2f2f73a189154989b4a7ff4 Author: Bob Moore Date: Tue Jun 10 13:44:48 2008 +0800 ACPICA: Several lint changes, no functional changes Remove pointer cast warnings and fix for a debug printf. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit d97b4358da9bdaee5789c85415d770e36aebca52 Author: Bob Moore Date: Tue Jun 10 13:43:34 2008 +0800 ACPICA: Removed unused include files from source files From lint. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 67a119f990063f5662574f6d6414fe9bc5ece86a Author: Bob Moore Date: Tue Jun 10 13:42:13 2008 +0800 ACPICA: Eliminate acpi_native_uint type v2 No longer needed; replaced mostly with u32, but also acpi_size where a type that changes 32/64 bit on 32/64-bit platforms is required. v2: Fix a cast of a 32-bit int to a pointer in ACPI to avoid a compiler warning. from David Howells Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 11f2a61ab418305167f9a3f3a31a50449222f64b Author: Bob Moore Date: Tue Jun 10 12:53:01 2008 +0800 ACPICA: Fix possible negative array index in acpi_ut_validate_exception Added NULL fields to the exception string arrays to eliminate the -1 subtraction on the SubStatus field. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 6719561f9b4281491f58ed9f0bbc179dc7db95b7 Author: Jan Beulich Date: Tue Jun 10 12:49:56 2008 +0800 ACPICA: Update tracking macros to reduce code/data size Changed ACPI_MODULE_NAME and ACPI_FUNCTION_NAME to use arrays of strings instead of pointers to static strings. Jan Beulich and Bob Moore. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit c91d924e3af08d4f98eab6ebf81f2b8ce132448f Author: Bob Moore Date: Tue Jun 10 12:38:10 2008 +0800 ACPICA: Fix for hang on GPE method invocation Fixes problem where the new method argument count validation mechanism will enter an infinite loop when a GPE method is dispatched. Problem fixed be removing the obsolete code that passes GPE block information to the notify handler via the control method parameter pointer. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit f3454ae8104efb2dbf0d08ec42c6f5d0fe9225bc Author: Bob Moore Date: Tue Jun 10 12:25:42 2008 +0800 ACPICA: Add argument count checking to control method invocation via acpi_evaluate_object Error if too few arguments, warning if too many. This applies only to external programmatic control method execution, not method-to-method calls within the AML. Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit c735ab7da3414c3e639d5c5223092b74689e5d87 Author: Randy Dunlap Date: Thu Jun 26 22:27:21 2008 -0400 fujitsu-laptop: depends on INPUT fujitsu-laptop uses input_* functions, so it should depend on INPUT. drivers/built-in.o: In function `acpi_fujitsu_add': fujitsu-laptop.c:(.text+0xaaec7): undefined reference to `input_allocate_device' fujitsu-laptop.c:(.text+0xaaf39): undefined reference to `input_register_device' fujitsu-laptop.c:(.text+0xab025): undefined reference to `input_free_device' drivers/built-in.o: In function `acpi_fujitsu_notify': fujitsu-laptop.c:(.text+0xab0d8): undefined reference to `input_event' fujitsu-laptop.c:(.text+0xab0e5): undefined reference to `input_event' fujitsu-laptop.c:(.text+0xab0f5): undefined reference to `input_event' fujitsu-laptop.c:(.text+0xab102): undefined reference to `input_event' drivers/built-in.o: In function `acpi_fujitsu_hotkey_notify': fujitsu-laptop.c:(.text+0xab261): undefined reference to `input_event' drivers/built-in.o:fujitsu-laptop.c:(.text+0xab26e): more undefined references to `input_event' follow drivers/built-in.o: In function `acpi_fujitsu_hotkey_add': fujitsu-laptop.c:(.text+0xab49c): undefined reference to `input_allocate_device' fujitsu-laptop.c:(.text+0xab51a): undefined reference to `input_register_device' fujitsu-laptop.c:(.text+0xab5e4): undefined reference to `input_free_device' make[1]: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Randy Dunlap Signed-off-by: Andi Kleen Acked-by: Jonathan Woithe Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 25f2f3daadaf0768a61d02ee3ed3d9a21e9dc46c Author: Rafael J. Wysocki Date: Wed Jun 11 22:09:45 2008 +0200 snapshot: Use pm_mutex for mutual exclusion We can avoid taking the BKL in snapshot_ioctl() if pm_mutex is used to prevent the ioctls from being executed concurrently. In addition, although it is only possible to open /dev/snapshot once, the task which has done that may spawn a child that will inherit the open descriptor, so in theory they can call snapshot_write(), snapshot_read() and snapshot_release() concurrently. pm_mutex can also be used for mutual exclusion in such cases. Signed-off-by: Rafael J. Wysocki Signed-off-by: Andi Kleen Acked-by: Pavel Machek Signed-off-by: Len Brown commit 52d11025dba32bed696eaee1822b26529e764770 Author: Alan Cox Date: Wed Jun 11 22:07:52 2008 +0200 snapshot: Push BKL down into ioctl handlers Push BKL down into ioctl handlers - snapshot device. Signed-off-by: Alan Cox Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit ebb12db51f6c13b30752fcf506baad4c617b153c Author: Rafael J. Wysocki Date: Wed Jun 11 22:04:29 2008 +0200 Freezer: Introduce PF_FREEZER_NOSIG The freezer currently attempts to distinguish kernel threads from user space tasks by checking if their mm pointer is unset and it does not send fake signals to kernel threads. However, there are kernel threads, mostly related to networking, that behave like user space tasks and may want to be sent a fake signal to be frozen. Introduce the new process flag PF_FREEZER_NOSIG that will be set by default for all kernel threads and make the freezer only send fake signals to the tasks having PF_FREEZER_NOSIG unset. Provide the set_freezable_with_signal() function to be called by the kernel threads that want to be sent a fake signal for freezing. This patch should not change the freezer's observable behavior. Signed-off-by: Rafael J. Wysocki Signed-off-by: Andi Kleen Acked-by: Pavel Machek Signed-off-by: Len Brown commit d20a4dca47d2cd027ed58a13f91b424affd1f449 Author: Johannes Berg Date: Wed Jun 11 22:03:10 2008 +0200 APM emulation: Notify about all suspend events, not just APM invoked ones (v2) This revamps the apm-emulation code to get suspend notifications regardless of what way pm_suspend() was invoked, whether via the apm ioctl or via /sys/power/state. Also do some code cleanup and add comments while at it. Signed-off-by: Johannes Berg Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 741438b5008791327d2183cebcd7ac9cfad64ec6 Author: Rafael J. Wysocki Date: Thu Jun 5 01:17:28 2008 +0200 ACPI PM: Remove obsolete Toshiba workaround Remove the obsolete workaround for a Toshiba Satellite 4030cdt S1 problem from drivers/acpi/sleep/main.c . Signed-off-by: Rafael J. Wysocki Signed-off-by: Andi Kleen Acked-by: Pavel Machek Signed-off-by: Len Brown commit a80a6da145bab8ee77af304961fc926de7a8ac84 Author: Rafael J. Wysocki Date: Thu Jun 5 01:16:37 2008 +0200 PCI ACPI: Drop the second argument of platform_pci_choose_state Since the second argument of acpi_pci_choose_state() and platform_pci_choose_state() is never used, remove it. Signed-off-by: Rafael J. Wysocki Signed-off-by: Andi Kleen Acked-by: Pavel Machek Signed-off-by: Len Brown commit 2fe2de5f6c283a7d2a82c1b99a19012079cee555 Author: David Brownell Date: Thu Jun 5 01:15:40 2008 +0200 ACPI PM: acpi_pm_device_sleep_state() cleanup Get rid of a superfluous acpi_pm_device_sleep_state() parameter. The only legitimate value of that parameter must be derived from the first parameter, which is what all the callers already do. (However, this does not address the fact that ACPI still doesn't set up those flags.) Signed-off-by: David Brownell Signed-off-by: Andi Kleen Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca Author: Len Brown Date: Tue Jun 24 22:57:12 2008 -0400 dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled. Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit d1857056904d5f313f11184fcfa624652ff9620a Author: Vegard Nossum Date: Fri Jun 20 15:39:09 2008 +0200 ACPI: don't walk tables if ACPI was disabled Ingo Molnar wrote: > -tip auto-testing started triggering this spinlock corruption message > yesterday: > > [ 3.976213] calling acpi_rtc_init+0x0/0xd3 > [ 3.980213] ACPI Exception (utmutex-0263): AE_BAD_PARAMETER, Thread F7C50000 could not acquire Mutex [3] [20080321] > [ 3.992213] BUG: spinlock bad magic on CPU#0, swapper/1 > [ 3.992213] lock: c2508dc4, .magic: 00000000, .owner: swapper/1, .owner_cpu: 0 This is apparently because some parts of ACPI, including mutexes, are not initialized when acpi=off is passed to the kernel. Reported-by: Ingo Molnar Signed-off-by: Vegard Nossum Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 860f0c6b3dcaa455894f690647442dc97cab19c8 Author: Carlos Corbacho Date: Sat Jun 21 09:09:58 2008 +0100 acer-wmi: Remove version number It doesn't make much sense these days. Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 81143522aa823036c4aa35bdd3b2e41966cf6e15 Author: Carlos Corbacho Date: Sat Jun 21 09:09:53 2008 +0100 acer-wmi: Add debugfs file for device detection Add a debugfs file for showing the full results of the method we use to detect devices on WMID laptops. This should be useful in the case that a Linux user gets an Acer laptop with 3G support (and/ or people who enjoy ripping their wireless cards out) so we can get some feedback on how this value changes in these cases. (At the moment, we always enable the wireless and 3G control. In the case of the former, this is fairly safe. In the case of the latter though, trying to toggle this device if it doesn't exist on a laptop causes ACPI warnings/ errors). To summarise: If you have an Acer laptop with a built in 3G card, please report back the value from this file. Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 5753dd539a86d8fc40a25e1a2cd1005a6525f083 Author: Carlos Corbacho Date: Sat Jun 21 09:09:48 2008 +0100 acer-wmi: Disable device autodetection on Fujitsu Siemens Amilo Li2732 The AMW0 (V1) device detection method doesn't work properly on this laptop, so disable it, and for other laptops that may have this problem, by switching on a strange GUID. Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 6f061ab5e55d7fe6ce0c36e8954f56f0d95348fb Author: Carlos Corbacho Date: Sat Jun 21 09:09:38 2008 +0100 acer-wmi: Add EC quirk for Fujitsu Siemens Amilo Li 1718 This laptop needs a different EC quirk from the standard Acer one to read the wireless status. Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit f2b585b4a31731b17b9769eae523986fa7fddcde Author: Carlos Corbacho Date: Sat Jun 21 09:09:27 2008 +0100 acer-wmi: Respect framebuffer blanking in backlight If the framebuffer has requested blanking, turn the backlight down. Also offer the user the option to do this. Reported-by: Michal Pecio Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 9991d9f2bc75dc8735932240b67432d4073b8f60 Author: Carlos Corbacho Date: Sat Jun 21 09:09:22 2008 +0100 acer-wmi: Blacklist backlight on Acer Aspire 1520 & 1360 series A newer BIOS for these laptops adds ACPI-WMI support to them. However, it does not add support for the backlight via the EC, and we have no way to detect this on older machines, so blacklist it from them. Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit a0bbaf83311cd995136c9047f174d79c1075ee2d Author: Carlos Corbacho Date: Sat Jun 21 09:09:08 2008 +0100 acer-wmi: Remove LED colour comment from documentation This should have been removed when the colour was removed from the LED device name. Signed-off-by: Carlos Corbacho Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 141094612d2606395a7b9e8658d10ef5c487cf97 Author: Adrian Bunk Date: Wed Jun 25 19:25:47 2008 +0300 eeepc-laptop: static make the needlessly global cm_{g,s}etv[] static. Signed-off-by: Adrian Bunk Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 47c00d2bc2ef2cf8a608688144fe2093a2aa9507 Author: Vegard Nossum Date: Fri Jun 20 13:56:56 2008 +0200 ACPICA: fix mutex names in debug code. Reorder the mutex names to match the preceding #defines Signed-off-by: Vegard Nossum Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit e38e8a0743b0e996a8a3fbea8908fe75a84f02c7 Author: Bob Moore Date: Fri Jun 13 08:28:55 2008 +0800 Make GPE disable more robust Implemented another change for the GPE disable. We now perform a read-change-write of the enable register instead of simply writing out the cached enable mask. This will prevent inadvertent enabling of GPEs if a rogue GPE is received during initialization (before GPE handlers are installed.) http://bugzilla.kernel.org/show_bug.cgi?id=6217 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 87dc5e3218ba3d7a9293f9113f58455747a233ac Author: Cezary Jackiewicz Date: Thu Jun 12 22:08:59 2008 +0200 compal-laptop: remove unnecessary lcd_level attribute Signed-off-by: Cezary Jackiewicz Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 12b2b34e240a24bdbb2fdacf26a54b24ebf1ed81 Author: Randy Dunlap Date: Tue Jun 17 09:43:41 2008 -0700 acpi: fix printk format warning Fix printk format warning: linux-next-20080617/drivers/acpi/processor_throttling.c:1258: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 3d532d5e3882c1387a2722df2a368c4a9224b12f Author: Yi Yang Date: Sat Jun 14 00:54:37 2008 -0400 ACPI: fix processor throttling set error http://bugzilla.kernel.org/show_bug.cgi?id=9704 When echo some invalid values to /proc/acpi/processor/*/throttling, there isn't any error info returned, on the contray, it sets throttling value to some T* successfully, obviously, this is incorrect, a correct way should be to let it fail and return error info. This patch fixed the aforementioned issue, it also enables /proc/acpi/processor/*/throttling to accept such values as 't0' and 'T0', it also strictly limits /proc/acpi/processor/*/throttling only to accept "*", "t*" and "T*", "*" is the throttling state value the processor can support, current, it is 0 - 7. Before applying this patch, the test result is below: [root@localhost acpi]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T1 state available: T0 to T7 states: T0: 100% *T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost acpi]# echo "1xxxxxx" > /proc/acpi/processor/CPU0/throttling [root@localhost acpi]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T1 state available: T0 to T7 states: T0: 100% *T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost acpi]# echo "0" > /proc/acpi/processor/CPU0/throttling [root@localhost acpi]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T0 state available: T0 to T7 states: *T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost acpi]# cd / [root@localhost /]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T0 state available: T0 to T7 states: *T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost /]# echo "T0" > /proc/acpi/processor/CPU0/throttling [root@localhost /]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T0 state available: T0 to T7 states: *T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost /]# echo "T7" > /proc/acpi/processor/CPU0/throttling [root@localhost /]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T0 state available: T0 to T7 states: *T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost /]# echo "T100" > /proc/acpi/processor/CPU0/throttling [root@localhost /]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T0 state available: T0 to T7 states: *T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost /]# echo "xxx" > /proc/acpi/processor/CPU0/throttling [root@localhost /]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T0 state available: T0 to T7 states: *T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost /]# echo "2xxxx" > /proc/acpi/processor/CPU0/throttling [root@localhost /]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T2 state available: T0 to T7 states: T0: 100% T1: 87% *T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost /]# echo "" > /proc/acpi/processor/CPU0/throttling [root@localhost /]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T0 state available: T0 to T7 states: *T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost /]# echo "7777" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost /]# echo "7xxx" > /proc/acpi/processor/CPU0/throttling [root@localhost /]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T7 state available: T0 to T7 states: T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% *T7: 12% [root@localhost /]# After applying this patch, the test result is below: [root@localhost linux-2.6.24-rc6]# echo > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo "" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo "0" > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# echo "t0" > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# echo "T0" > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T0 state available: T0 to T7 states: *T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% T7: 12% [root@localhost linux-2.6.24-rc6]# echo "T7" > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T7 state available: T0 to T7 states: T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% *T7: 12% [root@localhost linux-2.6.24-rc6]# echo "T8" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# vi drivers/acpi/processor_throttling.c [root@localhost linux-2.6.24-rc6]# echo "T8" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo "t7" > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# echo "t70" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo "70" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo "7000" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo "70" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo "xxx" > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo -n > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# echo -n "" > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# echo $? 0 [root@localhost linux-2.6.24-rc6]# echo -n "" > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T7 state available: T0 to T7 states: T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% *T7: 12% [root@localhost linux-2.6.24-rc6]# echo -n "" > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# cat /proc/acpi/processor/CPU0/throttling state count: 8 active state: T7 state available: T0 to T7 states: T0: 100% T1: 87% T2: 75% T3: 62% T4: 50% T5: 37% T6: 25% *T7: 12% [root@localhost linux-2.6.24-rc6]# echo t0 > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# echo T0 > /proc/acpi/processor/CPU0/throttling [root@localhost linux-2.6.24-rc6]# echo Tt0 > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# echo T > /proc/acpi/processor/CPU0/throttling -bash: echo: write error: Invalid argument [root@localhost linux-2.6.24-rc6]# Signed-off-by: Yi Yang Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 6594d87ebd8371f4b67f7ab4b68f172b139b78d6 Author: Yi Yang Date: Sat Jun 14 00:52:06 2008 -0400 ACPI: fix acpi fan state set error Under /proc/acpi, there is a fan control interface, a user can set 0 or 3 to /proc/acpi/fan/*/state, 0 denotes D0 state, 3 denotes D3 state, but in current implementation, a user can set a fan to D1 state by any char excluding '1', '2' and '3'. For example: [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: off [root@localhost acpi]# echo "" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: on [root@localhost acpi]# echo "3" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: off [root@localhost acpi]# echo "xxxxx" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: on Obviously, such inputs as "" and "xxxxx" are invalid for fan state. This patch fixes this issue, it strictly limits fan state only to accept 0, 1, 2 and 3, any other inputs are invalid. Before applying this patch, the test result is: [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: off [root@localhost acpi]# echo "" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: on [root@localhost acpi]# echo "3" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: off [root@localhost acpi]# echo "xxxxx" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: on [root@localhost acpi]# echo "3" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: off [root@localhost acpi]# echo "3x" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: off [root@localhost acpi]# echo "-1x" > /proc/acpi/fan/C31B/state [root@localhost acpi]# cat /proc/acpi/fan/C31B/state status: on [root@localhost acpi]# After applying this patch, the test result is: [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: off [root@localhost ~]# echo "" > /proc/acpi/fan/C31B/state -bash: echo: write error: Invalid argument [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: off [root@localhost ~]# echo "3" > /proc/acpi/fan/C31B/state [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: off [root@localhost ~]# echo "xxxxx" > /proc/acpi/fan/C31B/state -bash: echo: write error: Invalid argument [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: off [root@localhost ~]# echo "-1x" > /proc/acpi/fan/C31B/state -bash: echo: write error: Invalid argument [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: off [root@localhost ~]# echo "0" > //proc/acpi/fan/C31B/state [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: on [root@localhost ~]# echo "4" > //proc/acpi/fan/C31B/state -bash: echo: write error: Invalid argument [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: on [root@localhost ~]# echo "3" > //proc/acpi/fan/C31B/state [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: off [root@localhost ~]# echo "0" > //proc/acpi/fan/C31B/state [root@localhost ~]# cat /proc/acpi/fan/C31B/state status: on [root@localhost ~]# echo "3x" > //proc/acpi/fan/C31B/state -bash: echo: write error: Invalid argument [root@localhost ~]# Signed-off-by: Yi Yang Signed-off-by: Andi Kleen Acked-by: Zhang Rui Signed-off-by: Len Brown commit 74523c901342a773ddd9f14c14539ec3d4197ecf Author: Alok N Kataria Date: Fri Jun 13 12:54:24 2008 -0400 ACPI: fix checkpatch.pl complaints in scan.c http://bugzilla.kernel.org/show_bug.cgi?id=9772 Signed-off-by: Alok N Kataria Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 20b937343e55c16e37b1a4ad2176760b4a11002c Author: Jonathan Woithe Date: Wed Jun 11 10:14:56 2008 +0930 Fujitsu-laptop update Add additional capabilities to the Fujitsu-laptop driver. * Brightness hotkey actions are sent to userspace. This can be disabled using a module parameter if it causes issues with models which handle these keys transparently in the BIOS. * Actions of additional hotkeys found on some Fujitsu models (eg: the suspend key and the dedicated "power on passphrase" keys) are broadcast to userspace. * An alternative brightness control method used by some Fujitsu models (for example, the S6410) is now supported, enabling software brightness controls on models using this method. * DMI-based module aliases are configured for the S6410 and S7020. * The current LCD brightness after booting should now be reflected in the standard backlight interface sysfs file (previously it was always set to 0). The platform brightness sysfs interface has always been fine. Thanks go to Peter Gruber who provided a significant portion of this code and tested various iterations of the patch on his S6410. Signed-off-by: Peter Gruber Signed-off-by: Jonathan Woithe Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 706546d02384b64e083bd9130c56eaa599c66038 Author: Mike Travis Date: Mon Jun 9 16:22:23 2008 -0700 ACPI: change processors from array to per_cpu variable Change processors from an array sized by NR_CPUS to a per_cpu variable. Signed-off-by: Mike Travis Signed-off-by: Andrew Morton Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 5411552c707f4b7387ad63141ef3a559e7488091 Author: Cezary Jackiewicz Date: Mon Jun 9 16:22:22 2008 -0700 misc,acpi,backlight: compal Laptop Extras This is driver for Compal Laptop: FL90/IFL90, based on MSI driver. This driver exports a few files in /sys/devices/platform/compal-laptop/: lcd_level - screen brightness: contains a single integer in the range 0..7 (rw) wlan - wlan subsystem state: contains 0 or 1 (rw) bluetooth - bluetooth subsystem state: contains 0 or 1 (rw) raw - raw value taken from embedded controller register (ro) In addition to these platform device attributes the driver registers itself in the Linux backlight control subsystem and is available to userspace under /sys/class/backlight/compal-laptop/. Signed-off-by: Cezary Jackiewicz Signed-off-by: Andi Kleen Cc: Richard Purdie Cc: Henrique de Moraes Holschuh Cc: Len Brown Cc: Alexey Starikovskiy Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 9f1eb99c757939b0b1783f926130993e9c298bae Author: Zhang Rui Date: Tue Apr 29 02:36:07 2008 -0400 create sysfs link from acpi device to sysdev for cpu Sys I/F under acpi device node and sysdev device node are both needed for cpu hot-removal. User space need this link so that they know they are poking the sys I/F for the same cpu. http://bugzilla.kernel.org/show_bug.cgi?id=9772 Signed-off-by: Zhang Rui Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit b62b8ef906cdf7115af579ce7378886ce3e0ce00 Author: Zhang Rui Date: Tue Apr 29 02:35:56 2008 -0400 force offline the processor during hot-removal The ACPI device node for the cpu has already been unregistered when acpi_processor_handle_eject is called. Thus we should offline the cpu and continue, rather than a failure here. http://bugzilla.kernel.org/show_bug.cgi?id=9772 Signed-off-by: Zhang Rui Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit 26d46867b7d27f68a446b073dac7817721ae4c8f Author: Zhang Rui Date: Tue Apr 29 02:35:48 2008 -0400 fix a deadlock issue when poking "eject" file "/sys/devices/LNXSYSTM:00/.../eject" is used to evaluate _EJx method and eject a device in user space. But system hangs when poking the "eject" file because that the device hot-removal code invoke the driver .remove method which will try to remove the "eject" file as a result. Queues the hot-removal function for deferred execution in this patch. http://bugzilla.kernel.org/show_bug.cgi?id=9772 Signed-off-by: Zhang Rui Signed-off-by: Len Brown Signed-off-by: Andi Kleen commit a3cf859321486f69506326146ab3e2fd15c05c3f Merge: 3c3622d... 33468e7... Author: Linus Torvalds Date: Wed Jul 16 11:47:35 2008 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (44 commits) hwmon: (w83l786ng) Convert to a new-style i2c driver hwmon: (w83l785ts) Convert to a new-style i2c driver hwmon: (w83793) Convert to a new-style i2c driver hwmon: (w83792d) Convert to a new-style i2c driver hwmon: (w83791d) Convert to a new-style i2c driver hwmon: (thmc50) Convert to a new-style i2c driver hwmon: (smsc47m192) Convert to a new-style i2c driver hwmon: (max6650) Convert to a new-style i2c driver hwmon: (max1619) Convert to a new-style i2c driver hwmon: (lm93) Convert to a new-style i2c driver hwmon: (lm92) Convert to a new-style i2c driver hwmon: (lm90) Convert to a new-style i2c driver hwmon: (lm87) Convert to a new-style i2c driver hwmon: (lm83) Convert to a new-style i2c driver hwmon: (lm80) Convert to a new-style i2c driver hwmon: (lm77) Convert to a new-style i2c driver hwmon: (lm63) Convert to a new-style i2c driver hwmon: (gl520sm) Convert to a new-style i2c driver hwmon: (gl518sm) Convert to a new-style i2c driver hwmon: (fscpos) Convert to a new-style i2c driver ... commit 3c3622dcb64c76c9abd2e468f802db9ba523421c Author: Randy Dunlap Date: Wed Jul 16 08:52:00 2008 -0500 Fix compile issues in fs/compat_ioctl.c when CONFIG_BLOCK is disabled Fix fs/compat_ioctl.c to handle CONFIG_BLOCK=n, CONFIG_SCSI=n to avoid build errors: In file included from include/scsi/scsi.h:12, from fs/compat_ioctl.c:71: include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defined include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB In file included from include/scsi/scsi.h:12, from fs/compat_ioctl.c:71: include/scsi/scsi_cmnd.h: In function 'scsi_bidi_cmnd': include/scsi/scsi_cmnd.h:182: error: implicit declaration of function 'blk_bidi_rq' include/scsi/scsi_cmnd.h:183: error: dereferencing pointer to incomplete type include/scsi/scsi_cmnd.h: In function 'scsi_in': include/scsi/scsi_cmnd.h:189: error: dereferencing pointer to incomplete type Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit e3621ee633810be1079d0fa65ac2c904f53b73fa Author: Kumar Gala Date: Wed Jul 16 08:39:12 2008 -0500 powerpc/ep8248e: Fix compile problem if !CONFIG_FS_ENET If we don't enable FS_ENET we get build issues: arch/powerpc/platforms/built-in.o: In function `ep8248e_mdio_probe': arch/powerpc/platforms/82xx/ep8248e.c:129: undefined reference to `alloc_mdio_bitbang' arch/powerpc/platforms/82xx/ep8248e.c:143: undefined reference to `mdiobus_register' Signed-off-by: Kumar Gala Signed-off-by: Linus Torvalds commit bef5b54bd7bf8117c75cb943d64549134c6d9a1f Author: Ralf Baechle Date: Wed Jul 16 13:02:24 2008 +0100 Fix MIPS cross-compile problem Crosscompiling on a Fedora 9 machine running gcc 4.3.0 as its host compiler and gcc 3.4.6 for the mips-linux target results in the following build error: $ make malta_defconfig $ make cc1: error: unrecognized command line option "-fno-stack-protector" scripts/kconfig/conf -s arch/mips/Kconfig cc1: error: unrecognized command line option "-fno-stack-protector" The arch Makefile is included too late so the host compiler is feature tested, not the crosscompiler as intended and thus the Makefile applies adds -fno-stack-protector to crosscompiler's flags which fails for gcc 3.4.6. The bug was introduced by e06b8b98da071f7dd78fb7822991694288047df0 in 2.6.25; 35bb5b1e0e84cfa1a8906f7e6a77f391ff315791 did add more flags testing before the arch Makefile inclusion. Signed-off-by: Ralf Baechle Signed-off-by: Linus Torvalds commit 64a8f00ff19508b3962c8a932375dbae88bee4d6 Author: Elias Oltmanns Date: Wed Jul 16 20:33:48 2008 +0200 IDE: Report errors during drive reset back to user space Make sure that each error condition during the execution of an HDIO_DRIVE_RESET ioctl is actually reported to the calling process. Also, unify the exit path of reset_pollfunc() when returning ide_stopped since the need of ->port_ops->reset_poll() to be treated specially has vanished (way back, it seems). Signed-off-by: Elias Oltmanns Cc: "Alan Cox" Cc: "Randy Dunlap" Signed-off-by: Bartlomiej Zolnierkiewicz commit bb7ee9b1ec15358af870a81b0c6a03af29417f99 Author: Elias Oltmanns Date: Wed Jul 16 20:33:48 2008 +0200 Update documentation of HDIO_DRIVE_RESET ioctl Alter the entry for HDIO_DRIVE_RESET in Documentation/ioctl/hdio.txt to reflect a functional change in the driver. Besides, the entry has been inaccurate before. Signed-off-by: Elias Oltmanns Cc: "Alan Cox" Cc: "Randy Dunlap" Signed-off-by: Bartlomiej Zolnierkiewicz commit 3ef5eb424ebf0cd981192a416358fd707a9f959b Author: Elias Oltmanns Date: Wed Jul 16 20:33:48 2008 +0200 IDE: Remove unused code Remove some code which has been made obsolete and hasn't worked properly before anyway. Part of the infrastructure may be reintroduced in a follow up patch to implement a working command aborting facility. Signed-off-by: Elias Oltmanns Cc: "Alan Cox" Cc: "Randy Dunlap" Signed-off-by: Bartlomiej Zolnierkiewicz commit 79e36a9f54aaf4a52eb2d9520953aa3960e99294 Author: Elias Oltmanns Date: Wed Jul 16 20:33:48 2008 +0200 IDE: Fix HDIO_DRIVE_RESET handling Currently, the code path executing an HDIO_DRIVE_RESET ioctl is broken in various ways. Most importantly, it is treated as an out of band request in an illegal way which may very likely lead to system lock ups. Use the drive's request queue to avoid this problem (and fix a locking issue for free along the way). Signed-off-by: Elias Oltmanns Cc: "Alan Cox" Cc: "Randy Dunlap" Signed-off-by: Bartlomiej Zolnierkiewicz commit 72a3d651b2fe341a8ae2ca164c395aa3007350cd Author: Adrian Bunk Date: Wed Jul 16 20:33:48 2008 +0200 hd.c: remove the #include The code that needed this #include was removed one year ago. Signed-off-by: Adrian Bunk Cc: rmk@arm.linux.org.uk Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit f327c1c33f4882c70f29ff3a9ff7c55c1951d1f6 Author: Adrian Bunk Date: Wed Jul 16 20:33:47 2008 +0200 update the BLK_DEV_HD help text Many people will see this option the first time now that it is in drivers/block/ Make it clear that virtually noone needs it. Signed-off-by: Adrian Bunk Cc: rmk@arm.linux.org.uk Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 453ea3ed0b3e8ad67d4ee9d2fccf3d95a3e1f709 Author: Adrian Bunk Date: Wed Jul 16 20:33:47 2008 +0200 move ide/legacy/hd.c to drivers/block/ This patch moves hd.c to drivers/block/ Signed-off-by: Adrian Bunk Cc: rmk@arm.linux.org.uk Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 01c22bfc30a3f40fed08cfd2779348edcb6c5e53 Author: Adrian Bunk Date: Wed Jul 16 20:33:47 2008 +0200 ide/legacy/hd.c: use late_initcall() Since the later move to drivers/block/ will break the link order, the module_init() has to become a late_initcall(). Signed-off-by: Adrian Bunk Cc: rmk@arm.linux.org.uk Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit ffa793f9bb5b563edb4cacc43a4d6677eec0e36b Author: Adrian Bunk Date: Wed Jul 16 20:33:47 2008 +0200 remove BLK_DEV_HD_ONLY After commit 80aa31cb460d12c1e02327b43eceb3eebc6e7090 (ide: remove CONFIG_BLK_DEV_HD_IDE config option (take 2)) the indirection through BLK_DEV_HD_ONLY is no longer required. Signed-off-by: Adrian Bunk Cc: rmk@arm.linux.org.uk Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 85ae98a3dff2da860a4f8f9e4a0de69ad82ce633 Author: Harvey Harrison Date: Wed Jul 16 20:33:47 2008 +0200 ide: endian annotations in ide-floppy.c Signed-off-by: Harvey Harrison Cc: Al Viro Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 68dc3575e064a5655cbd656fbf32d6ceeb85ac9e Author: Borislav Petkov Date: Wed Jul 16 20:33:47 2008 +0200 ide-floppy: zero out the whole struct ide_atapi_pc on init This is a precaution just to make sure a new pc is clean when allocated. There should be no functional change introduced by this patch. [bart: ported it over IDE changes] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit c96a7df8dba5800c03b0f1edd87b2f3d0473a119 Author: Borislav Petkov Date: Wed Jul 16 20:33:46 2008 +0200 ide-floppy: fold idefloppy_create_test_unit_ready_cmd into idefloppy_open There's no need for this function since it is used only once. [bart: ported it over IDE changes] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 7fcebda501681080a242733b8db3f09f5ccb5d3f Author: Borislav Petkov Date: Wed Jul 16 20:33:46 2008 +0200 ide-cd: move request prep chunk from cdrom_do_newpc_cont to rq issue path As a nice side effect, this minimizes the IRQ handler execution time. There should be no functionality change resulting from this patch. [bart: remove extra newlines from ide_cd_do_request()] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 90eb808e0fd3cbda8a8b085238930c533f603642 Author: Borislav Petkov Date: Wed Jul 16 20:33:46 2008 +0200 ide-cd: move request prep from cdrom_start_rw_cont to rq issue path ... by factoring out the rq preparation code into a separate function called in the request routine. As a nice side effect, this minimizes the IRQ handler execution time. There should be no functionality change resulting from this patch. [bart: s/HWGROUP()/drive->hwif->hwgroup/ and remove extra newline] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit e529c6087a845e64a6a36a2d17b8754b20bc7c0d Author: Borislav Petkov Date: Wed Jul 16 20:33:46 2008 +0200 ide-cd: move request prep from cdrom_start_seek_continuation to rq issue path ... by factoring out the rq preparation code into a separate function called in the request routine. As a nice side effect, this minimizes the IRQ handler execution time. There should be no functionality change resulting from this patch. [bart: s/HWGROUP()/drive->hwif->hwgroup/ and remove extra newlines] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4b01fcbbe69bba34a8494fca6376ac0804f0f51d Author: Borislav Petkov Date: Wed Jul 16 20:33:46 2008 +0200 ide-cd: fold cdrom_start_seek into ide_cd_do_request Do what the compiler does anyway: inline a function that is used only once. This saves us the overhead of a function call and the function is small enough to be embedded in the callsite anyways. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit b6ca440a8ff15e12478ea6f026a52970e7a0c54c Author: Borislav Petkov Date: Wed Jul 16 20:33:46 2008 +0200 ide-cd: simplify request issuing path Call cdrom_start_packet_command() only from the ->do_request() routine. As a nice side effect, this improves code readability a bit. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 99384aeafe3a78d8a2e66b09b67aa6a219cd7897 Author: Borislav Petkov Date: Wed Jul 16 20:33:45 2008 +0200 ide-cd: mv ide_do_rw_cdrom ide_cd_do_request There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 8ea1d17b962c35401fe26428e25c4652023e2652 Author: Borislav Petkov Date: Wed Jul 16 20:33:45 2008 +0200 ide-cd: cdrom_start_seek: remove unused argument block There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit ab9d6e3374d938cf3d941fbed5ba32a19ad263b8 Author: Borislav Petkov Date: Wed Jul 16 20:33:45 2008 +0200 ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else block There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit ae8789f034ffa077105575817ec0cc581fd18d83 Author: Borislav Petkov Date: Wed Jul 16 20:33:45 2008 +0200 ide-cd: remove ide_cd_drain_data and ide_cd_pad_transfer Use the generic ide_pad_transfer() helper instead. [bart: fixup ide_cd_drain_data() -> ide_pad_transfer() conversion] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit af6765ce9f535f20e6f9975269660fe49594745a Author: Borislav Petkov Date: Wed Jul 16 20:33:45 2008 +0200 ide-cd: remove wait-for-idle-controller bit in cdrom_start_packet_command This is done in the request issue path anyway. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit ce30e4015954e281f682aa8d158a47885d8e1262 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:44 2008 +0200 sgiioc4: call ide_find_port_slot() later Move ide_find_port_slot() call closer to ide_device_add(). This is basically a preparation for the future changes. Cc: Jeremy Higdon Signed-off-by: Bartlomiej Zolnierkiewicz commit cb8ea0929c9cb899d61c4e155aace0b34d8cffe3 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:44 2008 +0200 swarm: call ide_find_port_slot() later Move ide_find_port_slot() call closer to ide_device_add(). This is basically a preparation for the future changes. Cc: Maciej W. Rozycki Signed-off-by: Bartlomiej Zolnierkiewicz commit 67717e224181527987cce800fa2ddb5c8c1e9315 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:44 2008 +0200 icside: always try to probe first interface Try to probe first interface even if ide_hwifs[]'s slot for the second interface cannot be obtained. While at it: - Add DRV_NAME define and use it for request_dma() instead of hwif->name. Cc: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz commit 47bc7e7425d198ad1f8c4597b0bf28619fcce0fd Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:44 2008 +0200 rapide: fix rapide_probe() return value Return -ENOENT on ide_find_port() failure. While at it: - Cleanup rapide_probe() a bit. Cc: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz commit ff23712e791fd80f3b088d5e1c5733c0944cfe64 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:44 2008 +0200 ide: remove needless includes from setup-pci.c (take 2) v2: * sparc build fix. (From Stephen Rothwell) Signed-off-by: Bartlomiej Zolnierkiewicz commit ad15e9fc8913b704978ffdda7d1f31c79ed6814d Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:44 2008 +0200 ide: remove needless includes from ide-taskfile.c (take 2) v2: On Sunday 15 June 2008, Geert Uytterhoeven wrote: > As ide-taskfile.c uses scatterlists, it should include . (v1 broke IDE build on m68k, thanks to Geert for finding the bug) Cc: Geert Uytterhoeven Signed-off-by: Bartlomiej Zolnierkiewicz commit 61729415e64a1149d4eb36c3fac26a28728ad1d7 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:43 2008 +0200 ide: remove needless includes from ide.c Signed-off-by: Bartlomiej Zolnierkiewicz commit 605cfe8270cb182f494575c5a608404bb19fdfc5 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:43 2008 +0200 ide: remove superfluous BUG_ON() from set_geometry_intr() ide_set_handler() bugs on ->handler == NULL so no need to do it in set_geometry_intr(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 07fe69d5d0b6e476cecaf75e81c0c6093571087b Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:43 2008 +0200 ide: allow any command requesting DMA data phase for HDIO_DRIVE_TASKFILE Allow any command requesting DMA data phase for HDIO_DRIVE_TASKFILE ioctl and remove no longer needed task_dma_ok() Signed-off-by: Bartlomiej Zolnierkiewicz commit e193c3e141df4b536ed077b29c83a96768333607 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:43 2008 +0200 ide-pnp: print driver banner message early Print driver banner message early and without interface number. Signed-off-by: Bartlomiej Zolnierkiewicz commit 740c397cc64272917a4c4c283649579d2044a836 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:43 2008 +0200 ide-h8300: print driver banner message early Print driver banner message early and without interface number. Signed-off-by: Bartlomiej Zolnierkiewicz commit eb3aff5530d22eb4be0a99c9d39c9ffde7b9891a Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:42 2008 +0200 ide: print message on error in ide_find_port_slot() * Add DRV_NAME define to ide-h8300.c. * Fix ide-h8300.c, swarm.c and sgiioc4.c to set .name field in struct ide_port_info to DRV_NAME, then convert these host drivers to use ide_find_port_slot() instead of ide_find_port(). * Print message on error in ide_find_port_slot(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 7b60fa16ca50b0f8cb9d007faee0dff71b397fb8 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:42 2008 +0200 ide_platform: use struct ide_port_info Convert the driver to use struct ide_port_info. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit f81eb80bbb949f9498980c785ef7dd4c994a4909 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:42 2008 +0200 ide-h8300: use struct ide_port_info Convert the driver to use struct ide_port_info. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 9a5ae1faaaf43933dee48c223b193d5e1c4b8b0c Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:42 2008 +0200 rapide: use struct ide_port_info Convert the driver to use struct ide_port_info. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit b48c89a9699f451e4e236fa7313461281c00e69b Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:42 2008 +0200 cmd640: add ->init_dev method Convert the driver to use ->init_dev method instead of open-coding devices init in cmd640x_init(). While at it: - fix printk()-s to use KERN_INFO level instead of the default KERN_ERR - use DRV_NAME define in printk()-s - set proper ->pio_mask also for CONFIG_BLK_DEV_CMD640_ENHANCED=n There should be no functional changes caused by this patch (except fixing printk()-s levels). Signed-off-by: Bartlomiej Zolnierkiewicz commit e6d95bd14928926d6658b5e4ace905e8b83ed27a Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:42 2008 +0200 ide: ->port_init_devs -> ->init_dev Change ->port_init_devs method to take 'ide_drive_t *' as an argument instead of 'ide_hwif_t *' and rename it to ->init_dev. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit a698400a1556cf9f0376d1a41e536973dd5c4747 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:41 2008 +0200 cmd640: fix warm-plug support for the secondary interface Register secondary interface also when user requested not to probe devices. While at it: - remove write-only second_port_toggled variable Signed-off-by: Bartlomiej Zolnierkiewicz commit ba1d0de70d64e68f0e035f00dbb041c1e05b49c9 Author: Arnd Bergmann Date: Wed Jul 16 20:33:41 2008 +0200 powerpc/ide: remove mpc8xx-ide driver This driver was only used by arch/ppc code and is obsolete now with the move to common arch/powerpc code. [bart: port it over IDE tree, remove leftover 'choice' from Kconfig] Signed-off-by: Arnd Bergmann Acked-by: Kumar Gala Cc: Paul Mackerras Signed-off-by: Bartlomiej Zolnierkiewicz commit e48905e9cfffd21861c3521d828ae992a53aac67 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:41 2008 +0200 swarm: use struct ide_port_info Convert the driver to use struct ide_port_info. There should be no functional changes caused by this patch. Acked-by: Maciej W. Rozycki Tested-by: Maciej W. Rozycki Signed-off-by: Bartlomiej Zolnierkiewicz commit c1da678b5b4d8ce7836ed1ded80109d1db37efe0 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:41 2008 +0200 ide: tighten checks on PCI BARs in ide_hwif_configure() Alan has fixed PCI layer handling of PCI IDE in Compatibility mode so PCI BAR 0/1 (and/or 2/3) content reported by kernel should never be zero. Tighten checks on PCI BARs and also fix printk() message while on it. Signed-off-by: Bartlomiej Zolnierkiewicz commit 01397012b3129147890bb116431d5a794dfc3990 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:41 2008 +0200 sgiioc4: use driver name for resource allocation Cc: Jeremy Higdon Signed-off-by: Bartlomiej Zolnierkiewicz commit b25afdf1336237fb0e4021eb35744e577e19bd14 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:41 2008 +0200 icside: use ide_init_port_hw() * Move ide_find_port() and default_hwif_mmiops() calls from icside_setup() to icside_register_v{5,6}(). * Convert icside_setup() to initialize hw_regs_t instead ide_hwif_t and icside_register_v{5,6}() to use ide_init_port_hw(). * Rename icside_setup() to icside_setup_ports(). There should be no functional changes caused by this patch. Cc: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz commit 26839f09ca2d0f4239e546cd912bc9f4694f3c5e Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:40 2008 +0200 icside: don't use hwif->hwif_data * Move ecard_set_drvdata() from icside_probe() to icside_register_v{5,6}(), then use state->ioc_base instead of hwif->hwif_data in icside_maskproc() and icside_dma_test_irq(). While at it: * Add sel field to struct icside_state, then use state->{sel,ioc_base} instead of ->{select,config}_data in icside_dma_setup(). There should be no functional changes caused by this patch. Cc: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz commit dccdf527379dc2fe8a4efc5c75601d1d4035a750 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:40 2008 +0200 ide-cs: use struct ide_port_info Convert the driver to use struct ide_port_info. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit f333f92bf9040fb63d13c184295629c7a0ff449f Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:40 2008 +0200 ide_4drives: use struct ide_port_info Convert the driver to use struct ide_port_info - as a nice side-effect this fixes hwif->channel initialization. Signed-off-by: Bartlomiej Zolnierkiewicz commit a536f326a2223c951818e199e23847c2ac5e483b Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:40 2008 +0200 au1xxx-ide: don't use hwif->hwif_data * Use &auide_hwif directly instead of using hwif->hwif_data. While at it: * No need to initialize hwif->{select,config}_data. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit c56c5648a3bd15ff14c50f284b261140cd5b5472 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:40 2008 +0200 ide: set hwif->dev in ide_init_port_hw() (take 2) * Add 'parent' field to hw_regs_t for optional parent device pointer (needed by macio PMAC IDE controllers) and set hwif->dev in ide_init_port_hw(). * Update au1xxx-ide.c, sgiioc4.c, pmac.c and setup-pci.c accordingly. v2: * Update scc_pata.c. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 63b51c6d1d63276fd320615c042f1ff5d94ebab8 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:40 2008 +0200 ide: make ide_hwifs[] static Move ide_hwifs[] from ide.c to ide-probe.c and make it static. Signed-off-by: Bartlomiej Zolnierkiewicz commit 256c5f8eef7b9a8c8a85c15c58cda9df455f947e Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:39 2008 +0200 ide: fix hwif-s initialization * Add ide_hwifs[] entry initialization to ide_find_port_slot() and remove ide_init_port_data() calls from host drivers. * Unexport ide_init_port_data(). * Remove no longer needed init_ide_data(). Signed-off-by: Bartlomiej Zolnierkiewicz commit 9ad540937554a3779c5fe7af13aa390b1d2aeb3e Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:39 2008 +0200 ide: move PIO blacklist to ide-pio-blacklist.c Move PIO blacklist to ide-pio-blacklist.c. While at it: - fix comment - fix whitespace damage There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 3e153cfb5e38ae237ff27a10a833946ac95db8a4 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:39 2008 +0200 ide: remove no longer used ide_pio_timings[] Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit c9d6c1a2379373219bb3271bdcbdc0ab2edf349d Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:39 2008 +0200 ide: move ide_pio_cycle_time() to ide-timings.c All ide_pio_cycle_time() users already select CONFIG_IDE_TIMINGS so move the function from ide-lib.c to ide-timings.c. While at it: - convert ide_pio_cycle_time() to use ide_timing_find_mode() - cleanup ide_pio_cycle_time() a bit There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 8a97206e31dc2e2f8f9b4d97e234b5c701fe9894 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:38 2008 +0200 ide-pmac: convert to use ide_timing_find_mode() Also update my Copyrights while at it. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit b96f7384646519da54ad50bfad8d53b915b70cb3 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:38 2008 +0200 ide-mpc8xx: convert to use ide_timing_find_mode() Also fix (disabled) debugging code while at it. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz commit 3f847571a1cf845a338bcd352f31240b3615f40d Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:38 2008 +0200 sl82c105: convert to use ide_timing_find_mode() There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 713a590dea9a61e84f2837e75c5e9429d95908b5 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:38 2008 +0200 cy82c693: convert to use ide_timing_find_mode() There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 86a0e12fcb590a6a84b90ae00e6d6564ce770749 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:38 2008 +0200 cmd64x: convert to use ide_timing_find_mode() There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 17b500de0ad79a306a0cd8acfe9a9f086ad28b4c Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:38 2008 +0200 cmd640: convert to use ide_timing_find_mode() There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 288911af1209f5aa6119c9ec6d5a9bdb16a385b5 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:37 2008 +0200 alim15x3: convert to use ide_timing_find_mode() There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2feecface7fd62be75bd4961324dc279a04bef22 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:37 2008 +0200 qd65xx: convert to use ide_timing_find_mode() There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit b32b76f72df17de891181b47e714f9f897bb62a1 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:37 2008 +0200 ht6560b: convert to use ide_timing_find_mode() There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit cc57ccc03d2a9b5622300f4b59fc8b54408c6e24 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:37 2008 +0200 ali14xx: convert to use ide_timing_find_mode() There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit f06ab3402aa2d6de060442c1053ea10b24b65076 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:37 2008 +0200 ide: convert ide-timing.h to ide-timings.c library (take 2) * Don't include ide-timing.h in cs5535 and sis5513 host drivers (they don't need it currently). * Convert ide-timing.h to ide-timings.c library and add CONFIG_IDE_TIMINGS config option to be selected by host drivers using the library. While at it: - fix ide_timing_find_mode() placement v2: * Add missing EXPORT_SYMBOLs. (Stephen Rothwell ) There should be no functional changes caused by this patch. Cc: Stephen Rothwell Signed-off-by: Bartlomiej Zolnierkiewicz commit 2c139e7a7152f66ff93b173f8770c94ea53a691e Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:36 2008 +0200 ide: checkpatch.pl fixes for ide-timing.h Also fix placement of comments in ide_timing_compute() while at it. There should be no functional changes caused by this patch (md5sum was verified to be the same before/after the patch). Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit bd887f72d2a28a8202519e67fd9ed93ee3c4e78d Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:36 2008 +0200 ide: remove XFER_* masks from ide-timing.h * Check requested xfer mode against xfer modes instead of XFER_* masks in ide_timing_compute() and cs5535.c::cs5535_set_speed(). * Remove XFER_[MODE,MWDMA,EPIO,PIO] masks. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3be53f3f213223f50d8e29b5e1869685bf040a1e Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:36 2008 +0200 ide: move some bits from ide-timing.h to Move struct ide_timing and IDE_TIMING_* defines to from drivers/ide/ide-timing.h. While at it: - use u8/u16 instead of short for struct ide_timing fields - use enum for IDE_TIMING_* There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 71d5161426c26742ba053fe93637559cbe2cea37 Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:36 2008 +0200 ide: use u8 for xfer modes in ide-timing.h There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit f0ffc9872e972e9d9fe8f7ae577ff046dbdba51b Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:36 2008 +0200 ide: remove unused XFER_UDMA_SLOW Remove unused XFER_UDMA_SLOW from ide_timing[]. While at it: - fix re-defining XFER_PIO_5 (no need to define it in ide-timing.h as it is defined in which is included by ) - fix whitespace damage There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit e4e8d02f56f5c0cefc6713384629e068193d706a Author: Bartlomiej Zolnierkiewicz Date: Wed Jul 16 20:33:35 2008 +0200 ide: remove needless includes from ide-lib.c Signed-off-by: Bartlomiej Zolnierkiewicz commit 96b1dfe8fe02e35f017c885b11f0beb10ff4f316 Author: Ben Dooks Date: Fri Jun 20 20:53:35 2008 +0200 BAST: Remove old IDE driver Remove the old BAST IDE driver, as we are now using the platform-pata support. Signed-off-by: Ben Dooks Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit e5318b531b008c79d2a0c0df06a7b8628da38e2f Author: FUJITA Tomonori Date: Wed Jul 16 20:33:35 2008 +0200 ide: use the dma safe check for REQ_TYPE_ATA_PC This uses the dma safe check for REQ_TYPE_ATA_PC. The dma safe check is used for only sg requests but it should be used for other non fs commands. This uses blk_queue_update_dma_pad to make the intention clear though ide don't use the blk APIs so it doesn't change anything. Signed-off-by: FUJITA Tomonori Acked-by: 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 0b6abc17700a7843b165c677da0ac94522f83083 Author: FUJITA Tomonori Date: Wed Jul 16 20:33:35 2008 +0200 ide: avoid DMA on the stack for REQ_TYPE_ATA_PC Some REQ_TYPE_ATA_PC commands uses the stack buffers for DMA, which leads to memory corruption on a non-coherent platform. With regard to alignment and padding, ide-cd has the the dma safe check for sg requests and REQ_TYPE_ATA_PC. This adds the stack buffer check to that check. Signed-off-by: FUJITA Tomonori Acked-by: 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 84e0f3f6c1e26588fdcb9f1b0f99d0275229bc99 Author: Dimitri Gorokhovik Date: Wed Jul 16 20:33:34 2008 +0200 ide: it821x in pass-through mode segfaults in 2.6.26-stable The driver of ITE8212 in pass-through mode (it8212.noraid=1 on cmndline) attempts to use the field `.dma_host_set' of the struct ide_dma_ops in `ide_config_drive_speed' which is set to NULL by default. So give a value to all fields of the struct ide_dma_ops. Signed-off-by: Dimitri Gorokhovik Signed-off-by: Bartlomiej Zolnierkiewicz commit 33468e7637c53b5516902422d66ca3d3fe64a9c3 Author: Jean Delvare Date: Wed Jul 16 19:30:18 2008 +0200 hwmon: (w83l786ng) Convert to a new-style i2c driver The new-style w83l786ng driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Kevin Lo commit dc18a4184d6794e2e5c6f05142f3f8aaeeaee506 Author: Jean Delvare Date: Wed Jul 16 19:30:18 2008 +0200 hwmon: (w83l785ts) Convert to a new-style i2c driver The new-style w83l785ts driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit a7f13a6ec40379fe2116c647ac8e569227ba8d4f Author: Jean Delvare Date: Wed Jul 16 19:30:17 2008 +0200 hwmon: (w83793) Convert to a new-style i2c driver The new-style w83793 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 31d5d275a118527a2b9b0f68613428f176efbb8f Author: Jean Delvare Date: Wed Jul 16 19:30:17 2008 +0200 hwmon: (w83792d) Convert to a new-style i2c driver The new-style w83792d driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit cb0c1af37996f3016e34e9c709e5f727646f7207 Author: Jean Delvare Date: Wed Jul 16 19:30:17 2008 +0200 hwmon: (w83791d) Convert to a new-style i2c driver The new-style w83791d driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Marc Hulsman commit ccf37488322429bf8709f2227f3d48466add2b6b Author: Jean Delvare Date: Wed Jul 16 19:30:16 2008 +0200 hwmon: (thmc50) Convert to a new-style i2c driver The new-style thmc50 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Krzysztof Helt commit 8fb597bb6ec80d53836229bf3576c7b848b909e3 Author: Jean Delvare Date: Wed Jul 16 19:30:16 2008 +0200 hwmon: (smsc47m192) Convert to a new-style i2c driver The new-style smsc47m192 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Hartmut Rick commit 0d57abd5b87e2e82d8d2e8d5c9a3b56743ffa5ab Author: Jean Delvare Date: Wed Jul 16 19:30:16 2008 +0200 hwmon: (max6650) Convert to a new-style i2c driver The new-style max6650 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Hans J. Koch commit c6d3f6fa1b0b984991d6e2a261c7dd7f2685c7bd Author: Jean Delvare Date: Wed Jul 16 19:30:15 2008 +0200 hwmon: (max1619) Convert to a new-style i2c driver The new-style max1619 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Alexey Fisher commit 70b724063f789a443aff1e1a6f0f04d971342116 Author: Jean Delvare Date: Wed Jul 16 19:30:15 2008 +0200 hwmon: (lm93) Convert to a new-style i2c driver The new-style lm93 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Mark M. Hoffman Cc: Eric J. Bowersox Cc: Carsten Emde Cc: Hans J. Koch commit 910e8dcf16dd7afc08dc1791155cc69e07ca4183 Author: Jean Delvare Date: Wed Jul 16 19:30:15 2008 +0200 hwmon: (lm92) Convert to a new-style i2c driver The new-style lm92 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 9b0e85269275159a1f9c3e4a5d254caf5211950b Author: Jean Delvare Date: Wed Jul 16 19:30:15 2008 +0200 hwmon: (lm90) Convert to a new-style i2c driver The new-style lm90 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit a888420af07b9a26b6d518328baa913fb704e950 Author: Jean Delvare Date: Wed Jul 16 19:30:14 2008 +0200 hwmon: (lm87) Convert to a new-style i2c driver The new-style lm87 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Ben Hutchings commit b6aacdcefac8ed60e77930b6e74129da6478e20e Author: Jean Delvare Date: Wed Jul 16 19:30:14 2008 +0200 hwmon: (lm83) Convert to a new-style i2c driver The new-style lm83 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 8c8bacc883610b672d3f08dc6ebf1f17e495f5b9 Author: Jean Delvare Date: Wed Jul 16 19:30:14 2008 +0200 hwmon: (lm80) Convert to a new-style i2c driver The new-style lm80 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit a189dd62d328db7bf8ba68de6a948fdbc93dca25 Author: Jean Delvare Date: Wed Jul 16 19:30:13 2008 +0200 hwmon: (lm77) Convert to a new-style i2c driver The new-style lm77 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Andras Bali commit d5957be2f1535b1a6c77eabba0781ec7245c5dea Author: Jean Delvare Date: Wed Jul 16 19:30:13 2008 +0200 hwmon: (lm63) Convert to a new-style i2c driver The new-style lm63 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit a23a9fe1d4d725e1624635f49e9790ec32deffd0 Author: Jean Delvare Date: Wed Jul 16 19:30:13 2008 +0200 hwmon: (gl520sm) Convert to a new-style i2c driver The new-style gl520sm driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Maarten Deprez commit 95d80e7c834d8742da38e2b9d2f36dec36da03a6 Author: Jean Delvare Date: Wed Jul 16 19:30:13 2008 +0200 hwmon: (gl518sm) Convert to a new-style i2c driver The new-style gl518sm driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit b9e39b1b1b79d3e074ca79b63f548ac48c85ca98 Author: Jean Delvare Date: Wed Jul 16 19:30:12 2008 +0200 hwmon: (fscpos) Convert to a new-style i2c driver The new-style fscpos driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 40ac1994bf988dac05434f856c2a4fa24e22b2ea Author: Jean Delvare Date: Wed Jul 16 19:30:12 2008 +0200 hwmon: (fschmd) Convert to a new-style i2c driver The new-style fschmd driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Hans de Goede commit c2df1591df3ea83b4a5890a1131dd821ca07e761 Author: Jean Delvare Date: Wed Jul 16 19:30:12 2008 +0200 hwmon: (fscher) Convert to a new-style i2c driver The new-style fscher driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Reinhard Nissl commit 935ada8c4481f9591caa1b88c83127c5931a8855 Author: Jean Delvare Date: Wed Jul 16 19:30:11 2008 +0200 hwmon: (f75375s) Drop legacy i2c driver Drop the legacy f75375s i2c driver, and add a detect callback to the new-style i2c driver to achieve the same functionality. Signed-off-by: Jean Delvare Acked-by: Riku Voipio commit 70313eabfc63ce6aa89b9fa3074129e5c521568a Author: Jean Delvare Date: Wed Jul 16 19:30:11 2008 +0200 hwmon: (ds1621) Convert to a new-style i2c driver The new-style ds1621 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 71163c7c36fa76bb5a72feca7fb685677444070a Author: Jean Delvare Date: Wed Jul 16 19:30:11 2008 +0200 hwmon: (atxp1) Convert to a new-style i2c driver The new-style atxp1 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 063675b15608dfbb8404b3a19546d579bd039d02 Author: Jean Delvare Date: Wed Jul 16 19:30:11 2008 +0200 hwmon: (asb100) Convert to a new-style i2c driver The new-style asb100 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit eea54766c6e3f9850affa91061164aeb6bba44b6 Author: Jean Delvare Date: Wed Jul 16 19:30:10 2008 +0200 hwmon: (adt7473) Convert to a new-style i2c driver The new-style adt7473 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Darrick J. Wong commit 008f1ca51e4a25ee3e34b8faa901dbeefaf0081a Author: Jean Delvare Date: Wed Jul 16 19:30:10 2008 +0200 hwmon: (adt7470) Convert to a new-style i2c driver The new-style adt7470 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Darrick J. Wong commit 7347cb388e5aecffc4920bd5ea6a61e4a4690bae Author: Jean Delvare Date: Wed Jul 16 19:30:10 2008 +0200 hwmon: (ads7828) Convert to a new-style i2c driver The new-style ads7828 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 7fae8283109e155467bc1c622178d3a475cdbddf Author: Jean Delvare Date: Wed Jul 16 19:30:09 2008 +0200 hwmon: (adm9240) Convert to a new-style i2c driver The new-style adm9240 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Grant Coady commit af200f881d2cbf3ba2f4c505fa1ae5cfef36f46a Author: Jean Delvare Date: Wed Jul 16 19:30:09 2008 +0200 hwmon: (adm1031) Convert to a new-style i2c driver The new-style adm1031 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Alexandre d'Alton commit 9c97fb4d255fbf6713ee2d77dd8ed8ae770a7e49 Author: Jean Delvare Date: Wed Jul 16 19:30:09 2008 +0200 hwmon: (adm1029) Convert to a new-style i2c driver The new-style adm1029 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare Cc: Corentin Labbe commit 57f7eb0bcb2316dc264cd26f38b33dd2cf3151c1 Author: Jean Delvare Date: Wed Jul 16 19:30:08 2008 +0200 hwmon: (adm1026) Convert to a new-style i2c driver The new-style adm1026 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 7dbafe021ba360bf25674a7e290d3e4a5c953981 Author: Jean Delvare Date: Wed Jul 16 19:30:08 2008 +0200 hwmon: (adm1025) Convert to a new-style i2c driver The new-style adm1025 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 65817ed8d1376afff21019b5c0e0109e5a7d9cc0 Author: Jean Delvare Date: Wed Jul 16 19:30:08 2008 +0200 hwmon: (adm1021) Convert to a new-style i2c driver The new-style adm1021 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 369932f6f840aedfbc717dd156bba7668a11d916 Author: Jean Delvare Date: Wed Jul 16 19:30:08 2008 +0200 hwmon: (ad7418) Convert to a new-style i2c driver The ad7418 driver is only used on embedded platforms where i2c devices can easily be declared in platform code. Thus a new-style i2c driver makes perfect sense. This lets us get rid of quirky detection code (these chips have no identification registers) and shrinks the binary driver size by 38%. Signed-off-by: Jean Delvare Cc: Alessandro Zummo commit 61c91f7ded640bb2b340cc89d9ca3a3ca0229c74 Author: Jean Delvare Date: Wed Jul 16 19:30:07 2008 +0200 w1/ds2482: Convert to a new-style driver The new-style ds2482 driver implements the optional detect() callback to cover the use cases of the legacy driver. I'm curious if anyone really needs this though, so it might be removed in the feature. Signed-off-by: Jean Delvare commit bd8d421f7ca9f8da3d820d28379d796500f69529 Author: Jean Delvare Date: Wed Jul 16 19:30:07 2008 +0200 i2c: Convert the max6875 driver to a new-style i2c driver The new-style max6875 driver implements the optional detect() callback to cover the use cases of the legacy driver. I'm curious if anyone really needs this though, so it might be removed in the feature. Signed-off-by: Jean Delvare commit 3d63430a26b91fe3daee0dd933f899c225e66daa Author: Jean Delvare Date: Wed Jul 16 19:30:07 2008 +0200 i2c: Convert the pca9539 driver to a new-style i2c driver The new-style pca9539 driver implements the optional detect() callback to cover the use cases of the legacy driver. Warning: users will now have to use the force module parameter to get the driver to attach to their device. That's not a bad thing as these devices can't be detected anyway. Note that this doesn't change the fact that this driver is deprecated in favor of gpio/pca953x. Signed-off-by: Jean Delvare commit 97addff6def3f8e228a634fa017589f45c69de5c Author: Jean Delvare Date: Wed Jul 16 19:30:06 2008 +0200 i2c: Convert the pcf8575 driver to a new-style i2c driver The new-style pcf8575 driver implements the optional detect() callback to cover the use cases of the legacy driver. Warning: users will now have to use the force module parameter to get the driver to attach to their device. That's not a bad thing as these devices can't be detected anyway. Note that this doesn't change the fact that this driver is deprecated in favor of gpio/pcf857x. Signed-off-by: Jean Delvare commit 833bedb813689807385ae73175389c73a3f855c1 Author: Jean Delvare Date: Wed Jul 16 19:30:06 2008 +0200 i2c: Convert the pcf8574 driver to a new-style i2c driver The new-style pcf8574 driver implements the optional detect() callback to cover the use cases of the legacy driver. Warning: users will now have to use the force module parameter to get the driver to attach to their device. That's not a bad thing as these devices can't be detected anyway. Note that this doesn't change the fact that this driver is deprecated in favor of gpio/pcf857x. Signed-off-by: Jean Delvare commit 8b77e6ac4911a79993e583ece719736a9e035b1d Author: Jean Delvare Date: Wed Jul 16 19:30:06 2008 +0200 i2c: Convert the pcf8591 driver to a new-style i2c driver The new-style pcf8591 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit 68be3363740e4ac3b4309faebcdf8fe5bf62ed2f Author: Jean Delvare Date: Wed Jul 16 19:30:05 2008 +0200 i2c: Convert the eeprom driver to a new-style i2c driver The new-style eeprom driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare commit bd4bc3dbded9cd7b2bdca6bba1aecb4251a8039d Author: Jean Delvare Date: Wed Jul 16 19:30:05 2008 +0200 i2c: Clear i2c_adapter.dev on adapter removal Clear i2c_adapter.dev on adapter removal. This makes it possible to re-add the adapter at a later point, which some drivers (i2c-amd756-s4882, i2c-nforce2-s4985) actually do. This fixes a bug reported by John Stultz here: http://lkml.org/lkml/2008/7/15/720 and by Ingo Molar there: http://lkml.org/lkml/2008/7/16/78 Signed-off-by: Jean Delvare Cc: John Stultz Cc: Ingo Molnar commit e22146e610bb7aed63282148740ab1d1b91e1d90 Author: Jack Steiner Date: Wed Jul 16 11:11:59 2008 -0500 x86: fix kernel_physical_mapping_init() for large x86 systems Fix bug in kernel_physical_mapping_init() that causes kernel page table to be built incorrectly for systems with greater than 512GB of memory. Signed-off-by: Jack Steiner Cc: linux-mm@kvack.org Signed-off-by: Ingo Molnar commit 9fce1bc956c21dfe0f46be028f18c4d5057f2bd7 Author: Ming Lei Date: Wed Jul 16 22:54:30 2008 +0800 PCI: remove unnecessary volatile in PCIe hotplug struct controller Proper memory barriers have been added to order accesses to ->cmd_busy, so volatile declaration for cmd_busy can be removed. Signed-off-by: Ming Lei Signed-off-by: Jesse Barnes commit d25dc7fd4740decf4c66e2f17dbaa288448fabd5 Author: David Woodhouse Date: Tue Jul 15 22:54:04 2008 -0700 Fix 'make clean' and .gitignore for firmware/ directory. Provide a .gitignore file, and fix a typo which prevented some of the generated binary files from being removed on 'make clean'. Signed-off-by: David Woodhouse Reported-and-tested-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 45158894d4d6704afbb4cefe55e5f6ca279fe12a Merge: 89a93f2... 84c3d4a... Author: Linus Torvalds Date: Tue Jul 15 19:04:58 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (249 commits) powerpc: Fix pte_update for CONFIG_PTE_64BIT and !PTE_ATOMIC_UPDATES powerpc: Fix a build problem on ppc32 with new DMA_ATTRs ibm_newemac: Add MII mode support to the EMAC RGMII bridge. powerpc: Don't spin on sync instruction at boot time powerpc: Add VSX load/store alignment exception handler powerpc: fix giveup_vsx to save registers correctly powerpc: support for latencytop powerpc: Remove unnecessary condition when sanity-checking WIMG bits powerpc: Add PPC_FEATURE_PSERIES_PERFMON_COMPAT powerpc: Add driver for Barrier Synchronization Register powerpc: mman.h export fixups powerpc/fsl: update crypto node definition and device tree instances powerpc/fsl: Refactor device bindings powerpc/85xx: Minor fixes for 85xxds and 8536ds board. powerpc: Add 82xx/83xx/86xx to 6xx Multiplatform powerpc/85xx: publish of device for cds platforms powerpc/booke: don't reinitialize time base powerpc/86xx: Refactor pic init powerpc/CPM: Add i2c pins to dts and board setup cpm_uart: Support uart_wait_until_sent() ... commit 89a93f2f4834f8c126e8d9dd6b368d0b9e21ec3d Merge: 260eddf... fe9233f... Author: Linus Torvalds Date: Tue Jul 15 18:58:04 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (102 commits) [SCSI] scsi_dh: fix kconfig related build errors [SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of [SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h [SCSI] make struct scsi_{host,target}_type static [SCSI] fix locking in host use of blk_plug_device() [SCSI] zfcp: Cleanup external header file [SCSI] zfcp: Cleanup code in zfcp_erp.c [SCSI] zfcp: zfcp_fsf cleanup. [SCSI] zfcp: consolidate sysfs things into one file. [SCSI] zfcp: Cleanup of code in zfcp_aux.c [SCSI] zfcp: Cleanup of code in zfcp_scsi.c [SCSI] zfcp: Move status accessors from zfcp to SCSI include file. [SCSI] zfcp: Small QDIO cleanups [SCSI] zfcp: Adapter reopen for large number of unsolicited status [SCSI] zfcp: Fix error checking for ELS ADISC requests [SCSI] zfcp: wait until adapter is finished with ERP during auto-port [SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver [SCSI] sg: Add target reset support [SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC [SCSI] sd: Move scsi_disk() accessor function to sd.h ... commit 260eddf4391f162a69d1d163729249635fa7a78f Merge: f2d9c74... 7890ea1... Author: Linus Torvalds Date: Tue Jul 15 18:57:38 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: Revert crypto: prng - Deterministic CPRNG commit f2d9c740f6b9f92608dfb2a2bdd797e0350cabe4 Author: Steven Rostedt Date: Tue Jul 15 10:57:33 2008 -0400 ftrace: ftrace.txt updates This patch includes ftrace.txt updates that address (mostly) comments from Andrew Morton. It also includes updates that were suggested by Randy Dunlap, John Kacur and David Teigland. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 84c3d4aaec3338201b449034beac41635866bddf Merge: 43d2548... fafa3a3... Author: Benjamin Herrenschmidt Date: Wed Jul 16 11:07:59 2008 +1000 Merge commit 'origin/master' Manual merge of: arch/powerpc/Kconfig arch/powerpc/kernel/stacktrace.c arch/powerpc/mm/slice.c arch/ppc/kernel/smp.c commit fafa3a3f16723997f039a0193997464d66dafd8f Merge: 7e2225d... 431ceb8... Author: Linus Torvalds Date: Tue Jul 15 16:29:18 2008 -0700 Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix TSC build error on 32bit commit 809d9a8f93bd8504dcc34b16bbfdfd1a8c9bb1ed Author: Alok Kataria Date: Tue Jul 15 11:59:42 2008 -0700 x86/PCI: ACPI based PCI gap calculation Using ACPI to find free address space allows us to find a gap for the unallocated PCI resources or MMIO resources for hotplug devices within the BIOS allowed PCI regions. It works by evaluating the _CRS object under PCI0 looking for producer resources. Then searches the e820 memory space for a gap within these producer resources. Signed-off-by: Alok N Kataria Cc: Andi Kleen Cc: Len Brown Cc: Ingo Molnar Signed-off-by: Jesse Barnes commit cadc723cc19ce6b881d973d3c04e25ebb83058e6 Merge: e89e896... f839c4c... Author: Trond Myklebust Date: Tue Jul 15 18:34:58 2008 -0400 Merge branch 'bkl-removal' into next commit e89e896d31b11a51a54ddcd3f72a76bd286dd86c Merge: 3a628b0... d67d1c7... Author: Trond Myklebust Date: Tue Jul 15 18:34:16 2008 -0400 Merge branch 'devel' into next Conflicts: fs/nfs/file.c Fix up the conflict with Jon Corbet's bkl-removal tree commit f839c4c1991cc9b580ae38f98f54554938a7f49c Author: Trond Myklebust Date: Wed Jun 11 15:44:26 2008 -0400 NFSv4: Remove BKL from the nfsv4 state recovery Signed-off-by: Trond Myklebust commit a86dc496b764ebb1431677b38eab45310e5a2ad4 Author: Trond Myklebust Date: Wed Jun 11 13:37:09 2008 -0400 SUNRPC: Remove the BKL from the callback functions Push it into those callback functions that actually need it. Note that all the NFS operations use their own locking, so don't need the BKL. Ditto for the rpcbind client. Signed-off-by: Trond Myklebust commit c3cc8c019ca09767d7c9b5457d5cf8ac65085f44 Author: Trond Myklebust Date: Wed Jun 11 15:44:23 2008 -0400 NFS: Remove BKL from the readdir code Page accesses are serialised using the page locks, whereas all attribute updates are serialised using the inode->i_lock. Signed-off-by: Trond Myklebust commit 76566991f94c206d9c5881edcaf99ba72c9e9d61 Author: Trond Myklebust Date: Wed Jun 11 15:44:22 2008 -0400 NFS: Remove BKL from the symlink code Page cache accesses are serialised using page locks, whereas attribute updates are serialised using inode->i_lock. Signed-off-by: Trond Myklebust commit 52e2e8d37e01edf38ccdccc983fb13ec1456d63d Author: Trond Myklebust Date: Wed Jun 11 15:44:21 2008 -0400 NFS: Remove BKL from the sillydelete operations Signed-off-by: Trond Myklebust commit bd9bb454b76fb6ca2d00f17313f9f9df5f5c404a Author: Trond Myklebust Date: Wed Jun 11 16:09:59 2008 -0400 NFS: Remove the BKL from the rename, rmdir and unlink operations Attribute updates are safe, and dentry operations are protected using VFS level locks. Defer removing the BKL from sillyrename until a separate patch. Signed-off-by: Trond Myklebust commit fc0f684c21b5d4b41dc2ec76f7c0897ac98f5b6e Author: Trond Myklebust Date: Wed Jun 11 15:44:20 2008 -0400 NFS: Remove BKL from NFS lookup code All dentry-related operations are already BKL-safe, since they are protected by the VFS locking. No extra locks should be needed in the NFS code. In the case of nfs_revalidate_inode(), we're only doing an attribute update (protected by the inode->i_lock). In the case of nfs_lookup(), we're instantiating a new dentry, so there should be no contention possible until after we call d_materialise_unique. Signed-off-by: Trond Myklebust commit fc81af535e462764e17f638d542973fbef13b026 Author: Trond Myklebust Date: Wed Jun 11 15:52:40 2008 -0400 NFS: Remove the BKL from nfs_link() Signed-off-by: Trond Myklebust commit f1e2eda23513b68003202bddf1f84158baad8844 Author: Trond Myklebust Date: Wed Jun 11 15:50:50 2008 -0400 NFS: Remove the BKL from the inode creation operations nfs_instantiate() does not require the BKL, neither do the attribute updates or the RPC code. Signed-off-by: Trond Myklebust commit bba67e0e3f4caba2b2b90b48ed798fb0461bcb86 Author: Trond Myklebust Date: Wed Jun 11 13:26:23 2008 -0400 NFS: Remove BKL usage from open() All the NFSv4 stateful operations are already protected by other locks (in particular by the rpc_sequence locks. Signed-off-by: Trond Myklebust commit b6a2e569e2157509951c9f3f58dfa18b44ce91b3 Author: Trond Myklebust Date: Wed Jun 11 13:26:16 2008 -0400 NFS: Remove BKL usage from the write path Signed-off-by: Trond Myklebust commit 4d80f2ecd506d9732ad94a6da104580bb47680d6 Author: Trond Myklebust Date: Wed Jun 11 15:44:18 2008 -0400 NFS: Remove the BKL from the permission checking code Signed-off-by: Trond Myklebust commit fa6dc9dc59c3a76fd209a97c8cf37395980fb903 Author: Trond Myklebust Date: Wed Jun 11 13:26:14 2008 -0400 NFS: Remove attribute update related BKL references Signed-off-by: Trond Myklebust commit a3d01454bc58b5a211ef64a7670572a40b71e682 Author: Trond Myklebust Date: Wed Jun 11 12:21:19 2008 -0400 NFS: Remove BKL requirement from attribute updates The main problem is dealing with inode->i_size: we need to set the inode->i_lock on all attribute updates, and so vmtruncate won't cut it. Make an NFS-private version of vmtruncate that has the necessary locking semantics. The result should be that the following inode attribute updates are protected by inode->i_lock nfsi->cache_validity nfsi->read_cache_jiffies nfsi->attrtimeo nfsi->attrtimeo_timestamp nfsi->change_attr nfsi->last_updated nfsi->cache_change_attribute nfsi->access_cache nfsi->access_cache_entry_lru nfsi->access_cache_inode_lru nfsi->acl_access nfsi->acl_default nfsi->nfs_page_tree nfsi->ncommit nfsi->npages nfsi->open_files nfsi->silly_list nfsi->acl nfsi->open_states inode->i_size inode->i_atime inode->i_mtime inode->i_ctime inode->i_nlink inode->i_uid inode->i_gid The following is protected by dir->i_mutex nfsi->cookieverf Signed-off-by: Trond Myklebust commit 1b83d707032a1be40a60ed0a9bd841662cc04a5d Author: Trond Myklebust Date: Wed Jun 11 15:44:04 2008 -0400 NFS: Protect inode->i_nlink updates using inode->i_lock Signed-off-by: Trond Myklebust commit d67d1c7bf948341fd8678c8e337ec27f4b46b206 Author: Felix Blyakher Date: Tue Jul 15 12:40:22 2008 -0500 nfs: set correct fl_len in nlmclnt_test() fcntl(F_GETLK) on an nfs client incorrectly returns the values for the conflicting lock. fl_len value is always 1. If the conflicting lock is (0, 4095) the F_GETLK request for (1024, 10) returns (0, 1), which doesn't even cover the requested range, and is quite confusing. The fix is trivial, set fl_end from the fl_end value recieved from the nfs server. Signed-off-by: Felix Blyakher Signed-off-by: "J. Bruce Fields" Signed-off-by: Trond Myklebust commit c2e1b09ff237c0a3687b9a804cc8bf489743cffc Author: Chuck Lever Date: Mon Jul 14 16:03:30 2008 -0400 SUNRPC: Support registering IPv6 interfaces with local rpcbind daemon Introduce a new API to register RPC services on IPv6 interfaces to allow the NFS server and lockd to advertise on IPv6 networks. Unlike rpcb_register(), the new rpcb_v4_register() function uses rpcbind protocol version 4 to contact the local rpcbind daemon. The version 4 SET/UNSET procedures allow services to register address families besides AF_INET, register at specific network interfaces, and register transport protocols besides UDP and TCP. All of this functionality is exposed via the new rpcb_v4_register() kernel API. A user-space rpcbind daemon implementation that supports version 4 of the rpcbind protocol is required in order to make use of this new API. Note that rpcbind version 3 is sufficient to support the new rpcbind facilities listed above, but most extant implementations use version 4. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit babe80eb4994dfdc97d5be19a68b5af66d667585 Author: Chuck Lever Date: Mon Jul 14 16:03:29 2008 -0400 SUNRPC: Refactor rpcb_register to make rpcbindv4 support easier rpcbind version 4 registration will reuse part of rpcb_register, so just split it out into a separate function now. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 423d8b064771f5cd8b706a4839b18db9bb6c3c59 Author: Chuck Lever Date: Mon Jul 14 16:03:28 2008 -0400 SUNRPC: None of rpcb_create's callers wants a privileged source port Clean up: Callers that required a privileged source port now use rpcb_create_local(), so we can remove the @privileged argument from rpcb_create(). Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit cc5598b78fd320dd6d1f90c14491e08029f3c4f6 Author: Chuck Lever Date: Mon Jul 14 16:03:27 2008 -0400 SUNRPC: Introduce a specific rpcb_create for contacting localhost Add rpcb_create_local() for use by rpcb_register() and upcoming IPv6 registration functions. Ensure any errors encountered by rpcb_create_local() are properly reported. We can also use a statically allocated constant loopback socket address instead of one allocated on the stack and initialized every time the function is called. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 166b88d755f925139af7f7b75aa0a1b896ca0670 Author: Chuck Lever Date: Mon Jul 14 16:03:26 2008 -0400 SUNRPC: Use correct XDR encoding procedure for rpcbind SET/UNSET The rpcbind versions 3 and 4 SET and UNSET procedures use the same arguments as the GETADDR procedure. While definitely a bug, this hasn't been a problem so far since the kernel hasn't used version 3 or 4 SET and UNSET. But this will change in just a moment. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 7e2225d860772aaa07e1cebca6a5aa6f93f9aa91 Merge: 3a628b0... b27418a... Author: Linus Torvalds Date: Tue Jul 15 15:01:29 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: (54 commits) [MIPS] Remove mips_machtype for LASAT machines [MIPS] Remove mips_machtype from EMMA2RH machines [MIPS] Remove mips_machtype from ARC based machines [MIPS] MTX-1 flash partition setup move to platform devices registration [MIPS] TXx9: cleanup and fix some sparse warnings [MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx [MIPS] remove machtype for group Toshiba [MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() [MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() [MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() [MIPS] txx9_board_vec set directly without mips_machtype [MIPS] IP22: Add platform device for Indy volume buttons [MIPS] cmbvr4133: Remove support [MIPS] remove wrppmc_machine_power_off() [MIPS] replace inline assembler to cpu_wait() [MIPS] IP22/28: Add platform devices for HAL2 [MIPS] TXx9: Update and merge defconfigs [MIPS] TXx9: Make single kernel can support multiple boards [MIPS] TXx9: Update defconfigs [MIPS] TXx9: Reorganize PCI code ... commit 3a628b0fd42f7eaf9d052447784d48ceae9ffb8e Author: Mikulas Patocka Date: Tue Jul 15 17:19:55 2008 -0400 Don't crash on IOMMU overflow in A100U2W driver Handle IOMMU overflow correctly, by retrying. IOMMU errors can happen and drivers must deal with them. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit a5db33411ae762e597bfcde6bb9d0c8c2ea9c0eb Author: Mikulas Patocka Date: Tue Jul 15 17:18:38 2008 -0400 BUG_ON on kernel misbehavior on A100U2W driver With broken Sparc64 IOMMU accounting, the kernel submits larger requests then allowed. Better to crash on BUG than corrupt memory. Signed-off-by: Mikulas Patocka Acked-by: James Bottomley Signed-off-by: Linus Torvalds commit 56d387ec210049be2fdb0fe26ba6d6de1b3c1b15 Author: Mikulas Patocka Date: Tue Jul 15 17:16:38 2008 -0400 Add udelay to A100U2W SCSI driver udelay is required on Sun Ultra 5. I don't know any reason or explanation for this, it was found purely experimentally. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit 987ff954cda2a206f5e694f267b0ccad869c257c Author: Mikulas Patocka Date: Tue Jul 15 17:15:41 2008 -0400 Fix endianity in A100U2W SCSI driver Support big endian systems in a100u2w driver. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit 63cf13b77ab785e87c867defa8545e6d4a989774 Author: Jeremy Fitzhardinge Date: Tue Jul 15 13:22:49 2008 -0700 generic ipi function calls: wait on alloc failure fallback When a GFP_ATOMIC allocation fails, it falls back to allocating the data on the stack and converting it to a waiting call. Make sure we actually wait in this case. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit 59190f4213462f191fc0d22d39b1cf18ea39ca39 Merge: 64fd52a... f6f88e9... Author: Linus Torvalds Date: Tue Jul 15 14:02:33 2008 -0700 Merge branch 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits) generic-ipi: more merge fallout generic-ipi: merge fix x86, visws: use mach-default/entry_arch.h x86, visws: fix generic-ipi build generic-ipi: fixlet generic-ipi: fix s390 build bug generic-ipi: fix linux-next tree build failure fix: "smp_call_function: get rid of the unused nonatomic/retry argument" fix: "smp_call_function: get rid of the unused nonatomic/retry argument" fix "smp_call_function: get rid of the unused nonatomic/retry argument" on_each_cpu(): kill unused 'retry' parameter smp_call_function: get rid of the unused nonatomic/retry argument sh: convert to generic helpers for IPI function calls parisc: convert to generic helpers for IPI function calls mips: convert to generic helpers for IPI function calls m32r: convert to generic helpers for IPI function calls arm: convert to generic helpers for IPI function calls alpha: convert to generic helpers for IPI function calls ia64: convert to generic helpers for IPI function calls powerpc: convert to generic helpers for IPI function calls ... Fix trivial conflicts due to rcu updates in kernel/rcupdate.c manually commit 64fd52a52077d3cd5a778ca031c0aaecf885eaa6 Merge: fe1a687... 6c9fcaf... Author: Linus Torvalds Date: Tue Jul 15 13:59:31 2008 -0700 Merge branch 'core/rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core/rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (23 commits) rcu classic: update qlen when cpu offline rcu: make rcutorture even more vicious: invoke RCU readers from irq handlers (timers) rcu: make quiescent rcutorture less power-hungry rcu, rcutorture: make quiescent rcutorture less power-hungry rcu: make rcutorture more vicious: reinstate boot-time testing rcu: make rcutorture more vicious: add stutter feature rcutorture: WARN_ON_ONCE(1) when detecting an error rcu: remove unused field struct rcu_data::rcu_tasklet Revert "prohibit rcutorture from being compiled into the kernel" rcu: fix nf_conntrack_helper.c build bug rculist.h: fix include in net/netfilter/nf_conntrack_netlink.c rcu: remove duplicated include in kernel/rcupreempt.c rcu: remove duplicated include in kernel/rcupreempt_trace.c RCU, rculist.h: fix list iterators rcu: fix rcu_try_flip_waitack_needed() to prevent grace-period stall rculist.h: use the rcu API rcu: split list.h and move rcu-protected lists into rculist.h sched: 1Q08 RCU doc update, add call_rcu_sched() rcu: add call_rcu_sched() and friends to rcutorture rcu: add rcu_barrier_sched() and rcu_barrier_bh() ... commit fe1a6875fcaaac2041945008a9875d2c07be1d9b Author: Sebastian Siewior Date: Tue Jul 15 22:28:46 2008 +0200 mm: fix build on non-mmu machines Commit 1ea0704e0d aka "mm: add a ptep_modify_prot transaction abstraction" caused: | CC init/main.o |In file included from include2/asm/pgtable.h:68, | from /home/bigeasy/git/linux-2.6-m68k/include/linux/mm.h:39, | from include2/asm/uaccess.h:8, | from /home/bigeasy/git/linux-2.6-m68k/include/linux/poll.h:13, | from /home/bigeasy/git/linux-2.6-m68k/include/linux/rtc.h:113, | from /home/bigeasy/git/linux-2.6-m68k/include/linux/efi.h:19, | from /home/bigeasy/git/linux-2.6-m68k/init/main.c:43: |/linux-2.6/include/asm-generic/pgtable.h: In function '__ptep_modify_prot_start': |/linux-2.6/include/asm-generic/pgtable.h:209: error: implicit declaration of function 'ptep_get_and_clear' |/linux-2.6/include/asm-generic/pgtable.h:209: error: incompatible types in return |/linux-2.6/include/asm-generic/pgtable.h: In function '__ptep_modify_prot_commit': |/linux-2.6/include/asm-generic/pgtable.h:220: error: implicit declaration of function 'set_pte_at' |make[2]: *** [init/main.o] Error 1 |make[1]: *** [init] Error 2 |make: *** [sub-make] Error 2 on my m68knommu box. Acked-by: Jeremy Fitzhardinge Cc: Linus Torvalds Cc: Hugh Dickins Cc: Ingo Molnar Signed-off-by: Sebastian Siewior Signed-off-by: Linus Torvalds commit de3b69d7d87e1e86c0307f0f15b377dcebeab906 Author: Steven Rostedt Date: Tue Jul 15 13:28:14 2008 -0400 ftrace: maintainer I'm willing to take responsibility for ftrace, and follow up on any issues that arise due to it. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 431ceb83f703a343bdd14350480a2224fa4bfedf Author: Thomas Gleixner Date: Tue Jul 15 22:08:04 2008 +0200 x86: fix TSC build error on 32bit Dave Hansen reported a build error on 32bit which went unnoticed as newer gcc versions seem to optimize unused static functions away before compiling them. Make vread_tsc() depend on CONFIG_X86_64 Signed-off-by: Thomas Gleixner commit 367c8c7bd9a2882daad6c9cb607e1db8ef781ad4 Author: Chuck Lever Date: Mon Jun 30 18:58:14 2008 -0400 lockd: Pass "struct sockaddr *" to new failover-by-IP function Pass a more generic socket address type to nlmsvc_unlock_all_by_ip() to allow for future support of IPv6. Also provide additional sanity checking in failover_unlock_ip() when constructing the server's IP address. As an added bonus, provide clean kerneldoc comments on related NLM interfaces which were recently added. Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields commit f6f88e9bfb6ced9871ed65ebe85c371de3c9e4be Author: Ingo Molnar Date: Tue Jul 15 22:08:52 2008 +0200 generic-ipi: more merge fallout fix more API change fallout in recently merged upstream changes. Signed-off-by: Ingo Molnar commit b3c9816b9fa9a7b75ab36111eb76eca03e5bab78 Author: Ingo Molnar Date: Tue Jul 15 22:03:56 2008 +0200 generic-ipi: merge fix fix merge fallout: arch/x86/pci/amd_bus.c: In function ‘enable_pci_io_ecs': arch/x86/pci/amd_bus.c:581: error: too many arguments to function ‘on_each_cpu' Signed-off-by: Ingo Molnar commit 1a781a777b2f6ac46523fe92396215762ced624d Merge: b9d2252... 42a2f21... Author: Ingo Molnar Date: Tue Jul 15 21:55:59 2008 +0200 Merge branch 'generic-ipi' into generic-ipi-for-linus Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar commit 560de0e65904db392e1c443c4bf5ee750573336b Author: J. Bruce Fields Date: Tue Jul 15 15:05:45 2008 -0400 lockd: get host reference in nlmsvc_create_block() instead of callers It may not be obvious (till you look at the definition of nlm_alloc_call()) that a function like nlmsvc_create_block() should consume a reference on success or failure, so I find it clearer if it takes the reference it needs itself. And both callers already do this immediately before the call anyway. Signed-off-by: J. Bruce Fields commit 22a37bcb7857541eb2d37806c4744ee2530baa98 Merge: 849c529... 82f06e8... Author: Linus Torvalds Date: Tue Jul 15 12:39:44 2008 -0700 Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: sbp2: spin disks down on suspend and shutdown firewire: fw-sbp2: spin disks down on suspend and shutdown ieee1394: sbp2: fix spindown for PL-3507 and TSB42AA9 firmwares firewire: fw-sbp2: fix spindown for PL-3507 and TSB42AA9 firmwares scsi: sd: optionally set power condition in START STOP UNIT commit 849c529f57020cc47085400edd5e641d95cd4faf Merge: b9d2252... a7ea678... Author: Linus Torvalds Date: Tue Jul 15 12:39:13 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: don't respond to broadcast write requests firewire: clean up fw_card reference counting firewire: clean up some includes firewire: remove unused struct members firewire: implement broadcast_channel CSR for 1394a compliance ieee1394: dump mmapped iso buffers in core files ieee1394: raw1394: Push the BKL down into the driver ioctls ieee1394: video1394: reorder module init, prepare BKL removal ieee1394: reduce log noise about config ROM CRC errors commit 6d7bbbbacc5202eaabbc232681cc325b22a73eeb Author: J. Bruce Fields Date: Tue Jul 15 14:38:32 2008 -0400 lockd: minor svclock.c style fixes Signed-off-by: J. Bruce Fields commit 6c9fcaf2eec1b9f85226a694230dd957dd7926b3 Merge: b9d2252... 199a952... Author: Ingo Molnar Date: Tue Jul 15 21:10:12 2008 +0200 Merge branch 'core/rcu' into core/rcu-for-linus commit 6cde4de80773497d8333985b135f472eda870904 Author: Jeff Layton Date: Tue Jul 15 14:26:17 2008 -0400 lockd: eliminate duplicate nlmsvc_lookup_host call from nlmsvc_lock nlmsvc_lock calls nlmsvc_lookup_host to find a nlm_host struct. The callers of this function, however, call nlmsvc_retrieve_args or nlm4svc_retrieve_args, which also return a nlm_host struct. Change nlmsvc_lock to take a host arg instead of calling nlmsvc_lookup_host itself and change the callers to pass a pointer to the nlm_host they've already found. Since nlmsvc_testlock() now just uses the caller's reference, we no longer need to get or release it. Signed-off-by: Jeff Layton Signed-off-by: J. Bruce Fields commit 417e1494fd70715b737428cc3c3d924255f22ba1 Author: Larry Finger Date: Tue Jul 15 11:30:00 2008 -0500 pcmcia: ide-cs: Remove outdated comment There is an outdated version information comment in ide-cs. Signed-off-by: Larry Finger Signed-off-by: Dominik Brodowski commit 002b90a1bf5fe9c8de7a8634403a685621841ff3 Author: Marc Zyngier Date: Tue Jul 15 15:26:15 2008 +0200 pcmcia: fix cisinfo_t removal The cisinfo_t removal patch (c5081d5f4775b2a3f858f91151bbf9163e473075 pcmcia: simplify pccard_validate_cis ) introduced a bug that prevented card detection, for the (info->Chains == MAX_TUPLES) check was replaced by (count), which is always true. Restoring the comparison to MAX_TUPLES makes everybody happy... [linux@dominikbrodowski.net: update changelog comment] Signed-off-by: Marc Zyngier Signed-off-by: Dominik Brodowski commit d93c768e66d8c3970187c179a91a2553b077d9e8 Author: Dominik Brodowski Date: Tue Jul 15 20:11:21 2008 +0200 pcmcia: fix return value in cm4000_cs.c should be -EINVAL, not EINVAL. Found by Peter Stuge. Signed-off-by: Dominik Brodowski commit 8f920d5e29f86d3425a68e1c3bc264d1f6f55112 Author: Jeff Layton Date: Tue Jul 15 14:06:48 2008 -0400 lockd: eliminate duplicate nlmsvc_lookup_host call from nlmsvc_testlock nlmsvc_testlock calls nlmsvc_lookup_host to find a nlm_host struct. The callers of this functions, however, call nlmsvc_retrieve_args or nlm4svc_retrieve_args, which also return a nlm_host struct. Change nlmsvc_testlock to take a host arg instead of calling nlmsvc_lookup_host itself and change the callers to pass a pointer to the nlm_host they've already found. We take a reference to host in the place where nlmsvc_testlock() previous did a new lookup, so the reference counting is unchanged from before. Signed-off-by: Jeff Layton Signed-off-by: J. Bruce Fields commit b9d2252c1e44fa83a4e65fdc9eb93db6297c55af Merge: b312bf3... e79aec2... Author: Linus Torvalds Date: Tue Jul 15 11:26:14 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slab: rename slab_destroy_objs slub: current is always valid slub: Add check for kfree() of non slab objects. commit b312bf359e20cc39c00d480fd40a24c245d80bf7 Merge: dc221ea... 2640d7c... Author: Linus Torvalds Date: Tue Jul 15 11:18:10 2008 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: AHCI: Remove an unnecessary flush from ahci_qc_issue AHCI: speed up resume [libata] Add support for VPD page b1 ata: endianness annotations in pata drivers libata-eh: update atapi_eh_request_sense() to take @dev instead of @qc [libata] sata_svw: update code comments relating to data corruption libata/ahci: enclosure management support libata: improve EH internal command timeout handling libata: use ULONG_MAX to terminate reset timeout table libata: improve EH retry delay handling libata: consistently use msecs for time durations commit dc221eae08eea3b0db127d1f152fac24d10b6a52 Merge: 98339cb... 4735c98... Author: Linus Torvalds Date: Tue Jul 15 11:16:05 2008 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (56 commits) i2c: Add detection capability to new-style drivers i2c: Call client_unregister for new-style devices too i2c: Clean up old chip drivers i2c-ibm_iic: Register child nodes i2c: New-style EEPROM driver using device IDs i2c: Export the i2c_bus_type symbol i2c-au1550: Fix PM support i2c-dev: Delete empty detach_client callback i2c: Drop stray references to lm_sensors i2c: Check for ACPI resource conflicts i2c-ocores: basic PM support i2c-sibyte: SWARM I2C board initialization i2c-i801: Fix handling of error conditions i2c-i801: Rename local variable temp to status i2c-i801: Properly report bus arbitration loss i2c-i801: Remove verbose debugging messages i2c-algo-pcf: Drop unused struct members i2c-algo-pcf: Multi-master lost-arbitration improvement i2c: Deprecate the legacy gpio drivers i2c-pxa: Initialize early ... commit 98339cbd360b77c3167db287fd611468c2c44559 Merge: e4e0fad... cbbc4e8... Author: Linus Torvalds Date: Tue Jul 15 11:15:36 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: (80 commits) ide-floppy: fix unfortunate function naming ide-tape: unify idetape_create_read/write_cmd ide: add ide_pc_intr() helper ide-{floppy,scsi}: read Status Register before stopping DMA engine ide-scsi: add more debugging to idescsi_pc_intr() ide-scsi: use pc->callback ide-floppy: add more debugging to idefloppy_pc_intr() ide-tape: always log debug info in idetape_pc_intr() if debugging is enabled ide-tape: add ide_tape_io_buffers() helper ide-tape: factor out DSC handling from idetape_pc_intr() ide-{floppy,tape}: move checking of ->failed_pc to ->callback ide: add ide_issue_pc() helper ide: add PC_FLAG_DRQ_INTERRUPT pc flag ide-scsi: move idescsi_map_sg() call out from idescsi_issue_pc() ide: add ide_transfer_pc() helper ide-scsi: set drive->scsi flag for devices handled by the driver ide-{cd,floppy,tape}: remove checking for drive->scsi ide: add PC_FLAG_ZIP_DRIVE pc flag ide-tape: factor out waiting for good ireason from idetape_transfer_pc() ide-tape: set PC_FLAG_DMA_IN_PROGRESS flag in idetape_transfer_pc() ... commit cbbc4e818de4451cdef75a112b7fc8a523d5d2a0 Author: Borislav Petkov Date: Tue Jul 15 21:22:03 2008 +0200 ide-floppy: fix unfortunate function naming mv idefloppy_transfer_pc1 idefloppy_start_pc_transfer mv idefloppy_transfer_pc2 idefloppy_transfer_pc which describes their functionality and disambiguates them. There should be no functionality change introduced by this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit cd2abbfec84f43db740483daf4ea528d49d8858f Author: Borislav Petkov Date: Tue Jul 15 21:22:03 2008 +0200 ide-tape: unify idetape_create_read/write_cmd A straightforward one. There should be no functional change resulting from this change. [bart: minor fixups] Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 646c0cb6c430f8d3ad3769dd1518fe664ff0ce27 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:03 2008 +0200 ide: add ide_pc_intr() helper * ide-tape.c: add 'drive' argument to idetape_update_buffers(). * Add generic ide_pc_intr() helper to ide-atapi.c and then convert ide-{floppy,tape,scsi} device drivers to use it. * ide-tape.c: remove no longer needed DBG_PC_INTR. There should be no functional changes caused by this patch (unless the debugging is explicitely compiled in). Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 55d82bfa6763d6761670d740ab3bac2f1c042d87 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:03 2008 +0200 ide-{floppy,scsi}: read Status Register before stopping DMA engine Read Status Register before stopping DMA engine to match ide-tape device driver - it should be safe and shouldn't affect anything. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit cdca5c1f3b769eb2cdfc9cadc254cb74ba73c7d6 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:02 2008 +0200 ide-scsi: add more debugging to idescsi_pc_intr() Add more debugging to idescsi_pc_intr() to match ide-tape's idetape_pc_intr(). While at it: * Correct the first debug message. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit c6b2d260b5a7a5ed32aa2ce370d81183fc37eeb1 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:02 2008 +0200 ide-scsi: use pc->callback * Add ide_scsi_callback() pc->callback implementation, then update idescsi_check_condition() and idescsi_queue() to setup ->callback. * Convert idescsi_pc_intr() to use pc->callback. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4c93067ea9e5eca9d975bec74dae641228ac1bbe Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:02 2008 +0200 ide-floppy: add more debugging to idefloppy_pc_intr() Add more debugging to idefloppy_pc_intr() to match ide-tape's idetape_pc_intr(). While at it: * Correct the first debug message. * Log device name with "DMA finished" message. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3e421d324c003f8f002f402141b15d758adbfaef Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:01 2008 +0200 ide-tape: always log debug info in idetape_pc_intr() if debugging is enabled Add DBG_PC_INTR debug level and use it to always log debug info in idetape_pc_intr() if debugging is enabled. While at it: * Use drive->name instead of tape->name. * Log device name with "DMA finished" message. This is a preparation for adding generic ide_pc_intr() helper. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 08424ac24a35b505463919a897b097f27e4dca96 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:01 2008 +0200 ide-tape: add ide_tape_io_buffers() helper * Add ide_tape_io_buffers() helper which is a wrapper for idetape_{in,out}put_buffers() and convert idetape_pc_intr() to use it. * Remove no longer used idetape_io_buf typedef. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz --- commit 74e63e74ea57e06839aa5fcf016eace35da26050 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:01 2008 +0200 ide-tape: factor out DSC handling from idetape_pc_intr() Factor out DSC handling from idetape_pc_intr() to ide_tape_handle_dsc() helper as a preparation for adding generic ide_pc_intr() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit dd2e9a032bc552f6e2ae852e81cde602c09d7d3e Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:01 2008 +0200 ide-{floppy,tape}: move checking of ->failed_pc to ->callback Move checking/resetting of ->failed_pc from ide*_pc_intr() to ->callback as a preparation for adding generic ide_pc_intr() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz --- commit 6bf1641ca1c7554f0da54aaf89788731b541bacc Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:22:00 2008 +0200 ide: add ide_issue_pc() helper Add generic ide_issue_pc() helper to ide-atapi.c and then convert ide-{floppy,tape,scsi} device drivers to use it. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 28c7214bd8c2bbd4873b8f1e7f58d86d3731124f Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:59 2008 +0200 ide: add PC_FLAG_DRQ_INTERRUPT pc flag Add PC_FLAG_DRQ_INTERRUPT pc flag, set it in ide*_do_request() and check for it (instead of checking for IDE*_FLAG_DRQ_INTERRUPT) in ide*_issue_pc(). This is a preparation for adding generic ide_issue_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4cc196897de9e6c02cf86debc5b9f7cf1b69a214 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:58 2008 +0200 ide-scsi: move idescsi_map_sg() call out from idescsi_issue_pc() Move idescsi_map_sg() call out from idescsi_issue_pc() to idescsi_do_request() as a preparation to adding generic ide_issue_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 594c16d8dd54cd7b1c5ef1ec3ac0f6bf34301dad Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:58 2008 +0200 ide: add ide_transfer_pc() helper * Add ide-atapi.c file for generic ATAPI support together with CONFIG_IDE_ATAPI config option. * Add generic ide_transfer_pc() helper to ide-atapi.c and then convert ide-{floppy,tape,scsi} device drivers to use it. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit f83cbc77b0d5521b4f0f591ede4870316944481a Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:58 2008 +0200 ide-scsi: set drive->scsi flag for devices handled by the driver This is a preparation for adding generic ide_transfer_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 794cc6804bb946826b7427d205ac391a5370d361 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:57 2008 +0200 ide-{cd,floppy,tape}: remove checking for drive->scsi Remove checking for drive->scsi which is no longer set by IDE core code (leave the flag since it will be re-used for generic ATAPI support). Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5d41893c0f9caf94b449eada0279a08c86f0212e Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:57 2008 +0200 ide: add PC_FLAG_ZIP_DRIVE pc flag Add PC_FLAG_ZIP_DRIVE pc flag, set it in idefloppy_do_request() and check for it (instead of checking for IDEFLOPPY_FLAG_ZIP_DRIVE) in idefloppy_transfer_pc(). This is a preparation for adding generic ide_transfer_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5a7b75ab429e9ed568be50cfbf7091f097457cb8 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:57 2008 +0200 ide-tape: factor out waiting for good ireason from idetape_transfer_pc() Factor out waiting for good ireason from idetape_transfer_pc() to ide_tape_wait_ireason() as a preparation for adding generic ide_transfer_pc() helper. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 9fd13a27c8a35ff1986793cb96aaedb5e75b5368 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:57 2008 +0200 ide-tape: set PC_FLAG_DMA_IN_PROGRESS flag in idetape_transfer_pc() Set PC_FLAG_DMA_IN_PROGRESS flag in idetape_transfer_pc() instead of idetape_issue_pc() to match the other ATAPI device drivers. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 6ffb66410dd9f5f383d9265d51ab667333a8296c Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:56 2008 +0200 ide-floppy: start DMA engine in idefloppy_transfer_pc1() Start DMA engine and set PC_FLAG_DMA_IN_PROGRESS flag in idefloppy_transfer_pc1() instead of idefloppy_issue_pc() so the Status Register and the Interrupt Reason Register are checked first. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5e3310958204912f3f00be2592c945fbc37db6ae Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:56 2008 +0200 ide-{floppy,tape}: PC_FLAG_DMA_RECOMMENDED -> PC_FLAG_DMA_OK * Use PC_FLAG_DMA_OK flag instead of PC_FLAG_DMA_RECOMMENDED one. * Remove no longer used PC_FLAG_DMA_RECOMMENDED flag. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 1b06e92aa03018e4b3ba281e03a7711d9b71a998 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:56 2008 +0200 ide-{floppy,tape}: merge pc->idefloppy_callback and pc->idetape_callback Merge pc->idefloppy_callback and pc->idetape_callback into pc->callback. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 81f4938239fea86d0a7529194a37fb81041171e0 Author: Borislav Petkov Date: Tue Jul 15 21:21:56 2008 +0200 ide-floppy: merge callbacks The appropriate functionality of the callback is established through querying the ATAPI packet command in pc->c[0]. While at it, simplify if (floppy->failed_pc)-branch to be found in the original idefloppy_request_sense_callback(). Bart: - keep handling for blk_pc_request() requests unchanged + add FIXME - add uptodate variable + leave just one idefloppy_end_request() call - add newline to the debug message Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 92f5daff2b8439fa4c57c57f47823ffc459c3bd9 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:55 2008 +0200 ide-tape: make pc->idetape_callback void There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 5985e6abbd89f969c17fd80ab864c80f089827a3 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:55 2008 +0200 ide-tape: merge callbacks The appropriate functionality of the callback is established through querying the ATAPI packet command in pc->c[0]. While at it: - add uptodate variable + leave just one idetape_end_request() call - don't use HWGROUP() macro Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 258ec4113081c2b63117dc2df6d94c3e484e9747 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:55 2008 +0200 ide-tape: make idetape_retry_pc() void idetape_retry_pc() always returns ide_stopped so make it void. There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 568ca92774d2f6be4a7e2f8357559bfdc9424056 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-{floppy,tape,scsi}: log device name instead of driver name Log device name instead of driver name in *_pc_intr() and *_transfer_pc*(). While at it: * Merge two consecutive printk()-s in *_pc_intr() together. * Replace "floppy"/"tape"/"scsi" references in printk()-s by "device". Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 0b2eea4c5594ceaf13c57eaff7ff226263f1c36f Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-floppy: merge idefloppy_transfer_pc() and idefloppy_transfer_pc1() * Check IDEFLOPPY_FLAG_ZIP_DRIVE flag in idefloppy_transfer_pc1() and skip idefloppy_transfer_pc2()-phase if the flag is not set. * Always use idefloppy_transfer_pc1() in idefloppy_issue_pc() and remove no longer needed idefloppy_transfer_pc(). There should be no functional changes caused by this patch. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 170ee569bbe1005baebf2e9e4c3f4622d14ec851 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-tape: remove SIMULATE_ERRORS debug code Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 531e9e50543ebf562237b8ac64529ae09b344a43 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-tape: remove stale comments from idetape_pc_intr() Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 91395a16309596c2e78439aa5f9f6004f0365ef9 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:54 2008 +0200 ide-tape: remove unneeded CONFIG_BLK_DEV_IDEDMA ifdef PC_FLAG_DMA_IN_PROGRESS flag is never set if DMA support is disabled. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 6bd3b0bfb8fccdcce3b8524d6761e0a3ab6e23f0 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:53 2008 +0200 ide-tape: remove superfluous warning message from idetape_issue_pc() ide_dma_off() prints info about DMA being disabled. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 1e049a8ea190b7cc22320c7797b36b2c6128c9c5 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:53 2008 +0200 ide-tape: remove superfluous error message from idetape_pc_intr() ide_dma_off() prints info about DMA being disabled. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 87429bdc2e0701fa33a455297de01e79797b4210 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:53 2008 +0200 ide-tape: idetape_pc_intr() should use local_irq_enable_in_hardirq() Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 43a2b5b29385a3e0997a47c86f286d3645e5cb44 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 15 21:21:52 2008 +0200 ide-scsi: add debug_log() macro Add debug_log() macro and convert the driver to use it. [ This makes debug messages to be always prefixed with "ide-scsi: " and use KERN_INFO level. ]