commit 9e625ff8a37aefcc177b19614ffcffb5bc6eeea1 tree c3017de4134ddf75c50b319c738e2d155c7a3735 parent 392c14beaca2ee85a98d0c6b453501be67423a20 author Jean Delvare Thu, 29 Dec 2005 22:07:30 +0100 committer Linus Torvalds Thu, 29 Dec 2005 13:21:16 -0800 [PATCH] Simplify the VIDEO_SAA7134_OSS Kconfig dependency line Thanks to Roman Zippel for the suggestion. Signed-off-by: Jean Delvare [ Short explanation: Kconfig uses ternary math: n/m/y, and !m is m ] Signed-off-by: Linus Torvalds commit 392c14beaca2ee85a98d0c6b453501be67423a20 tree 0cde7d5f7022c7ca05e3adf82749bbb9f593e998 parent bc781aa93e6dfa85aa251c8898f831031db55c49 author Linus Torvalds Thu, 29 Dec 2005 13:01:54 -0800 committer Linus Torvalds Thu, 29 Dec 2005 13:01:54 -0800 Revert radeon AGP aperture offset changes This reverts the series of commits 67dbb4ea33731415fe09c62149a34f472719ac1d 281ab031a8c9e5b593142eb4ec59a87faae8676a 47807ce381acc34a7ffee2b42e35e96c0f322e52 that changed the GART VM start offset. It fixed some machines, but seems to continually interact badly with some X versions. Quoth Ben Herrenschmidt: "So I think at this point, the best is that we keep the old bogus code that at least is consistent with the bug in the server. I'm working on a big patch to X that reworks the memory map stuff completely and fixes those issues on the server side, I'll do a DRM patch matching this X fix as well so that the memory map is only ever set in one place and with what I hope is a correct algorithm..." Signed-off-by: Linus Torvalds commit bc781aa93e6dfa85aa251c8898f831031db55c49 tree a5e258c39e3013b24b1a6bb4d399159c11bfe020 parent 77f234f9d995c9b576b311a56f66db6837e598df parent d2b18394259ef621fd2a6322aa9934198fd87a6a author Linus Torvalds Thu, 29 Dec 2005 10:27:28 -0800 committer Linus Torvalds Thu, 29 Dec 2005 10:27:28 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-mmc commit 77f234f9d995c9b576b311a56f66db6837e598df tree 6dce48a0710fd05597173fe6b49a8ef482ec51f2 parent 80c72579f74fcfcd63e27c5e317091cb35bb1f12 parent a710ce08585e920740ffc84c7f3c82f4081169cf author Linus Torvalds Thu, 29 Dec 2005 10:27:07 -0800 committer Linus Torvalds Thu, 29 Dec 2005 10:27:07 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit 80c72579f74fcfcd63e27c5e317091cb35bb1f12 tree 38ea9f27b602a61139999d1bd1af27d45f2ac3a7 parent e597cb32e95a6c38e9ead981b169ef2974ccfec0 author Jean Delvare Wed, 28 Dec 2005 21:02:57 +0100 committer Linus Torvalds Thu, 29 Dec 2005 10:26:36 -0800 [PATCH] Fix recursive config dependency for SAA7134 Fix the cyclic dependency issue between CONFIG_SAA7134_ALSA and CONFIG_SAA7134_OSS (credits to Mauro Carvalho Chehab.) Signed-off-by: Jean Delvare Acked-by: Mauro Carvalho Chehab Signed-off-by: Linus Torvalds commit e597cb32e95a6c38e9ead981b169ef2974ccfec0 tree c893e4c0e2550620873e56ae7b8da4e1199ac675 parent 576fc0978b6b3673fce6d4b405f36449e508826c author Anton Blanchard Thu, 29 Dec 2005 10:46:29 +1100 committer Linus Torvalds Thu, 29 Dec 2005 10:26:36 -0800 [PATCH] ppc64: htab_initialize_secondary cannot be marked __init Sonny has noticed hotplug CPU on ppc64 is broken in 2.6.15-*. One of the problems is that htab_initialize_secondary is called when a cpu is being brought up, but it is marked __init. Signed-off-by: Anton Blanchard Acked-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 576fc0978b6b3673fce6d4b405f36449e508826c tree bc1069396afc93e4f10eb82ea1bf325eb479d05b parent f873e3e88d52774633968826c5b7fa7bf9697999 author Ravikiran G Thirumalai Thu, 29 Dec 2005 13:06:11 +0100 committer Linus Torvalds Thu, 29 Dec 2005 10:20:19 -0800 [PATCH] x86_64: Fix incorrect node_present_pages on NUMA Currently, we do not pass the correct start_pfn to e820_hole_size, to calculate holes. Following patch fixes that. The bug results in incorrect number of node_present_pages for each pgdat and causes ugly output in /sys and probably VM inbalances. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran Thirumalai Signed-off-by: Andi Kleen Sighed-off-by: Shair Fultheim Sighed-off-by: Linus Torvalds commit f873e3e88d52774633968826c5b7fa7bf9697999 tree f05481ea1f64d551b071c0b0fd71e09293c64611 parent ee025949586f80effa634ff273c2444795472780 author Riccardo Magliocchetti Wed, 28 Dec 2005 20:44:48 -0500 committer Linus Torvalds Thu, 29 Dec 2005 10:19:21 -0800 [PATCH] Input: aiptek - fix Y axis setup This patch fixes a typo introduced by conversion to dynamic input_dev allocation. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit ee025949586f80effa634ff273c2444795472780 tree 60c4216cbd0cf05ab30c8c11c6132506a1cff457 parent 63b44442416a243f05881b0dd094b621a46ab4b3 author Dave Jones Wed, 28 Dec 2005 20:01:04 -0500 committer Linus Torvalds Thu, 29 Dec 2005 10:19:21 -0800 [PATCH] fix ia64 compile failure with gcc4.1 __get_unaligned creates a typeof the var its passed, and writes to it, which on gcc4.1, spits out the following error: drivers/char/vc_screen.c: In function 'vcs_write': drivers/char/vc_screen.c:422: error: assignment of read-only variable 'val' Signed-off-by: Dave Jones [ The "right" fix would be to try to fix but that's hard to do with the tools gcc gives us. So this simpler patch is preferable -- Linus ] Signed-off-by: Linus Torvalds commit 63b44442416a243f05881b0dd094b621a46ab4b3 tree 81e009cce86af20a866cb0853320e99615d6fee4 parent 74433c0fe105f47e78c1f2267312693870c9ebc3 author Paolo 'Blaisorblade' Giarrusso Thu, 29 Dec 2005 17:40:02 +0100 committer Linus Torvalds Thu, 29 Dec 2005 09:48:15 -0800 [PATCH] uml: fix compilation with CONFIG_MODE_TT disabled Fix UML compilation when SKAS mode is disabled. Indeed, we were compiling SKAS-only object files, which failed due to some SKAS-only headers being excluded from the search path. Thanks to the bug report from Pekka J Enberg. Acked-by: Pekka J Enberg Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 74433c0fe105f47e78c1f2267312693870c9ebc3 tree 7b5f23e5ae0fc252feadb34f5dc7c2448261326f parent 30f04a4efa73dc80bf3f59f3f19ad5a24ac5ac0a author Paolo 'Blaisorblade' Giarrusso Thu, 29 Dec 2005 17:39:59 +0100 committer Linus Torvalds Thu, 29 Dec 2005 09:48:15 -0800 [PATCH] Hostfs: update for new glibc - add missing symbol exports Today, when compiling UML, I got warnings for two used unexported symbols: readdir64 and truncate64. Indeed, my glibc headers are aliasing readdir to readdir64 and truncate to truncate64 (and so on). I'm then adding additional exports. Since I've no idea if the symbols where always provided in the supported glibc's, I've added weak definitions too. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 30f04a4efa73dc80bf3f59f3f19ad5a24ac5ac0a tree 0f7f165bcf73bf26f782a2b56d05020ea6d4d5b0 parent 3d0a07e3310c947c048bd01d8d0efa0e4fae5ba9 author Paolo 'Blaisorblade' Giarrusso Thu, 29 Dec 2005 17:39:57 +0100 committer Linus Torvalds Thu, 29 Dec 2005 09:48:15 -0800 [PATCH] uml: hostfs - fix possible PAGE_CACHE_SHIFT overflows Prevent page->index << PAGE_CACHE_SHIFT from overflowing. There is a casting there, but was added without care, so it's at the wrong place. Note the extra parens around the shift - "+" is higher precedence than "<<", leading to a GCC warning which saved all us. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 3d0a07e3310c947c048bd01d8d0efa0e4fae5ba9 tree 7a12044022ecb0c3fcfd88a4d85a5afe91b5412a parent 516949480d3700cbde4272228a102c84721d6007 author Paolo 'Blaisorblade' Giarrusso Thu, 29 Dec 2005 17:39:54 +0100 committer Linus Torvalds Thu, 29 Dec 2005 09:48:15 -0800 [PATCH] Hostfs: remove unused var Trivial removal of unused variable from this file - doesn't even change the generated assembly code, in fact (gcc should trigger a warning for unused value here). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 516949480d3700cbde4272228a102c84721d6007 tree b7fef00010e2ad97a9fdab4f683c1516948749cb parent 3603bc8dc5ab33941e6378fe52ea03b7f5561109 author Paolo 'Blaisorblade' Giarrusso Thu, 29 Dec 2005 17:39:51 +0100 committer Linus Torvalds Thu, 29 Dec 2005 09:48:15 -0800 [PATCH] uml: fix random segfaults at bootup Don't use printk() where "current_thread_info()" is crap. Until when we switch to running on init_stack, current_thread_info() evaluates to crap. Printk uses "current" at times (in detail, ¤t is evaluated with CONFIG_DEBUG_SPINLOCK to check the spinlock owner task). And this leads to random segmentation faults. Exactly, what happens is that ¤t = *(current_thread_info()), i.e. round down $esp and dereference the value. I.e. access the stack below $esp, which causes SIGSEGV on a VM_GROWSDOWN vma (see arch/i386/mm/fault.c). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 3603bc8dc5ab33941e6378fe52ea03b7f5561109 tree f24249bb172b593b0087efa31112967ee3c44325 parent 68ca243dd1dc90bd42bae3945e804c1042584920 parent a8b554e75b0c14d5e12a11eaea604e536f49da29 author Linus Torvalds Wed, 28 Dec 2005 13:45:19 -0800 committer Linus Torvalds Wed, 28 Dec 2005 13:45:19 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6 commit 68ca243dd1dc90bd42bae3945e804c1042584920 tree df6cb278ddce22daf8b524c82f2b43f012e025a0 parent d5784b57d2e08a632b971baae23266121004ef3b author David S. Miller Wed, 28 Dec 2005 13:27:04 -0800 committer David S. Miller Wed, 28 Dec 2005 13:27:04 -0800 [SERMOUSE]: Sun mice speak 5-byte protocol too. Noticed by Christophe Zimmerman, this explains the slow mouse movement with 2.6.x kernels. And checking the 2.4.x drivers/sbus/char/sunmouse.c driver shows we always used a 5-byte protocol with Sun mice in the past. I have no idea how the 3-byte thing got into the 2.6.x driver, but it's surely wrong. Signed-off-by: David S. Miller commit d5784b57d2e08a632b971baae23266121004ef3b tree a00fb221e07d68eefa4c093efa98ef84a03342af parent 67dbb4ea33731415fe09c62149a34f472719ac1d author David S. Miller Wed, 28 Dec 2005 13:22:54 -0800 committer David S. Miller Wed, 28 Dec 2005 13:22:54 -0800 [SPARC]: Use STABS_DEBUG and DWARF_DEBUG macros in vmlinux.lds.S Signed-off-by: David S. Miller commit a8b554e75b0c14d5e12a11eaea604e536f49da29 tree 53392403940c6d28c1be4b75e7b79e8c50938faa parent 091465d7514893a55dcf63e420698b21159c39a7 author David S. Miller Wed, 28 Dec 2005 13:05:41 -0800 committer David S. Miller Wed, 28 Dec 2005 13:05:41 -0800 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller commit 091465d7514893a55dcf63e420698b21159c39a7 tree cbfaedb45164d21d0d2f4af5efad2fc78dd37f92 parent 67dbb4ea33731415fe09c62149a34f472719ac1d author Chris Elmquist Tue, 20 Dec 2005 13:25:19 -0800 committer David S. Miller Wed, 28 Dec 2005 13:04:52 -0800 [TG3]: ethtool -d hangs PCIe systems Resubmitting after recommendation to use GET_REG32_1() instead of GET_REG32_LOOP(..., 1). Retested. Problem remains fixed. Prevent tg3_get_regs() from reading reserved and undocumented registers at RX_CPU_BASE and TX_CPU_BASE offsets which caused hostile behavior on PCIe platforms. Acked-by: Michael Chan Signed-off-by: David S. Miller commit 67dbb4ea33731415fe09c62149a34f472719ac1d tree 5d417d821fb181ce683c60dabcfa33d8c6f65fb8 parent 5ab4a6c81eb3dbe32361791d1535f9153f79b0ed author Benjamin Herrenschmidt Tue, 27 Dec 2005 12:49:33 +1100 committer Linus Torvalds Tue, 27 Dec 2005 19:57:52 -0800 [PATCH] Fix more radeon GART start calculation cases As reported by Jules Villard and some others, the recent GART aperture start reconfiguration causes problems on some setups. What I _think_ might be happening is that the X server is also trying to muck around with the card memory map and is forcing it back into a wrong setting that also happens to no longer match what the DRM wants to do and blows up. There are bugs all over the place in that code (and still some bugs in the DRM as well anyway). This patch attempts to avoid that by using the largest of the 2 values, which I think will cause it to behave as it used to for you and will still fix the problem with machines that have an aperture size smaller than the video memory. Acked-by: Jules Villard Signed-off-by: Linus Torvalds commit 5ab4a6c81eb3dbe32361791d1535f9153f79b0ed tree c89504389bf1a3452a499db9ea19acea76941616 parent 1b93ae64cabe5e28dd5a1f35f96f938ca4f6ae20 author David L Stevens Tue, 27 Dec 2005 14:03:00 -0800 committer David S. Miller Tue, 27 Dec 2005 14:03:00 -0800 [IPV6] mcast: Fix multiple issues in MLDv2 reports. The below "jumbo" patch fixes the following problems in MLDv2. 1) Add necessary "ntohs" to recent "pskb_may_pull" check [breaks all nonzero source queries on little-endian (!)] 2) Add locking to source filter list [resend of prior patch] 3) fix "mld_marksources()" to a) send nothing when all queried sources are excluded b) send full exclude report when source queried sources are not excluded c) don't schedule a timer when there's nothing to report NOTE: RFC 3810 specifies the source list should be saved and each source reported individually as an IS_IN. This is an obvious DOS path, requiring the host to store and then multicast as many sources as are queried (e.g., millions...). This alternative sends a full, relevant report that's limited to number of sources present on the machine. 4) fix "add_grec()" to send empty-source records when it should The original check doesn't account for a non-empty source list with all sources inactive; the new code keeps that short-circuit case, and also generates the group header with an empty list if needed. 5) fix mca_crcount decrement to be after add_grec(), which needs its original value These issues (other than item #1 ;-) ) were all found by Yan Zheng, much thanks! Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 1b93ae64cabe5e28dd5a1f35f96f938ca4f6ae20 tree a8c5c7d08e6c658853245ad0b0cf47f0af1ff83d parent 6732badee0dad467fcc9dd0168af8677b2b1bc2f author David S. Miller Tue, 27 Dec 2005 13:57:59 -0800 committer David S. Miller Tue, 27 Dec 2005 13:57:59 -0800 [NET]: Validate socket filters against BPF_MAXINSNS in one spot. Currently the checks are scattered all over and this leads to inconsistencies and even cases where the check is not made. Based upon a patch from Kris Katterjohn. Signed-off-by: David S. Miller commit 6732badee0dad467fcc9dd0168af8677b2b1bc2f tree 43fd9fbb5759de0e4a182d473621699b1ff453bc parent 79cac2a221ce18642550a13bed0f0203514923ea author YOSHIFUJI Hideaki Tue, 27 Dec 2005 13:35:15 -0800 committer David S. Miller Tue, 27 Dec 2005 13:35:15 -0800 [IPV6]: Fix addrconf dead lock. We need to release idev->lcok before we call addrconf_dad_stop(). It calls ipv6_addr_del(), which will hold idev->lock. Bug spotted by Yasuyuki KOZAKAI . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit a710ce08585e920740ffc84c7f3c82f4081169cf tree 28032138cf7bd4cc903ce51083800df6a46e5dc8 parent 04333393b930370db0cc29fdf0dbbd08ecd43337 author Russell King Tue, 27 Dec 2005 11:10:34 +0000 committer Russell King Tue, 27 Dec 2005 11:10:34 +0000 [SERIAL] Fix AMBA PL011 sysrq character handling We only want the received character without the status bits for sysrq handling. Signed-off-by: Russell King commit 79cac2a221ce18642550a13bed0f0203514923ea tree ecc66198fee701916e247c44e6bad0db387535ce parent 6f4353d891b5e477528cd0b996e0263fecdf5d5f author David Kimdon Mon, 26 Dec 2005 17:27:10 -0800 committer David S. Miller Mon, 26 Dec 2005 17:27:10 -0800 [BR_NETFILTER]: Fix leak if skb traverses > 1 bridge Call nf_bridge_put() before allocating a new nf_bridge structure and potentially overwriting the pointer to a previously allocated one. This fixes a memory leak which can occur when the bridge topology allows for an skb to traverse more than one bridge. Signed-off-by: David Kimdon Signed-off-by: David S. Miller commit 6f4353d891b5e477528cd0b996e0263fecdf5d5f tree 9f8f9f066fa82cf6b45a0b5002549f4b08c5fbbb parent 04333393b930370db0cc29fdf0dbbd08ecd43337 author David L Stevens Mon, 26 Dec 2005 17:03:46 -0800 committer David S. Miller Mon, 26 Dec 2005 17:03:46 -0800 [IPV6]: Increase default MLD_MAX_MSF to 64. The existing default of 10 is just way too low. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 04333393b930370db0cc29fdf0dbbd08ecd43337 tree f50d8ab5315919c34ef2c97d99f92e3920b4c4d4 parent f89f5948fc10bb973cd452d2e334da207828e228 author James Bottomley Mon, 26 Dec 2005 09:58:49 -0600 committer Linus Torvalds Mon, 26 Dec 2005 10:17:43 -0800 [PATCH] Fix Fibre Channel boot oops The oops is characteristic of the underlying device being removed from visibility before the class device, and sure enough we do device_del() before transport_unregister() in the scsi_target_reap() routines. I've no idea why this is suddenly showing up, since the code has been in there since that function was first invented. However, I've confirmed this fixes Andrew Vasquez's boot oops. Signed-off-by: James Bottomley Signed-off-by: Linus Torvalds commit d2b18394259ef621fd2a6322aa9934198fd87a6a tree cedd99314fd5408559d410c5fc51c1af2a62f6ed parent d5ea4e26602fa7f5141872f2c17a862f1974a73f author Russell King Thu, 22 Dec 2005 23:21:38 +0000 committer Russell King Thu, 22 Dec 2005 23:21:38 +0000 [MMC] Set correct capacity for 1024-byte block cards We were passing set_capacity() the capacity we calculated in terms of the number of blocks on the card, which happened to be the right units for 512-byte block cards. However, with 1024-byte block cards, we end up setting the capacity to half the number of blocks. Fix this by shifting by the appropriate amount. Thanks to Todd Blumer for pointing this out. Use get_capacity() to report the card capacity, rather than recalculating it from the CSD information. Finally, use our chosen IO block size for the SET_BLOCKLEN command rather than the CSD read block size. Currently these are equivalent, but will not be in the future. Signed-off-by: Russell King