commit de372ecd80a42c4fb485c7232475301a18d05184 Author: H. Peter Anvin Date: Tue May 8 20:37:02 2007 -0700 Documentation/i386/boot.txt: update and correct In the process of rewriting the x86 setup code, I found a number of inaccuracies and outdated recommendations in the boot protocol documentation. Revamp to make it more up to date. In particular, the common use of the heap actually requires (slightly) more than 4K of heap plus stack, which is the recommended amount in the document; currently the code compensates by being smaller than specified, but we can't assume that will be true forever. Thus, recommend that if we have a modern bzImage kernel, that the bootloader maximizes the available space. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit d5f9f942c601fdebe57f7805e4b4fbad9c28ada8 Author: Andrew Morton Date: Tue May 8 20:27:06 2007 -0700 revert 'sched: redundant reschedule when set_user_nice() boosts a prio of a task from the "expired" array' Revert commit bd53f96ca54a21c07e7a0ae1886fa623d370b85f. Con says: This is no good, sorry. The one I saw originally was with the staircase deadline cpu scheduler in situ and was different. #define TASK_PREEMPTS_CURR(p, rq) \ ((p)->prio < (rq)->curr->prio) (((p)->prio < (rq)->curr->prio) && ((p)->array == (rq)->active)) This will fail to wake up a runqueue for a task that has been migrated to the expired array of a runqueue which is otherwise idle which can happen with smp balancing, Cc: Dmitry Adamushko Cc: Con Kolivas Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da4e8ca376a1b3dca470eba14dcec321a6a27b8b Author: Jean Delvare Date: Tue May 8 20:27:05 2007 -0700 applesmc: Use standard sysfs names for labels We have a standard suffix to associate a designation string to a sensor: _label. Use it instead of _position so that libsensors will catch it. (This isn't implemented yet, but should be soon.) Signed-off-by: Jean Delvare Cc: Nicolas Boichat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddfbf2afd538b38139267f71a185eb9434465440 Author: Jean Delvare Date: Tue May 8 20:27:04 2007 -0700 applesmc: Use the address as platform device ID Let the applesmc device export its address to userspace. libsensors needs this to recognize the device and give it a unique ID. Signed-off-by: Jean Delvare Cc: Nicolas Boichat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21d364954f5a2a97b4e378f34a13fbf296aa16ec Author: Tilman Schmidt Date: Tue May 8 20:27:03 2007 -0700 usb_gigaset: don't kmalloc(0) Zero-sized allocations are pointless anyway, and the SLUB allocator complains about them, so stop doing that. Signed-off-by: Tilman Schmidt Signed-off-by: Hansjoerg Lipp Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b590d2baf17f8890f648e76436abdb8674d564eb Author: Geert Uytterhoeven Date: Tue May 8 20:27:03 2007 -0700 m68k: needs The recent cleanup uncovered that include/asm-m68k/scatterlist.h needs to include Signed-off-by: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5616df204ecf164ef2b124a17fd3cadd87954628 Author: David Howells Date: Tue May 8 20:27:02 2007 -0700 FRV: Miscellaneous fixes Miscellaneous fixes to bring FRV up to date: (1) Copy the new syscall numbers from i386 to asm-frv/unistd.h and fill out the syscall table in entry.S too. (2) Mark __frv_uart0 and __frv_uart1 __pminitdata rather than __initdata so that determine_clocks() can access them when CONFIG_PM=y. (3) Make arch/frv/mm/elf-fdpic.c include asm/mman.h so that MAP_FIXED is available (fixes commit 2fd3bebaad9da3b3b99c46a3389099424bf7ee35). Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b8df8915a6980f476e1fa8f4d156e36cb63bf76 Author: David Rientjes Date: Tue May 8 20:27:01 2007 -0700 smaps: only define clear_refs for CONFIG_MMU /proc/pid/clear_refs is only defined in the CONFIG_MMU case, so make sure we don't have any references to clear_refs_smap() in generic procfs code. Signed-off-by: David Rientjes Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e81ab9d3d9a22fb7b20c56f0cabc8ef51954014 Author: Yasunori Goto Date: Tue May 8 20:27:01 2007 -0700 Fix unnecesary meminit This is to fix unnecessary __meminit definition. These are exported for kernel modules. I compiled on ia64/x86-64 with memory hotplug on/off. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4ebc993759dc25dc3db6b6f1a13a23df8264d4b Merge: 0c23664... 1605b84... Author: Linus Torvalds Date: Tue May 8 20:33:59 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] cryptomgr: Fix use after free commit 0c23664ee8c42f247dba7ceb620baabd892cef88 Merge: 6ec129c... 127cda1... Author: Linus Torvalds Date: Tue May 8 20:32:43 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Optimize fault kprobe handling just like powerpc. [SPARC]: Wire up utimensat syscall. [SPARC64]: Fix request_irq() ignored result warnings in PCI controller code. [SPARC64]: Kill asm-sparc64/pbm.h [ATYFB]: Fix sparc includes. [QLA2XXX]: Fix build on sparc. [SPARC64]: Removal of trivial pci_controller_info uses. [SPARC64]: Move index info pci_pbm_info. [SPARC64]: Move {setup,teardown}_msi_irq into pci_pbm_info. [SPARC64]: Move pci_ops into pci_pbm_info. [SPARC64] SBUS: Error interrupt registry cleanups. [SPARC64] PCI: Use root list of pbm's instead of pci_controller_info's [SPARC64] PCI: Kill PROM_PCIRNG_MAX and PROM_PCIIMAP_MAX. [SPARC64] PCI: Use common routine to fetch PBM properties. commit 6ec129c3a2f8b38bc37e42348470ccfcb7460146 Merge: 01e73be... b64ddf9... Author: Linus Torvalds Date: Tue May 8 20:32:16 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (58 commits) [SCSI] zfcp: clear boxed flag on unit reopen. [SCSI] zfcp: clear adapter failed flag if an fsf request times out. [SCSI] zfcp: rework request ID management. [SCSI] zfcp: Fix deadlock between zfcp ERP and SCSI [SCSI] zfcp: Locking for req_no and req_seq_no [SCSI] zfcp: print S_ID and D_ID with 3 bytes [SCSI] ipr: Use PCI-E reset API for new ipr adapter [SCSI] qla2xxx: Update version number to 8.01.07-k7. [SCSI] qla2xxx: Add MSI support. [SCSI] qla2xxx: Correct pci_set_msi() usage semantics. [SCSI] qla2xxx: Attempt to stop firmware only if it had been previously executed. [SCSI] qla2xxx: Honor NVRAM port-down-retry-count settings. [SCSI] qla2xxx: Error-out during probe() if we're unable to complete HBA initialization. [SCSI] zfcp: Stop system after memory corruption [SCSI] mesh: cleanup variable usage in interrupt handler [SCSI] megaraid: replace yield() with cond_resched() [SCSI] megaraid: fix warnings when CONFIG_PROC_FS=n [SCSI] aacraid: correct SUN products to README [SCSI] aacraid: superfluous adapter reset for IBM 8 series ServeRAID controllers [SCSI] aacraid: kexec fix (reset interrupt handler) ... commit 01e73be3c8f254ef19d787f9b6757468175267eb Author: Linus Torvalds Date: Tue May 8 20:12:30 2007 -0700 Revert "fbdev: ignore VESA modes if framebuffer is disabled" This reverts commit 464bdd33e9baad9806c7adbd8dfc37081a55f27e. Peter Anvin correctly points out that VESA modes have nothing to do with frame buffers per se - they are often just regular extended text modes. Disabling them just because we don't have frame buffer support is very wrong. Cc: H. Peter Anvin Cc: Antonino A. Daplas , Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 7b82dc0e64e93f430182f36b46b79fcee87d3532 Author: Linus Torvalds Date: Tue May 8 20:10:00 2007 -0700 Remove suid/sgid bits on [f]truncate() .. to match what we do on write(). This way, people who write to files by using [f]truncate + writable mmap have the same semantics as if they were using the write() family of system calls. Signed-off-by: Linus Torvalds commit 1605b8471d64c855bc2493abf3adf6a1ebc3e645 Author: Herbert Xu Date: Wed May 9 13:04:39 2007 +1000 [CRYPTO] cryptomgr: Fix use after free By the time kthread_run returns the param may have already been freed so writing the returned thread_struct pointer to param is wrong. In fact, we don't need it in param anyway so this patch simply puts it on the stack. Signed-off-by: Herbert Xu commit 127cda1e8cc282de1ca7a9dcc3866841977b9fcc Author: David S. Miller Date: Tue May 8 18:25:14 2007 -0700 [SPARC64]: Optimize fault kprobe handling just like powerpc. And eliminate DIE_GPF while we're at it. Signed-off-by: David S. Miller commit 6c1142602c9c8faedbc1321892a169652a173fc7 Author: David S. Miller Date: Tue May 8 17:50:14 2007 -0700 [SPARC]: Wire up utimensat syscall. Signed-off-by: David S. Miller commit af80318eb71e234a59957cd1d2d7c3fa2ea27313 Author: David S. Miller Date: Tue May 8 17:23:31 2007 -0700 [SPARC64]: Fix request_irq() ignored result warnings in PCI controller code. Signed-off-by: David S. Miller commit c57c2ffb153a99769a15a2ff1729371ddee5601a Author: David S. Miller Date: Tue May 8 00:43:56 2007 -0700 [SPARC64]: Kill asm-sparc64/pbm.h Everything it contains can be hidden in pci_impl.h Signed-off-by: David S. Miller commit 63c3f460cb47c2e06f1726e18534d0e1fe8652a7 Author: David S. Miller Date: Tue May 8 00:37:23 2007 -0700 [ATYFB]: Fix sparc includes. No need to use asm/pbm.h here. Signed-off-by: David S. Miller commit 15576bc8adb33d58867942385ae849cc48379610 Author: David S. Miller Date: Tue May 8 00:36:49 2007 -0700 [QLA2XXX]: Fix build on sparc. We now use pci_device_to_OF_node() to get properties and of_get_property() returns const pointers. Signed-off-by: David S. Miller commit 28113a9941c8cb6ca90ab4a66876db84342a084b Author: David S. Miller Date: Tue May 8 00:19:02 2007 -0700 [SPARC64]: Removal of trivial pci_controller_info uses. Signed-off-by: David S. Miller commit 6c108f1299754877bb5f73ccac5621eb603b97eb Author: David S. Miller Date: Mon May 7 23:49:01 2007 -0700 [SPARC64]: Move index info pci_pbm_info. Signed-off-by: David S. Miller commit e9870c4c0aef94580e28be11a1c6246dcabbe528 Author: David S. Miller Date: Mon May 7 23:28:50 2007 -0700 [SPARC64]: Move {setup,teardown}_msi_irq into pci_pbm_info. Signed-off-by: David S. Miller commit f1cd8de2c951e206b57fd76aff279cf13ea25815 Author: David S. Miller Date: Mon May 7 23:24:05 2007 -0700 [SPARC64]: Move pci_ops into pci_pbm_info. Signed-off-by: David S. Miller commit 96a496fd49fb2c3178128237ae4691b7c7df3a3d Author: David S. Miller Date: Mon May 7 23:08:39 2007 -0700 [SPARC64] SBUS: Error interrupt registry cleanups. Do not use IRQF_SHARED, these interrupt numbers should all be unique. Also use name strings without spaces in them just like PCI controller drivers do, for consistency. Signed-off-by: David S. Miller commit 34768bc8329194b14e42ee408a84edfa40059046 Author: David S. Miller Date: Mon May 7 23:06:27 2007 -0700 [SPARC64] PCI: Use root list of pbm's instead of pci_controller_info's The idea is to move more and more things into the pbm, with the eventual goal of eliminating the pci_controller_info entirely as there really isn't any need for it. This stage of the transformations requires some reworking of the PCI error interrupt handling. It might be tricky to get rid of the pci_controller_info parenting for a few reasons: 1) When we get an uncorrectable or correctable error we want to interrogate the IOMMU and streaming cache of both PBMs for error status. These errors come from the UPA front-end which is shared between the two PBM PCI bus segments. Historically speaking this is why I choose the datastructure hierarchy of pci_controller_info-->pci_pbm_info 2) The probing does a portid/devhandle match to look for the 'other' pbm, but this is entirely an artifact and can be eliminated trivially. What we could do to solve #1 is to have a "buddy" pointer from one pbm to another. Signed-off-by: David S. Miller commit 5a4a3e592d0d66653297049373caa7ac5b4febe0 Author: David S. Miller Date: Mon May 7 21:54:28 2007 -0700 [SPARC64] PCI: Kill PROM_PCIRNG_MAX and PROM_PCIIMAP_MAX. They are totally unused. Signed-off-by: David S. Miller commit cfa0652c4eb4ca37f88fcdd7d871cf98d9d98c0e Author: David S. Miller Date: Mon May 7 21:51:41 2007 -0700 [SPARC64] PCI: Use common routine to fetch PBM properties. Namely bus-range and ino-bitmap. This allows us also to eliminate pci_controller_info's pci_{first,last}_busno fields as only the pbm ones are used now. Signed-off-by: David S. Miller commit 1efd48b3ae8f89a1d04f1e36be96764d7bf43ae9 Author: Pierre Ossman Date: Tue May 8 22:35:17 2007 +0200 mmc: use lock instead of claim in debug check As mmc_detect_change() can be called from irq context, using claim (which can sleep) is inherently unsafe. Use the host spinlock instead, which also is faster. Signed-off-by: Pierre Ossman commit 790864dcc2b3fe65355dd84ef8481e54b1bc61b6 Author: Jan Engelhardt Date: Tue May 8 22:30:32 2007 +0200 mmc: Use menuconfig objects Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Signed-off-by: Pierre Ossman commit 055b8224140e7a7515bf8113ce675d58abffedf1 Author: Alex Dubov Date: Tue May 1 20:14:55 2007 -0700 disable socket power in adapter driver instead of media one Socket power must be fully controlled by adapter driver. This also prevents unnecessary power-off of the socket when media driver is unloaded, yet media remains in the socket. Signed-off-by: Alex Dubov Signed-off-by: Pierre Ossman commit 36f021b579d195cdc5fa6f3e2bab198b4bf70643 Merge: 215d067... 1d72acf... Author: Linus Torvalds Date: Tue May 8 12:07:28 2007 -0700 Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (32 commits) Use menuconfig objects - hwmon hwmon/smsc47b397: Use dynamic sysfs callbacks hwmon/smsc47b397: Convert to a platform driver hwmon/w83781d: Deprecate W83627HF support hwmon/w83781d: Use dynamic sysfs callbacks hwmon/w83781d: Be less i2c_client-centric hwmon/w83781d: Clean up conversion macros hwmon/w83781d: No longer use i2c-isa hwmon/ams: Do not print error on systems without apple motion sensor hwmon/ams: Fix I2C read retry logic hwmon: New AD7416, AD7417 and AD7418 driver hwmon/coretemp: Add documentation hwmon: New coretemp driver i386: Use functions from library in msr driver i386: Add safe variants of rdmsr_on_cpu and wrmsr_on_cpu hwmon/lm75: Use dynamic sysfs callbacks hwmon/lm78: Use dynamic sysfs callbacks hwmon/lm78: Be less i2c_client-centric hwmon/lm78: No longer use i2c-isa hwmon: New max6650 driver ... commit 215d06780d13fd7de629b02b61b7b7bf88ce5039 Author: Geert Uytterhoeven Date: Tue May 8 11:37:26 2007 +0200 Fix sunrpc warning noise Commit c5a4dd8b7c15927a8fbff83171b57cad675a79b9 introduced the following compiler warnings: net/sunrpc/sched.c:766: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'size_t' net/sunrpc/sched.c:785: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'size_t' - Use %zu to format size_t - Kill 2 useless casts Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 60c9b2746f589b0b809582b0471cf30ad3ae439f Merge: 4750def... f7c66ce... Author: Linus Torvalds Date: Tue May 8 11:59:33 2007 -0700 Merge git://oss.sgi.com:8090/xfs/xfs-2.6 * git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Add lockdep support for XFS [XFS] Fix race in xfs_write() b/w dmapi callout and direct I/O checks. [XFS] Get rid of redundant "required" in msg. [XFS] Export via a function xfs_buftarg_list for use by kdb/xfsidbg. [XFS] Remove unused ilen variable and references. [XFS] Fix to prevent the notorious 'NULL files' problem after a crash. [XFS] Fix race condition in xfs_write(). [XFS] Fix uquota and oquota enforcement problems. [XFS] propogate return codes from flush routines [XFS] Fix quotaon syscall failures for group enforcement requests. [XFS] Invalidate quotacheck when mounting without a quota type. [XFS] reducing the number of random number functions. [XFS] remove more misc. unused args [XFS] the "aendp" arg to xfs_dir2_data_freescan is always NULL, remove it. [XFS] The last argument "lsn" of xfs_trans_commit() is always called with commit 4750def52cb2c21732dda9aa1d43a07db37b0186 Merge: 9028780... 27c78b3... Author: Linus Torvalds Date: Tue May 8 11:58:20 2007 -0700 Merge branch 'reset-seq' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'reset-seq' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata reset-seq] build and merge fixes libata: reimplement reset sequencing libata: improve ata_std_prereset() libata: improve 0xff status handling libata: add deadline support to prereset and reset methods commit 9028780a3e6d2c3dd940e89b377765cca008b6df Merge: 5335a40... e824f78... Author: Linus Torvalds Date: Tue May 8 11:57:17 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (40 commits) [netdrvr] atl1: fix build pasemi_mac: Use local-mac-address instead of mac-address if available pasemi_mac: PHY support pasemi_mac: Add msglevel support and "debug" module param pasemi_mac: Logic cleanup / rx performance improvements pasemi_mac: Minor cleanup / define fixes pasemi_mac: Add SKB reuse / copy-break pasemi_mac: Timer and interrupt fixes pasemi_mac: Abstract and fix up interrupt restart routines pasemi_mac: Move the IRQ mapping from the PCI layer to the driver tc35815: Remove unnecessary skb->dev assignment drivers/net/dm9000: Convert to generic boolean AT91RM9200 Ethernet: Fix multicast addressing AT91RM9200 Ethernet: Support additional PHYs PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast code sky2: re-enable 88E8056 for most motherboards MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX ne: MIPS: Use platform_driver for ne on RBTX49XX ne: Add NEEDS_PORTLIST to control ISA auto-probe ne: Misc fixes for platform driver. ... Fix conflict in drivers/net/pasemi_mac.c (get_property() got renamed to of_get_property()) manually. Signed-off-by: Linus Torvalds commit 5335a40be6867eff986a31bcd8fc82a5cb1e16bb Merge: 393bfca... ef68d29... Author: Linus Torvalds Date: Tue May 8 11:52:35 2007 -0700 Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6: via: Make sure we flush write-combining using a follow-up read. via: Try to improve command-buffer chaining. drm: remove old taskqueue remnant drm: rename badly named define and cleanup ioctl code spacing radeon: Don't mess up page flipping when a file descriptor is closed. drm/radeon: upgrade to 1.27 - make PCI GART more flexible commit 393bfca19ecdce60a8d9a4d2577cac11ca924a25 Merge: df6d391... ba0acb5... Author: Linus Torvalds Date: Tue May 8 11:51:43 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input * master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: move USB miscellaneous devices under drivers/input/misc Input: move USB mice under drivers/input/mouse Input: move USB gamepads under drivers/input/joystick Input: move USB touchscreens under drivers/input/touchscreen Input: move USB tablets under drivers/input/tablet Input: i8042 - fix AUX port detection with some chips Input: aaed2000_kbd - convert to use polldev library Input: drivers/usb/input - usb_buffer_free() cleanup Input: synaptics - don't complain about failed resets Input: pull input.h into uinpit.h Input: drivers/usb/input - fix sparse warnings (signedness) Input: evdev - fix some sparse warnings (signedness, shadowing) Input: drivers/joystick - fix various sparse warnings Input: force feedback - make sure effect is present before playing commit df6d3916f3b7b7e2067567a256dd4f0c1ea854a2 Merge: 74add80... 197686d... Author: Linus Torvalds Date: Tue May 8 11:50:19 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits) [POWERPC] Abolish powerpc_flash_init() [POWERPC] Early serial debug support for PPC44x [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc [POWERPC] Add device tree for Ebony [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now [POWERPC] MPIC U3/U4 MSI backend [POWERPC] MPIC MSI allocator [POWERPC] Enable MSI mappings for MPIC [POWERPC] Tell Phyp we support MSI [POWERPC] RTAS MSI implementation [POWERPC] PowerPC MSI infrastructure [POWERPC] Rip out the existing powerpc msi stubs [POWERPC] Remove use of 4level-fixup.h for ppc32 [POWERPC] Add powerpc PCI-E reset API implementation [POWERPC] Holly bootwrapper [POWERPC] Holly DTS [POWERPC] Holly defconfig [POWERPC] Add support for 750CL Holly board [POWERPC] Generalize tsi108 PCI setup [POWERPC] Generalize tsi108 PHY types ... Fixed conflict in include/asm-powerpc/kdebug.h manually Signed-off-by: Linus Torvalds commit 74add80cbd7fe246c893b93ee75ac59acdd01dd4 Author: Roland McGrath Date: Tue May 8 11:19:38 2007 -0700 Remove unused variable in get_unmapped_area Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 02a93208edec0d655c9f18613d830dc6afeda7d4 Merge: 18062a9... 821de3a... Author: Linus Torvalds Date: Tue May 8 11:34:52 2007 -0700 Merge branch 'for-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block * 'for-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block: [PATCH] ll_rw_blk: fix missing bounce in blk_rq_map_kern() [PATCH] splice: always call into page_cache_readahead() [PATCH] splice(): fix interaction with readahead commit 18062a91d2ddc40e19fc674afeb7cad58cfa23ab Merge: be3478d... 05ec9e2... Author: Linus Torvalds Date: Tue May 8 11:32:30 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Fix race waking up jfsIO kernel thread JFS: use __set_current_state() Copy i_flags to jfs inode flags on write JFS: document uid, gid, and umask mount options in jfs.txt commit be3478ddb8a3902b588c840b42e166a0e64a87b3 Author: Andrew Morton Date: Tue May 8 00:40:22 2007 -0700 sm501fb printk warning fixes drivers/video/sm501fb.c: In function 'sm501fb_cursor': drivers/video/sm501fb.c:992: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' drivers/video/sm501fb.c:992: warning: format '%08x' expects type 'unsigned int', but argument 4 has type 'long unsigned int' Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 147394c8ece44be85d692cc92cc0d047e4d8fb69 Author: Andrei Konovalov Date: Tue May 8 00:40:18 2007 -0700 xilinxfb: xilinx framebuffer device driver Add support for the video controller IP block included into Xilinx ML300 and ML403 reference designs. Signed-off-by: Andrei Konovalov Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 435d56fcd45cdf32bfb4db5d4e1efe17f3da95b2 Author: Krzysztof Helt Date: Tue May 8 00:40:16 2007 -0700 pm2fb: fix of jumps in pm2fb_probe This patch fixes incorrect targets of jumps when an error occurs in the pm2fb_probe. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19c1a8b3122e7b2007cfd2836da2318816f324cc Author: Krzysztof Helt Date: Tue May 8 00:40:14 2007 -0700 skeletonfb: improvements This patch adds a macro to register PCI ids table and corrects type of xxxfb_fix variable to avoid modpost warnings. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4560daaf07ab68bef5e70355d1565b2e0a1a3bcf Author: Krzysztof Helt Date: Tue May 8 00:40:12 2007 -0700 pm2fb: removal of pm2fb_par fields This patch removes two redundant fields in the pm2fb_par structure. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c7bf38699aed591b6624add40acfa71fe6d902c Author: Krzysztof Helt Date: Tue May 8 00:40:10 2007 -0700 skeletonfb: more corrections More corrections to skeletonfb.c file: - fixed types of more arguments - removed returned values in void functions - removed not existing fb_poll function - fixed closing comment typo - corrected misleading constant name ADDR Signed-off-by: Krzysztof Helt Acked-By: James Simmons Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e645ffd83f987c8650e9dd0f22a0c57296ed458 Author: Antonino A. Daplas Date: Tue May 8 00:40:08 2007 -0700 vga16fb: actually support widths in multiples of 8 vga16fb does not just support 8-pixel wide rectangles, but rectangles with widths in multiples of 8. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ae854777592856ad8ce4d4cdb6114804e2e28f6 Author: Antonino A. Daplas Date: Tue May 8 00:40:06 2007 -0700 vgacon: disallow console operations when in KD_GRAPHICS mode Reported by James Pearson as: boot to run level 3 if not root, then make sure /dev/console is writeable login and type: setterm -blank 0 start X type into an xterm: while true; do echo "" > /dev/console; usleep 100000; done while the above loop is running switch to the text console and back again (Ctrl-Alt-F1 then Ctrl-Alt-F7) ... and the screen will be shifting (and wrapping) to the left. This problem stems from continuously writing text to the system console (which is in KD_TEXT mode) while the foreground console is in KD_GRAPHICS mode. Somewhere along the way, console printing got confused and omitted the KD_GRAPHICS/KD_TEXT test. Thus, vgacon attempted to scroll the screen of X, which causes X to shift. Fix by disallowing vgacon to touch the hardware when the vc is in KD_GRAPHICS mode. A definitive fix entails a full audit of the console code. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32dd38030b3b4ca0aa18a5402059de27bf69ed6b Author: Jan Engelhardt Date: Tue May 8 00:40:04 2007 -0700 Use menuconfig objects II: video/logo Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87a7cc685a847800482db1fd74504b9b4b42264e Author: Krzysztof Helt Date: Tue May 8 00:40:02 2007 -0700 pm2fb: accelerated fillrect and copyarea This is a port of accelerated functions from 2.4 kernel. Only fillrect and copyarea are accelerated. Fillrect is not accelerated in 24-bit mode. [adaplas] Add appropriate flags Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34ed25f50b347c7e1ff78f9308e025ddd57c2f20 Author: Ondrej Zajicek Date: Tue May 8 00:40:00 2007 -0700 s3fb: updates Move s3fb_get_tilemax to svgalib.c as svga_get_tilemax, because it reports limitation of other code from svgalib (svga_settile, svga_tilecopy, ...) Limit font width to 8 pixels in 4 bpp mode. Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a31f0f7679aeaf79c613feaa3f4170741ccb218 Author: Krzysztof Helt Date: Tue May 8 00:39:57 2007 -0700 pm2fb: memclock setting corrections This patch disables a memory clock setting if a board has been initialized by BIOS. This allows using the memory clock set by manufacturer of the board. This patch also sets default clock for 3dlabs Permedia 2V reference board's clock to 75MHz (BIOS setting for EONtronic Permedia 2Vboard), because the default 83MHz can be too high. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76c7d3ffe3acddf5619bd796e0b8fa5dc6ecdb39 Author: krzysztof.h1@wp.pl Date: Tue May 8 00:39:56 2007 -0700 pm2fb: reset transparency settings This patch resets transparency settings when depth changes. Otherwise the 16 and 24-bit modes work incorrectly after switching from 32-bit mode. Signed-off-by: Krzysztof Helt < krzysztof.h1@wp.pl> Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 167f07f1bc20ea1ab51d833deb0c18f5ab93618f Author: Antonino A. Daplas Date: Tue May 8 00:39:54 2007 -0700 fbcon: check console-fb mapping in fbcon_get_requirement - Check the console-to-fb mapping in fbcon_get_requirement(), otherwise the value returned may not be valid for the driver. - Minor cleanup Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e7223f28b4ed5073d2029a3597bf514ff514f2 Author: Antonino A. Daplas Date: Tue May 8 00:39:52 2007 -0700 fbdev: clean up exit patch of fb_set_var Clean up exit patch of fb_set_var(): - consolidate all return values into a single local variable - ensure that return values are valid error codes - fix fb_set_var() returning success when fb_check_caps() failed Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0959f0ca29244ae983b406fba313816a29244be7 Author: Adrian Bunk Date: Tue May 8 00:39:50 2007 -0700 drivers/video/sis/: remove more kernel 2.4 code Signed-off-by: Adrian Bunk Cc: Thomas Winischhofer Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c831c338f0ad299fcd1592c6e4f30657480f39af Author: Matthias Kaehlcke Date: Tue May 8 00:39:49 2007 -0700 use mutex instead of semaphore in virtual console driver The virtual console driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 159dde93692ef549a0b2012c9f25feb4df638c9c Author: Ville Syrjala Date: Tue May 8 00:39:47 2007 -0700 atyfb: halve XCLK with Mobility and 32bit memory Laptops with Rage Mobility and 32bit memory interface seem to require halved XCLK to operate correctly. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4e124c138558a0cff51398ddff9a8e44ed0b529 Author: Ville Syrjala Date: Tue May 8 00:39:45 2007 -0700 atyfb: reorganize clock init Reorganize atyfb clock init code so command line clock overrides are effective for all chips. The old code would silently ignore some of the command line clock overrides with some chips. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94f45bcd1c29e773b6bf189ef7b9a3437d016320 Author: Ville Syrjala Date: Tue May 8 00:39:44 2007 -0700 atyfb: increase SPLL delay Wait 5 ms instead of 500 us for the SPLL to lock. This matches the recommendation in mach64 programmer's guide. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2620c6e31735248ac26403558bd4279a8af619d8 Author: Antonino A. Daplas Date: Tue May 8 00:39:42 2007 -0700 nvidiafb: fix return value of nvidiafb_open() Fix return value of nvidiafb_open(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0449359f053829ec89c026b5fb80bbe7190a5fe8 Author: Ondrej Zajicek Date: Tue May 8 00:39:41 2007 -0700 vga: vgastate fix 1) sets 'palette access disabled' during read from AR10. This is usually documented as needed for access AR01-AR0F, but on ARK Logic card it is needed for AR10 (otherwise read returns some nonsence and save_vga_text() returns before do anything). 2) do not restore AR10, because it was not changed during 3) remove modification of misc reg: /* force graphics mode */ vga_w(state->vgabase, VGA_MIS_W, misc | 1); as comment is misleading - LSB of misc reg does not set/reset graphics mode, but set color/mono adresses of CRT and some other regs. but these regs are not used during save/restore fonts. (it worked even when (misc | 1) was replaced by (misc & ~1) ). Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56c7554938e5945b770365e326f0c3d031ca231f Author: Antonino A. Daplas Date: Tue May 8 00:39:39 2007 -0700 s3fb: implement fb_get_caps Implement fb_get_caps(). This will allow the driver to tell upper layer that it can only support 256 8x16 bitmaps when in tileblitting mode (var->bits_per_pixel == 0); Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38a3dc51852d8350b156ea909c5aa8767d71b005 Author: Antonino A. Daplas Date: Tue May 8 00:39:37 2007 -0700 fbdev: fbcon: check if mode can handle new screen Check if the mode can properly display the screen. This will be needed by drivers where the capability is not constant with each mode. The function fb_set_var() will query fbcon the requirement, then it will query the driver (via a new hook fb_get_caps()) its capability. If the driver's capability cannot handle fbcon's requirement, then fb_set_var() will fail. For example, if a particular driver supports 2 modes where: mode1 = can only display 8x16 bitmaps mode2 = can display any bitmap then if current mode = mode2 and current font = 12x22 fbset /* mode1 cannot handle 12x22 */ fbset will fail Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e15de77e74d429f14641ebe7a29ccd8aa6656f3c Author: Dave Jones Date: Tue May 8 00:39:35 2007 -0700 nvidiafb: prevent triggering of softlockup If the chip locks up, we get into a long polling loop, where the softlockup detector kicks in. See https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=151878 for an example. [adaplas] Chip lockup can occur at 3 points (flush, sync, and wait). Consolidate and allow the driver to go to safe mode cleanly. Signed-off-by: Dave Jones Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4a96b53125c3d31266c05f2a8432d956dd26141 Author: Krzysztof Helt Date: Tue May 8 00:39:33 2007 -0700 pm2fb: pixclock setting restriction This patch adds restrictions to calculations of m, n and p factors which sets the pixclock for the Permedia 2V. I found during tests that synchronization is unstable if m (divisor) is bigger than half of the n (numerator). The patch disallows such settings combination. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5d809d774fc8aa76899bde3235afb046728feed Author: Krzysztof Helt Date: Tue May 8 00:39:32 2007 -0700 pm2fb: Permedia 2V memory clock setting Permedia 2V uses its own registers to set a memory clock. The patch adds these registers and uses them in the set_memclock() function. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1c15f938d810b5eb38c85a28e5e9d2af07d135a Author: Krzysztof Helt Date: Tue May 8 00:39:30 2007 -0700 pm2fb: 3dlabs Permedia 2V reference board added This patch adds support for 3dlabs Permedia reference board. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d37363409bacd1142c6e49edfb3e1f8b153d47dc Author: Alan Cox Date: Tue May 8 00:39:28 2007 -0700 nvidiafb/rivafb: switch to pci_get refcounting Switch to pci_get refcounting APIs [adaplas] Fix a long-standing bug where the return value of pci_find_slot()/pci_get_bus_and_slot() is ignored. Signed-off-by: Alan Cox Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbe7e429fedb3fbc93b496cc1c3eb4fc28333ac0 Author: Alan Hourihane Date: Tue May 8 00:39:25 2007 -0700 vmlfb: framebuffer driver for Intel Vermilion Range Add the Intel Vermilion Range framebuffer support. Signed-off-by: Alan Hourihane Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 249bdbbf0dbab5554a4bfe55639e324d4758da96 Author: Ondrej Zajicek Date: Tue May 8 00:39:24 2007 -0700 s3fb: driver fixes This fixes broken fbcon on Virge VX in 24 bpp mode, and contains several other small updates. Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4941cb7a18fd84d4d8cd097d2beada3c79c8f781 Author: Antonino A. Daplas Date: Tue May 8 00:39:22 2007 -0700 fbdev: save the activate field before calling fb_check_var() Some drivers may reset the var->activate field on fb_check_var(). This can lead to undefined behavior. For example, doing fbset -a