06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/d70ac829b7f42d7ef4f879635c6a772b0b4ed0a2 d70ac829b7f42d7ef4f879635c6a772b0b4ed0a2 2008-06-20T16:19:44-07:00 2008-06-20T16:19:44-07:00 Linux 2.6.26-rc7 b9cf4fd3fe6afea7ec4e09a2bd976d9964f9266e Linus Torvalds torvalds@linux-foundation.org d5545fa0056ff2982f8a6419bd9a6ba2674deefd ac1623625c5818bbdf5c68973098ba386ba7a004 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb 06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb 2008-06-20T12:46:47-07:00 2008-06-20T12:46:47-07:00 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: BAST: Remove old IDE driver pcmcia ide kingston compactflash's have a new manufacturer id pcmcia: add another pata/ide ID pcmcia: add an pata/ide ID ide: increase timeout in wait_drive_not_busy() palm_bk3710: fix resource management f8a55625cef3e754702add71acaf9958edfd8352 Linus Torvalds torvalds@linux-foundation.org 77a189c28b44035ff1b6841df32c43af8a9e8399 9499fe2b340d19ef55c349de794db9d917e7403f Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/d5545fa0056ff2982f8a6419bd9a6ba2674deefd d5545fa0056ff2982f8a6419bd9a6ba2674deefd 2008-06-20T12:41:10-07:00 2008-06-20T12:41:10-07:00 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: ieee1394: Kconfig menu touch-up firewire: Kconfig menu touch-up firewire: deadline for PHY config transmission firewire: fw-ohci: unify printk prefixes firewire: fill_bus_reset_event needs lock protection firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID firewire: fw-ohci: disable PHY packet reception into AR context firewire: fw-ohci: use of uninitialized data in AR handler firewire: don't panic on invalid AR request buffer f6f4eb4b1d7a4b3b65b2ae58c993bc456facfb45 Linus Torvalds torvalds@linux-foundation.org 9aef85cc58f54f01bbbafdb3c87af4465f4257c0 5a87f7f5e523030aa6fe732ec338fd53c9a11c42 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/77a189c28b44035ff1b6841df32c43af8a9e8399 77a189c28b44035ff1b6841df32c43af8a9e8399 2008-06-20T12:39:12-07:00 2008-06-20T12:39:12-07:00 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: no AC status notification ACPI Exception (video-1721): UNKNOWN_STATUS_CODE, Cant attach device fc72ff43367d887da25a63b523eb7380d85094a1 Linus Torvalds torvalds@linux-foundation.org fdfe6d3d000775b50fb1adbc278ba0a34c3007c7 858a3685bcf3ac199128e4aa85eaae2fb9d191b5 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/9aef85cc58f54f01bbbafdb3c87af4465f4257c0 9aef85cc58f54f01bbbafdb3c87af4465f4257c0 2008-06-20T12:38:18-07:00 2008-06-20T12:38:18-07:00 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (21 commits) drm: only trust core drm ioctls - driver ioctls are a mess. drm/i915: add support for Intel series 4 chipsets. drm/radeon: add hier-z registers for r300 and r500 chipsets drm/radeon: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTAT drm/radeon: switch IGP gart to use radeon_write_agp_base() drm/radeon: Restore sw interrupt on resume drm/r500: add support for AGP based cards. drm/radeon: fix texture uploads with large 3d textures (bug 13980) drm/radeon: add initial r500 support. drm/radeon: init pipe setup in kernel code. drm/radeon: fixup radeon_do_engine_reset drm/radeon: fix pixcache and purge/cache flushing registers drm/radeon: write AGP_BASE_2 on chips that support it. drm/radeon: merge IGP chip setup and fixup RS400 vs RS480 support drm/radeon: IGP clean up register and magic numbers. drm/rs690: set base 2 to 0. drm/rs690: set all of gart base address. radeon: add production microcode from AMD drm: pcigart use proper pci map interfaces. drm: the sg alloc ioctl should write back the handle to userspace ... 5bad4a1e733b46aa60f7af866409d3cb984d39c7 Linus Torvalds torvalds@linux-foundation.org 1f1e2ce8a55bac60ff165d353c6b882e750c9092 7d15ddf79ec35ce79093832c80b86c0888eb5bce Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/fdfe6d3d000775b50fb1adbc278ba0a34c3007c7 fdfe6d3d000775b50fb1adbc278ba0a34c3007c7 2008-06-20T12:37:55-07:00 2008-06-20T12:37:55-07:00 Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 * 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: [agp]: fixup chipset flush for new Intel G4x. agp: brown paper bag patch - put back the two lines it took out. 1d8f90f6be657cd7de16692474d9e85d7bc2f92d Linus Torvalds torvalds@linux-foundation.org e570dc2a503f8334b700e8483082c675394f53fd 9c106c119ebedf624fbd682fd2a4d52e3c8c1a67 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/1f1e2ce8a55bac60ff165d353c6b882e750c9092 1f1e2ce8a55bac60ff165d353c6b882e750c9092 2008-06-20T12:37:13-07:00 2008-06-20T12:37:13-07:00 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression rcupreempt: remove export of rcu_batches_completed_bh cpuset: limit the input of cpuset.sched_relax_domain_level b11aaa5baa04ea5ea0ecc549fa1c95430919cd82 Linus Torvalds torvalds@linux-foundation.org b1ae8d3a00530c035ef97fa4d97f4bee9be75c43 d4abc238c9f4df8b3216f3e883f5d0a07b7ac75a Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/e570dc2a503f8334b700e8483082c675394f53fd e570dc2a503f8334b700e8483082c675394f53fd 2008-06-20T12:36:55-07:00 2008-06-20T12:36:55-07:00 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched, delay accounting: fix incorrect delay time when constantly waiting on runqueue sched: CPU hotplug events must not destroy scheduler domains created by the cpusets sched: rt-group: fix RR buglet sched: rt-group: heirarchy aware throttle sched: rt-group: fix hierarchy sched: NULL pointer dereference while setting sched_rt_period_us sched: fix defined-but-unused warning cd188ec93f5bea1f06accbdc916876e891bdb9b0 Linus Torvalds torvalds@linux-foundation.org 55017923f699471f68c1469d5f3ff141dd416ab4 ffe6e1da86d21d7855495b5a772c93f050258f6e Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/b1ae8d3a00530c035ef97fa4d97f4bee9be75c43 b1ae8d3a00530c035ef97fa4d97f4bee9be75c43 2008-06-20T12:36:38-07:00 2008-06-20T12:36:38-07:00 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, geode: add a VSA2 ID for General Software x86: use BOOTMEM_EXCLUSIVE on 32-bit x86, 32-bit: fix boot failure on TSC-less processors x86: fix NULL pointer deref in __switch_to x86: set PAE PHYSICAL_MASK_SHIFT to 44 bits. 6d98f8048b68643803c6a70fba503c18126bd8d1 Linus Torvalds torvalds@linux-foundation.org b4eea67a129423fe423c5d8d26a0aaa9d68ed600 f30ac0ce34f32bb998ac87e37b251374de03e603 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/55017923f699471f68c1469d5f3ff141dd416ab4 55017923f699471f68c1469d5f3ff141dd416ab4 2008-06-20T12:34:43-07:00 2008-06-20T12:34:43-07:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue. Blackfin arch: fix typo error in bf548 serial header file d0a45ea1da874baf556218a0b33ce9141760bb30 Linus Torvalds torvalds@linux-foundation.org 1f6ef2342972dc7fd623f360f84006e2304eb935 9a3b103c27a7e3199b917bc3ca219530132afdfc Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/b4eea67a129423fe423c5d8d26a0aaa9d68ed600 b4eea67a129423fe423c5d8d26a0aaa9d68ed600 2008-06-20T12:31:03-07:00 2008-06-20T12:31:03-07:00 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: sis can't do PMP ata_piix: add TECRA M4 to broken suspend list LIBATA: Add HAVE_PATA_PLATFORM to select PATA_PLATFORM driver sata_mv: warn on PIO with multiple DRQs sata_mv: enable async_notify for 60x1 Rev.C0 and higher libata: don't check whether to use DMA or not for no data commands ahci: jmb361 has only one port 7c0fdf21fe2864d88762d54c91b77212614caf0c Linus Torvalds torvalds@linux-foundation.org 89f5b7da2a6bad2e84670422ab8192382a5aeb9f Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/1f6ef2342972dc7fd623f360f84006e2304eb935 1f6ef2342972dc7fd623f360f84006e2304eb935 2008-06-20T12:25:34-07:00 2008-06-20T12:19:28-07:00 [watchdog] hpwdt: fix use of inline assembly The inline assembly in drivers/watchdog/hpwdt.c was incredibly broken, and included all the function prologue and epilogue stuff, even though it was itself then inside a C function where the compiler would add its own prologue and epilogue on top of it all. This then just _happened_ to work if you had exactly the right compiler version and exactly the right compiler flags, so that gcc just happened to not create any prologue at all (the gcc-generated epilogue wouldn't matter, since it would never be reached). But the more proper way to fix it is to simply not do this. Move the inline asm to the top level, with no surrounding function at all (the better alternative would be to remove the prologue and make it actually use proper description of the arguments to the inline asm, but that's a bigger change than the one I'm willing to make right now). Tested-by: S.Çağlar Onur <caglar@pardus.org.tr> Acked-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 4bc32bb53b6203ba570e21025e1385c0f1db6061 Linus Torvalds torvalds@linux-foundation.org a49c06bfe48c43b4fea4d3789807d8393828ca8a Ben Dooks ben-linux@fluff.org http://github.com/github/linux-2.6/commit/ac1623625c5818bbdf5c68973098ba386ba7a004 ac1623625c5818bbdf5c68973098ba386ba7a004 2008-06-20T11:53:35-07:00 2008-06-20T11:53:35-07:00 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 <ben-linux@fluff.org> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 64376f6da43c93abf1c841e247c30d30377fd407 Bartlomiej Zolnierkiewicz bzolnier@gmail.com a17bf220231a5061a29a27a99a273246eb3b156e Christophe Niclaes cniclaes@develtech.com http://github.com/github/linux-2.6/commit/a49c06bfe48c43b4fea4d3789807d8393828ca8a a49c06bfe48c43b4fea4d3789807d8393828ca8a 2008-06-20T11:53:34-07:00 2008-06-20T11:53:34-07:00 pcmcia ide kingston compactflash's have a new manufacturer id Up to now, Kingston compactflash cards (ab)used the Toshiba Manufacturer's ID, In their new CF cards, they use a new one. Let's the ide subsystem recognize CF cards with the new id. Signed-off-by: Christophe Niclaes <cniclaes@develtech.com> Acked-by: Philippe De Muyter <phdm@macqel.be> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 7350eb6ef7fc2d246c6f248eac5390f2c47408cb Bartlomiej Zolnierkiewicz bzolnier@gmail.com 74e23386b7818c7edb1252f6661806dd34042db1 Kristoffer Ericson kristoffer_e1@hotmail.com http://github.com/github/linux-2.6/commit/a17bf220231a5061a29a27a99a273246eb3b156e a17bf220231a5061a29a27a99a273246eb3b156e 2008-06-20T11:53:34-07:00 2008-06-20T11:53:34-07:00 pcmcia: add another pata/ide ID Addition of Transcend 1GB 45x id so that it is properly detected. [bart: fix typo in ide-cs's ID spotted by Alan Cox] Signed-off-by: William Peters <w1ll14@gmail.com> Signed-off-by: Kristoffer Ericson <Kristoffer_e1@hotmail.com> CC: Alan Cox <alan@lxorguk.ukuu.org.uk> CC: linux-ide@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> fcc62bd3e092533dc5aff7a7fa3119a004264238 Bartlomiej Zolnierkiewicz bzolnier@gmail.com f54feafa6d47d0aa1a96adefdc763b708b02f94f Matt Reimer mattjreimer@gmail.com http://github.com/github/linux-2.6/commit/74e23386b7818c7edb1252f6661806dd34042db1 74e23386b7818c7edb1252f6661806dd34042db1 2008-06-20T11:53:34-07:00 2008-06-20T11:53:34-07:00 pcmcia: add an pata/ide ID Add an id for: product info: "M-Systems", "CF300", "" manfid: 0x000a, 0x0000 function: 4 (fixed disk) Signed-off-by: Matt Reimer <mreimer@vpop.net> CC: Alan Cox <alan@lxorguk.ukuu.org.uk> CC: linux-ide@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 0c0cf212aa609787a87a486f581fa358b0c24169 Bartlomiej Zolnierkiewicz bzolnier@gmail.com ce42a54946db338e43be9a89c0f7927e02aa3a16 Bartlomiej Zolnierkiewicz bzolnier@gmail.com http://github.com/github/linux-2.6/commit/f54feafa6d47d0aa1a96adefdc763b708b02f94f f54feafa6d47d0aa1a96adefdc763b708b02f94f 2008-06-20T11:53:33-07:00 2008-06-20T11:53:33-07:00 ide: increase timeout in wait_drive_not_busy() Some ATAPI devices take longer than the current max timeout value to become ready (i.e. TEAC DV-W28ECW takes 6 ms) so increase the timeout value to 10 ms. This fixes kernel.org bugzilla bug #10887: http://bugzilla.kernel.org/show_bug.cgi?id=10887 Reported-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> a14b7030652ba394656862625eaa192d271e8c99 Bartlomiej Zolnierkiewicz bzolnier@gmail.com 9bedbcb207ed9a571b239231d99c8fd4a34ae24d Sergei Shtylyov sshtylyov@ru.mvista.com http://github.com/github/linux-2.6/commit/ce42a54946db338e43be9a89c0f7927e02aa3a16 ce42a54946db338e43be9a89c0f7927e02aa3a16 2008-06-20T11:53:32-07:00 2008-06-20T11:53:32-07:00 palm_bk3710: fix resource management The driver expected a *virtual* address in the IDE platform device's memory resource and didn't request the memory region for the register block. Fix this taking into account the fact that DaVinci SoC devices are fixed-mapped to the virtual memory early and we can get their virtual addresses using IO_ADDRESS() macro, not having to call ioremap()... While at it, also do some cosmetic changes... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 278d32be3b1bed64360b9acdf50de0e157fa24a3 Bartlomiej Zolnierkiewicz bzolnier@gmail.com 9bedbcb207ed9a571b239231d99c8fd4a34ae24d Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/89f5b7da2a6bad2e84670422ab8192382a5aeb9f 89f5b7da2a6bad2e84670422ab8192382a5aeb9f 2008-06-20T11:18:25-07:00 2008-06-20T11:18:25-07:00 Reinstate ZERO_PAGE optimization in 'get_user_pages()' and fix XIP KAMEZAWA Hiroyuki and Oleg Nesterov point out that since the commit 557ed1fa2620dc119adb86b34c614e152a629a80 ("remove ZERO_PAGE") removed the ZERO_PAGE from the VM mappings, any users of get_user_pages() will generally now populate the VM with real empty pages needlessly. We used to get the ZERO_PAGE when we did the "handle_mm_fault()", but since fault handling no longer uses ZERO_PAGE for new anonymous pages, we now need to handle that special case in follow_page() instead. In particular, the removal of ZERO_PAGE effectively removed the core file writing optimization where we would skip writing pages that had not been populated at all, and increased memory pressure a lot by allocating all those useless newly zeroed pages. This reinstates the optimization by making the unmapped PTE case the same as for a non-existent page table, which already did this correctly. While at it, this also fixes the XIP case for follow_page(), where the caller could not differentiate between the case of a page that simply could not be used (because it had no "struct page" associated with it) and a page that just wasn't mapped. We do that by simply returning an error pointer for pages that could not be turned into a "struct page *". The error is arbitrarily picked to be EFAULT, since that was what get_user_pages() already used for the equivalent IO-mapped page case. [ Also removed an impossible test for pte_offset_map_lock() failing: that's not how that function works ] Acked-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Nick Piggin <npiggin@suse.de> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Hugh Dickins <hugh@veritas.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 4f55cf9ef8a76d4b9a960e1b443ed015e63e713f Linus Torvalds torvalds@linux-foundation.org 7b09f27891476c668d058926b90539e4068fbda2 d385c2a85877f0cb785070094edf9a624c090d68 Len Brown len.brown@intel.com http://github.com/github/linux-2.6/commit/5a87f7f5e523030aa6fe732ec338fd53c9a11c42 5a87f7f5e523030aa6fe732ec338fd53c9a11c42 2008-06-19T23:47:16-07:00 2008-06-19T23:47:16-07:00 Merge branch 'bugzilla-9761' into release a41d38ca5892b84711fdaf2b376f673109b5c52c Len Brown len.brown@intel.com 9bedbcb207ed9a571b239231d99c8fd4a34ae24d f163ff5176a8e9c827d8ebe044710d67d40799c3 Len Brown len.brown@intel.com http://github.com/github/linux-2.6/commit/7b09f27891476c668d058926b90539e4068fbda2 7b09f27891476c668d058926b90539e4068fbda2 2008-06-19T23:45:05-07:00 2008-06-19T23:45:05-07:00 Merge branch 'bugzilla-10695' into release 1d75c31446639e9e2fc675a96a3e382e42905aeb Len Brown len.brown@intel.com d3adbc0c582b767ba1561ffa38313e905cc917ea Dave Airlie airlied@redhat.com http://github.com/github/linux-2.6/commit/858a3685bcf3ac199128e4aa85eaae2fb9d191b5 858a3685bcf3ac199128e4aa85eaae2fb9d191b5 2008-06-19T22:42:38-07:00 2008-06-19T22:42:38-07:00 drm: only trust core drm ioctls - driver ioctls are a mess. So driver ioctls need a full auditing before we can make this change. Signed-off-by: Dave Airlie <airlied@redhat.com> abfe40eca6567faba5807b44483a01311d634f5d Dave Airlie airlied@redhat.com 21efa2bac91b8d12064617c5a35492ec982544eb Zhenyu Wang zhenyu.z.wang@intel.com http://github.com/github/linux-2.6/commit/d3adbc0c582b767ba1561ffa38313e905cc917ea d3adbc0c582b767ba1561ffa38313e905cc917ea 2008-06-19T19:12:56-07:00 2008-06-19T19:12:56-07:00 drm/i915: add support for Intel series 4 chipsets. Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com> 7e8d3f3ea687d2b86fdce8dc32bf61d5bd5dfb9d Dave Airlie airlied@redhat.com 0e480e5fc03c411d350478b2e8dc0906a37b6f07 Zhenyu Wang zhenyu.z.wang@intel.com http://github.com/github/linux-2.6/commit/7d15ddf79ec35ce79093832c80b86c0888eb5bce 7d15ddf79ec35ce79093832c80b86c0888eb5bce 2008-06-19T18:48:06-07:00 2008-06-19T18:48:06-07:00 [agp]: fixup chipset flush for new Intel G4x. Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com> e876d010a80c724d8197fb6db4bf8f1cdf831691 Dave Airlie airlied@redhat.com d3942cff620bea073fc4e3c8ed878eb1e84615ce Jordan Crouse jordan.crouse@amd.com http://github.com/github/linux-2.6/commit/ffe6e1da86d21d7855495b5a772c93f050258f6e ffe6e1da86d21d7855495b5a772c93f050258f6e 2008-06-19T05:19:03-07:00 2008-06-18T10:34:38-07:00 x86, geode: add a VSA2 ID for General Software General Software writes their own VSA2 module for their version of the Geode BIOS, which returns a different ID then the standard VSA2. This was causing the framebuffer driver to break for most GSW boards. Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Cc: tglx@linutronix.de Cc: linux-geode@lists.infradead.org Signed-off-by: Ingo Molnar <mingo@elte.hu> c327ccc9378b70df18d0b89355e43c613a073334 Ingo Molnar mingo@elte.hu d819c49da624e3ee09b2844603d58265039eecdd Bharath Ravi bharathravi1@gmail.com http://github.com/github/linux-2.6/commit/d4abc238c9f4df8b3216f3e883f5d0a07b7ac75a d4abc238c9f4df8b3216f3e883f5d0a07b7ac75a 2008-06-19T05:15:28-07:00 2008-06-16T02:41:01-07:00 sched, delay accounting: fix incorrect delay time when constantly waiting on runqueue This patch corrects the incorrect value of per process run-queue wait time reported by delay statistics. The anomaly was due to the following reason. When a process leaves the CPU and immediately starts waiting for CPU on the runqueue (which means it remains in the TASK_RUNNABLE state), the time of re-entry into the run-queue is never recorded. Due to this, the waiting time on the runqueue from this point of re-entry upto the next time it hits the CPU is not accounted for. This is solved by recording the time of re-entry of a process leaving the CPU in the sched_info_depart() function IF the process will go back to waiting on the run-queue. This IF condition is verified by checking whether the process is still in the TASK_RUNNABLE state. The patch was tested on 2.6.26-rc6 using two simple CPU hog programs. The values noted prior to the fix did not account for the time spent on the runqueue waiting. After the fix, the correct values were reported back to user space. Signed-off-by: Bharath Ravi <bharathravi1@gmail.com> Signed-off-by: Madhava K R <madhavakr@gmail.com> Cc: dhaval@linux.vnet.ibm.com Cc: vatsa@in.ibm.com Cc: balbir@in.ibm.com Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu> 38b571d9a787a62ee88de8f1a2d1c39b3a9d83b8 Ingo Molnar mingo@elte.hu ec64b6c8763c83899908fdd62746435c19211686 Sonic Zhang sonic.zhang@analog.com http://github.com/github/linux-2.6/commit/f30ac0ce34f32bb998ac87e37b251374de03e603 f30ac0ce34f32bb998ac87e37b251374de03e603 2008-06-19T02:46:39-07:00 2008-06-19T02:46:39-07:00 Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue. This allows other threads to run when the serial driver polls the CTS PIN in a loop. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> cb22bb5d8ec4ef450902552c66809188a5d788bf Bryan Wu cooloney@kernel.org 9bedbcb207ed9a571b239231d99c8fd4a34ae24d Sonic Zhang sonic.zhang@analog.com http://github.com/github/linux-2.6/commit/ec64b6c8763c83899908fdd62746435c19211686 ec64b6c8763c83899908fdd62746435c19211686 2008-06-19T02:07:15-07:00 2008-06-19T02:07:15-07:00 Blackfin arch: fix typo error in bf548 serial header file Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> bbb398166cac1547edbf7a51d6000e011b810b41 Bryan Wu cooloney@kernel.org df17b1d990fc214f033c5588e58216ec941591e0 Bernhard Walle bwalle@suse.de http://github.com/github/linux-2.6/commit/d3942cff620bea073fc4e3c8ed878eb1e84615ce d3942cff620bea073fc4e3c8ed878eb1e84615ce 2008-06-19T01:08:48-07:00 2008-06-08T07:16:07-07:00 x86: use BOOTMEM_EXCLUSIVE on 32-bit This patch uses the BOOTMEM_EXCLUSIVE for crashkernel reservation also for i386 and prints a error message on failure. The patch is still for 2.6.26 since it is only bug fixing. The unification of reserve_crashkernel() between i386 and x86_64 should be done for 2.6.27. Signed-off-by: Bernhard Walle <bwalle@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: <stable@kernel.org> 55f0b2954d91d67fcd0b8ad9b97c7356fb9799fd Ingo Molnar mingo@elte.hu 75118a82e21cafb4a82b53bb85d1c7689787e046 Mikael Pettersson mikpe@it.uu.se http://github.com/github/linux-2.6/commit/df17b1d990fc214f033c5588e58216ec941591e0 df17b1d990fc214f033c5588e58216ec941591e0 2008-06-19T01:08:47-07:00 2008-06-14T17:19:56-07:00 x86, 32-bit: fix boot failure on TSC-less processors Booting 2.6.26-rc6 on my 486 DX/4 fails with a "BUG: Int 6" (invalid opcode) and a kernel halt immediately after the kernel has been uncompressed. The BUG shows EIP pointing to an rdtsc instruction in native_read_tsc(), invoked from native_sched_clock(). (This error occurs so early that not even the serial console can capture it.) A bisection showed that this bug first occurs in 2.6.26-rc3-git7, via commit 9ccc906c97e34fd91dc6aaf5b69b52d824386910: >x86: distangle user disabled TSC from unstable > >tsc_enabled is set to 0 from the command line switch "notsc" and from >the mark_tsc_unstable code. Seperate those functionalities and replace >tsc_enable with tsc_disable. This makes also the native_sched_clock() >decision when to use TSC understandable. > >Preparatory patch to solve the sched_clock() issue on 32 bit. > >Signed-off-by: Thomas Gleixner <tglx@linutronix.de> The core reason for this bug is that native_sched_clock() gets called before tsc_init(). Before the commit above, tsc_32.c used a "tsc_enabled" variable which defaulted to 0 == disabled, and which only got enabled late in tsc_init(). Thus early calls to native_sched_clock() would skip the TSC and use jiffies instead. After the commit above, tsc_32.c uses a "tsc_disabled" variable which defaults to 0, meaning that the TSC is Ok to use. Early calls to native_sched_clock() now erroneously try to use the TSC on !cpu_has_tsc processors, leading to invalid opcode exceptions. My proposed fix is to initialise tsc_disabled to a "soft disabled" state distinct from the hard disabled state set up by the "notsc" kernel option. This fixes the native_sched_clock() problem. It also allows tsc_init() to be simplified: instead of setting tsc_disabled = 1 on every error return, we just set tsc_disabled = 0 once when all checks have succeeded. I've verified that this lets my 486 boot again. I've also verified that a Core2 machine still uses the TSC as clocksource after the patch. Signed-off-by: Mikael Pettersson <mikpe@it.uu.se> Signed-off-by: Ingo Molnar <mingo@elte.hu> 37dff99a5f2a2630931bb0d2d18131f33c2bb66d Ingo Molnar mingo@elte.hu