commit 4c91aedb75d1b87deccf16d58f67fb46402d7d44 Author: Linus Torvalds Date: Tue Jun 28 22:57:29 2005 -0700 Linux v2.6.13-rc1 Ok, a lot of things were pending after the 2.6.12 release, let's try to start calming things down again. commit b9a05d1d51e27681e8a1162d8f11c1820915e921 Author: Jeff Garzik Date: Wed Jun 29 01:17:55 2005 -0400 [PATCH] ieee80211.h build fix This crept in with the resync-to-mainline. Nothing uses 802.11-crypt in mainline, so we can safely comment it out for now. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit a839688362e32f01608838516036697e30618b39 Merge: 2fa938b8a3964c21b23d9d095091e7abc88249c5 12dc2fdd3e6067f5137e4a6d8af0b1a994952f52 Author: Linus Torvalds Date: Tue Jun 28 21:24:32 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 2fa938b8a3964c21b23d9d095091e7abc88249c5 Author: Dave Jones Date: Tue Jun 28 20:08:29 2005 -0400 [PATCH] sis 760 support. This patch adds the SiS 760 ID to the amd64-agp driver, so that agpgart can be used on Athlon64 boards based on this chip. Signed-off-by: Daniel Drake Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 2668fb91cbfbd5e6799017a3579f20309aac758b Author: William Lee Irwin III Date: Tue Jun 28 20:45:31 2005 -0700 [PATCH] sparc32: Kconfig fixups Something reverted most of the arch/sparc/Kconfig changes, leaving arch/sparc/ unconfigurable. This patch re-removes the parts made redundant by drivers/Kconfig in addition to a mysterious, spurious second instance of source "mm/Kconfig". cvs strikes again? Signed-off-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84da7c0844f8ab7668559c61e4f0af416fc58cf6 Author: Randy Dunlap Date: Tue Jun 28 20:45:30 2005 -0700 [PATCH] Doc/Submitting: corrections, additions Corrections to Documentation/Submitting{Drivers,Patches} - update LANANA info. - fix some typos - update 2.2 kernel maintainer info. - update 'dontdiff' info. - update URLs for patch scripts - add Trivial Patch Monkey URL - add more references for submitting patches Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6623e6205e36c310367009f3b01f5cbe7cc0005d Author: Mauro Carvalho Chehab Date: Tue Jun 28 20:45:28 2005 -0700 [PATCH] V4L: documentation changes - mostly new cards included New cards included. V4L1 api renamed. Message included informing it is obsoleted by V4L2 API. V4L2 api included. Mark all 7135 cards as 7133. Signed-off-by: Luc Saillard . Signed-off-by: Nickolay V Shmyrev Signed-off-by: Hermann Pitton Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 115d6f3fd25991f2a7de1ff4d758086209b1ed12 Author: Mauro Carvalho Chehab Date: Tue Jun 28 20:45:27 2005 -0700 [PATCH] V4L: API new webcam formats included Add Philips Webcam format. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Luc Saillard . Signed-off-by: Nickolay V Shmyrev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 060d3027f26aab9adeac8ff6d1184bca67c7d174 Author: Mauro Carvalho Chehab Date: Tue Jun 28 20:45:25 2005 -0700 [PATCH] v4l: bttv new insmod parameters * bttv-driver.c, bttvp.h: - New bttv module params: - uv_ratio : allow a ratio of saturation between u and v. If you have a ratio of 40 and a saturation of 100, usat will be 80 and vstat 120. Useful to correct a bad color balance. - full_luma_range : provide a better contrast in using the full range 0-253 of values instead of 16-253. - coring : to have a better black level. - radio range is now defined on tuner-core.c. Cleaning up. * bttvp.h: - Fix gcc 4.0 compilation Signed-off-by: Jorik Jonker Signed-off-by: Sylvain Meyer Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Nickolay V Shmyrev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 586b0cab2516640fec4dffc3049c4d8bca188f89 Author: Mauro Carvalho Chehab Date: Tue Jun 28 20:45:21 2005 -0700 [PATCH] v4l: tuner improvements *tuner-core.c: - some tuner_info msgs will be generated only if insmod opt tuner_debug enabled. - Implemented tuner-core support for VIDIO_S_TUNER to allow changing mono/stereo mode - Remove unneeded config options. - I2C_CLIENT_MULTI option removed. - support for Philips FMD12ME hybrid tuner - allow to initialize with another tuner - Move PHILIPS_FMD initialization code to set_type function, * tda8290: - Fix dumb error in tda8290 tunning. - Radio tuner uses high-precision step instead of 62.5 KHz. *tea5767.c: - tuner_info msgs will be generated only if insmod tuner option tuner_debug enabled. - some cleanups for better reading. - Radio tuner uses high-precision step instead of 62.5 KHz. - Changing radio mode stereo/mono for tea5767 working. *tuner-simple.c: - TNF9533-D/IF UHF fixup. - Radio tuners now uses high-precision step instead of 62.5 KHz. *mt20xx.c: - Radio tuner uses high-precision step instead of 62.5 KHz. *tda9887.c: - tab and blank spaces corrections. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Gerd Knorr Signed-off-by: Nickolay V Shmyrev Signed-off-by: Hartmut Hackmann Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96b6aba08762f09e5dfa616854cb80ce054a7bf8 Author: Mauro Carvalho Chehab Date: Tue Jun 28 20:45:20 2005 -0700 [PATCH] V4L maintainer patch This patch updates maintainer info for BTTV and V4L. Signed-off-by: Mauro Carvalho Chehab Acked-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 200803dfe4ff772740d63db725ab2f1b185ccf92 Author: Alan Cox Date: Tue Jun 28 20:45:18 2005 -0700 [PATCH] irqpoll Anyone reporting a stuck IRQ should try these options. Its effectiveness varies we've found in the Fedora case. Quite a few systems with misdescribed IRQ routing just work when you use irqpoll. It also fixes up the VIA systems although thats now fixed with the VIA quirk (which we could just make default as its what Redmond OS does but Linus didn't like it historically). A small number of systems have jammed IRQ sources or misdescribes that cause an IRQ that we have no handler registered anywhere for. In those cases it doesn't help. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21fe3471c3aaa5c489c5d3a4d705291eb7511248 Author: Mingming Cao Date: Tue Jun 28 20:45:16 2005 -0700 [PATCH] ext3: reduce allocate-with-reservation lock latencies Currently in ext3 block reservation code, the global filesystem reservation tree lock (rsv_block) is hold during the process of searching for a space to make a new reservation window, including while scaning the block bitmap to verify if the avalible window has a free block. Holding the lock during bitmap scan is unnecessary and could possibly cause scalability issue and latency issues. This patch tries to address this by dropping the lock before scan the bitmap. Before that we need to reserve the open window in case someone else is targetting at the same window. Question was should we reserve the whole free reservable space or just the window size we need. Reserve the whole free reservable space will possibly force other threads which intended to do block allocation nearby move to another block group(cause bad layout). In this patch, we just reserve the desired size before drop the lock and scan the block bitmap. This patch fixed a ext3 reservation latency issue seen on a cvs check out test. Patch is tested with many fsx, tiobench, dbench and untar a kernel test. Signed-Off-By: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb3cc4320e1fd87143683b540e459a2e20fdc9bb Author: Nick Piggin Date: Tue Jun 28 20:45:15 2005 -0700 [PATCH] blk: light iocontext ops get_io_context needlessly turned off interrupts and checked for racing io context creations. Both of which aren't needed, because the io context can only be created while in process context of the current process. Also, split the function in 2. A light version, current_io_context does not elevate the reference count specifically, but can be used when in process context, because the process holds a reference itself. Signed-off-by: Nick Piggin Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6344532a26a318c128102507f6328aaafe02d4d Author: Nick Piggin Date: Tue Jun 28 20:45:14 2005 -0700 [PATCH] blk: reduce locking Change around locking a bit for a result of 1-2 less spin lock unlock pairs in request submission paths. Signed-off-by: Nick Piggin Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 450991bc1026135ee30482a4a806d069915ab2f6 Author: Nick Piggin Date: Tue Jun 28 20:45:13 2005 -0700 [PATCH] blk: __make_request efficiency In the case where the request is not able to be merged by the elevator, don't retake the lock and retry the merge mechanism after allocating a new request. Instead assume that the chance of a merge remains slim, and now that we've done most of the work allocating a request we may as well just go with it. Also be rid of the GFP_ATOMIC allocation: we've got working mempools for the block layer now, so let's save atomic memory for things like networking. Lastly, in get_request_wait, do an initial get_request call before going into the waitqueue. This is reported to help efficiency. Signed-off-by: Nick Piggin Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69f63c5c34d0b34ee2cbf10c5ff7fcff0404879e Author: KAMBAROV, ZAUR Date: Tue Jun 28 20:45:12 2005 -0700 [PATCH] coverity: tty_ldisc_ref return null check We add a check of the return value of tty_ldisc_ref(), which is checked 7 out of 8 times, e.g.: 149 ld = tty_ldisc_ref(tty); 150 if (ld != NULL) { 151 if (ld->set_termios) 152 (ld->set_termios)(tty, &old_termios); 153 tty_ldisc_deref(ld); 154 } This defect was found automatically by Coverity Prevent, a static analysis tool. (akpm: presumably `ld' is never NULL. Oh well) Signed-off-by: Zaur Kambarov Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7f1721ef284c6e8257c7471a02148db76105036 Author: KAMBAROV, ZAUR Date: Tue Jun 28 20:45:11 2005 -0700 [PATCH] coverity: fs/ext3/super.c: match_int return check The return value of "match_int" is checked 27 out of 28 times In lib/parser.c 142 /** 143 * match_int: - scan a decimal representation of an integer from a substring_t 144 * @s: substring_t to be scanned 145 * @result: resulting integer on success 146 * 147 * Description: Attempts to parse the &substring_t @s as a decimal integer. On 148 * success, sets @result to the integer represented by the string and returns 0. 149 * Returns either -ENOMEM or -EINVAL on failure. 150 */ 151 int match_int(substring_t *s, int *result) 152 { 153 return match_number(s, result, 0); 154 } Signed-off-by: Zaur Kambarov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec471dc484b8ca5352903ee28796b8b248313547 Author: KAMBAROV, ZAUR Date: Tue Jun 28 20:45:10 2005 -0700 [PATCH] coverity: fs/udf/namei.c null check "dir" was dereferenced before null check Signed-off-by: Zaur Kambarov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c101fd439dab60d6eba76afb35fd2696f42c63d Author: KAMBAROV, ZAUR Date: Tue Jun 28 20:45:08 2005 -0700 [PATCH] coverity: ipmi_msghandler() channels array overrun fix We fix the check in 1084, which was 1084 if (addr->channel > IPMI_NUM_CHANNELS) { 1085 spin_lock_irqsave(&intf->counter_lock, flags); 1086 intf->sent_invalid_commands++; 1087 spin_unlock_irqrestore(&intf->counter_lock, flags); 1088 rv = -EINVAL; 1089 goto out_err; 1090 } addr->channel is used in 1092 if (intf->channels[addr->channel].medium Definitions involved: 221 struct ipmi_channel channels[IPMI_MAX_CHANNELS]; 134 #define IPMI_MAX_CHANNELS 8 In /linux-2.6.12-rc6/include/linux/ipmi.h 148 #define IPMI_NUM_CHANNELS 0x10 Signed-off-by: Zaur Kambarov Cc: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a77e3362a224212d9d3b9e6fdec44df2eef6cf92 Author: KAMBAROV, ZAUR Date: Tue Jun 28 20:45:06 2005 -0700 [PATCH] coverity: i386: scsi_lib buffer overrun fix The check in 627 BUG_ON(index > SG_MEMPOOL_NR); with SG_MEMPOOL_NR defined in 32 #define SG_MEMPOOL_NR (sizeof(scsi_sg_pools)/sizeof(struct scsi_host_sg_pool)) was not sufficient. sgp, set in 629 sgp = scsi_sg_pools + index; is dereferenced in 630 mempool_free(sgl, sgp->pool); Signed-off-by: Zaur Kambarov Cc: Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8f5034540195307362d071a8b387226b410469f Author: KAMBAROV, ZAUR Date: Tue Jun 28 20:45:06 2005 -0700 [PATCH] coverity: i386: build.c: negative return to unsigned fix Variable "c" was declared as an unsigned int, but used in: 125 for (i=0 ; (c=read(fd, buf, sizeof(buf)))>0 ; i+=c ) 126 if (write(1, buf, c) != c) 127 die("Write call failed"); (akpm: read() can return -1. If it does, we fill the disk up with garbage). Signed-off-by: Zaur Kambarov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4cceb4d13abaedbd52e54053367c793ed4aedb6b Author: GOTO Masanori Date: Tue Jun 28 20:45:05 2005 -0700 [PATCH] headers: include linux/types.h for usb_ch9.h This patch for usb_ch9.h includes linux/types.h instead of asm/types.h so that __le16 and so on is explicitly defined. It also cleans up non standard // comment. Signed-off-by: GOTO Masanori Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3607d1dfc80dcfbd3a6f236c70aa0d8eb7292278 Author: GOTO Masanori Date: Tue Jun 28 20:45:04 2005 -0700 [PATCH] headers: include linux/compiler.h for __user This patch lets i2c-dev.h include linux/compiler.h so that __user is defined. Signed-off-by: GOTO Masanori Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12822bc272e857544476cef9175462711899008b Author: GOTO Masanori Date: Tue Jun 28 20:45:03 2005 -0700 [PATCH] headers: enable ppc64 ___arch__swab16 and ___arch__swab32 This patch cleans up asm-ppc64/byteorder.h to enable ___arch__swab16 and ___arch__swab32 which are marked TODO currently. It removes ___arch__swab64 because ppc64 does not have short instruction combinations for swab64, the recent gcc generates enough smart code that is equivalent to hand assembled code under my tests. Signed-off-by: GOTO Masanori Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c016e2257acd00a7ffd87fa1eec896138563d1aa Author: Sébastien Dugu Date: Tue Jun 28 20:44:59 2005 -0700 [PATCH] aio-retry-fix: fix aio retry work queueing In the case of buffered AIO, in the aio retry path (aio_run_iocb), when the retry method returns EIOCBRETRY the kicked iocb is added to the context run list but is never queued onto the work queue. The request therefore is never completed. This patch fixes that by adding the appropriate call to aio_queue_work in aio_run_aiocb so that subsequent retries will be handled by the aio worker thread. Signed-off-by: Sébastien Dugué Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 334a13ec3d01a1a4b4f2249735b793105cb4a519 Author: Christoph Hellwig Date: Tue Jun 28 20:44:58 2005 -0700 [PATCH] really remove xattr_acl.h Looks like it sneaked back with the NFS ACL merge.. Signed-off-by: Christoph Hellwig Cc: Trond Myklebust Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aade0e82739f4b24c5b952de68c8d794459ad531 Author: Adrian Bunk Date: Tue Jun 28 20:44:56 2005 -0700 [PATCH] drivers/isdn/: make some code static This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk Signed-off-by: Armin Schindler Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 687a21cee17000177b1935896b9b475acf136678 Author: Pekka J Enberg Date: Tue Jun 28 20:44:55 2005 -0700 [PATCH] rename wakeup_bdflush to wakeup_pdflush Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05133fc498e788e1c1ca4e906f9e05d9779fd63b Author: Andrew Morton Date: Tue Jun 28 20:44:54 2005 -0700 [PATCH] swabb.h warning fixes In file included from drivers/media/dvb/ttpci/av7110_hw.c:38: include/linux/byteorder/swabb.h:96: warning: type qualifiers ignored on function return type include/linux/byteorder/swabb.h:110: warning: type qualifiers ignored on function return type In file included from drivers/media/dvb/ttpci/av7110_v4l.c:36: include/linux/byteorder/swabb.h:96: warning: type qualifiers ignored on function return type include/linux/byteorder/swabb.h:110: warning: type qualifiers ignored on function return type In file included from drivers/media/dvb/ttpci/av7110_av.c:37: include/linux/byteorder/swabb.h:96: warning: type qualifiers ignored on function return type include/linux/byteorder/swabb.h:110: warning: type qualifiers ignored on function return type drivers/isdn/icn/icn.c:719:4: warning: #warning TODO test headroom or use skb->nb to flag ACK In file included from drivers/media/dvb/ttpci/av7110_ca.c:39: include/linux/byteorder/swabb.h:96: warning: type qualifiers ignored on function return type include/linux/byteorder/swabb.h:110: warning: type qualifiers ignored on function return type In file included from drivers/media/dvb/ttpci/av7110.c:41: include/linux/byteorder/swabb.h:96: warning: type qualifiers ignored on function return type include/linux/byteorder/swabb.h:110: warning: type qualifiers ignored on function return type Does declaring a function to return a const value actually mean something to gcc? Dunno. Kill it and replace sone `__inline__'s with `inline' too. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b79646e3dd51b389b2a570b454f8e2fb7a613e37 Author: Andrew Morton Date: Tue Jun 28 20:44:53 2005 -0700 [PATCH] hisax warning fixes drivers/isdn/hisax/hfc4s8s_l1.c:317: warning: type qualifiers ignored on function return type drivers/isdn/hisax/hfc4s8s_l1.c:329: warning: type qualifiers ignored on function return type Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b92eac01c3c6ad5dab5c74d3bc32ac8e9bf4dae7 Author: Stanislaw W. Gruszka Date: Tue Jun 28 20:44:51 2005 -0700 [PATCH] request_firmware(): avoid race conditions Avoid race occurs when some process have open file descriptor for class device attributes and already firmware allocated memory are freed. Don't allow negative loading timeout. Signed-off-by: Stanislaw W. Gruszka Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcc8ca09920755520ba8a1e2d9f72fe8ff892643 Author: Emmanuel Colbus Date: Tue Jun 28 20:44:49 2005 -0700 [PATCH] Adapt drivers/char/vt_ioctl.c to non-x86 This code uses the x86 (non-AMD-ELAN) value of CLOCK_TICK_RATE instead of CLOCK_TICK_RATE itself, which is wrong for other archs. Signed-off-by: Emmanuel Colbus Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f01b1b0baa454825ed95c28d2a6a71bbf4510836 Author: Oleg Nesterov Date: Tue Jun 28 20:44:47 2005 -0700 [PATCH] ITIMER_REAL: fix possible deadlock and race As Steven Rostedt pointed out, there are 2 problems with ITIMER_REAL timers. 1. do_setitimer() does not call del_timer_sync() in case when the timer is not pending (it_real_value() returns 0). This is wrong, the timer may still be running, and it can rearm itself. 2. It calls del_timer_sync() with tsk->sighand->siglock held. This is deadlockable, because timer's handler needs this lock too. Signed-off-by: Oleg Nesterov Acked-by: Steven Rostedt Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b36bbb6c3d5244eaf52241ec69f79494137f2db0 Author: Lennert Buytenhek Date: Tue Jun 28 20:44:46 2005 -0700 [PATCH] ixp4xx/ixp2000 watchdog driver typo Fix the same typo in the ixp4xx and ixp2000 watchdog drivers. Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45ae36cbce9c7f55615e2b5f8faf23c7a06d0bd2 Author: Luc Van Oostenryck Date: Tue Jun 28 20:44:44 2005 -0700 [PATCH] drivers/char/tipar.c: off by one array access In the setup function, the delay variable is initialized with ints[2], but ints is declared as: int ints[2]; Since the module parameter should correspond to: tipar=timeout,delay I suppose that the following patch fix the problem. Signed-off-by: Luc Van Oostenryck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47f176fdaf8924bc83fddcf9658f2fd3ef60d573 Author: Luca Falavigna Date: Tue Jun 28 20:44:42 2005 -0700 [PATCH] Using msleep() instead of HZ Use msleep() in a few places. Signed-off-by: Luca Falavigna Acked-by: Ingo Molnar Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d451687ca57371d303c5554b377d7f5c2ac6ae0 Author: Wen-chien Jesse Sung Date: Tue Jun 28 20:44:41 2005 -0700 [PATCH] fix semaphore handling in __unregister_chrdev_region This up() should be down() instead. Signed-off-by: Wen-chien Jesse Sung Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12dc2fdd3e6067f5137e4a6d8af0b1a994952f52 Author: David S. Miller Date: Tue Jun 28 16:27:32 2005 -0700 [NET]: drivers/net/slip.c needs linux/delay.h For msleep_interruptible(). Signed-off-by: David S. Miller commit 9666dae51013b064e7d77fc36b5cee98dd167ed5 Author: Patrick McHardy Date: Tue Jun 28 16:04:44 2005 -0700 [NETFILTER]: Fix connection tracking bug in 2.6.12 In 2.6.12 we started dropping the conntrack reference when a packet leaves the IP layer. This broke connection tracking on a bridge, because bridge-netfilter defers calling some NF_IP_* hooks to the bridge layer for locally generated packets going out a bridge, where the conntrack reference is no longer available. This patch keeps the reference in this case as a temporary solution, long term we will remove the defered hook calling. No attempt is made to drop the reference in the bridge-code when it is no longer needed, tc actions could already have sent the packet anywhere. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bcd61272db5e643b6d9c01c9d5085b914d9f19df Author: Arnd Bergmann Date: Tue Jun 28 15:58:50 2005 -0700 [NET]: Add missing include to linux/netdevice.h linux/etherdevice.h can't be included standalone at the moment, which is required in order to sort the header files in the recommended alphabetic order. This patch fixes that and is needed to build spider_net. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller commit ff593c592a5d674822dce31143635b025f6415b2 Author: Denis Vlasenko Date: Tue Jun 28 15:49:06 2005 -0700 [NET]: Micro optimization in eth_header() Signed-off-by: Denis Vlasenko Signed-off-by: David S. Miller commit 7fe40f73d7591b38f129fe6a9c0fa46e0b192d09 Author: YOSHIFUJI Hideaki Date: Tue Jun 28 15:46:24 2005 -0700 [IPV6]: remove more unused IPV6_AUTHHDR things. Remove two more unused IPV6_AUTHHDR option things, which I failed to remove them last time, plus, mark IPV6_AUTHHDR obsolete. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit fb3d89498d268c8dedc1ab5b15fa64f536564577 Author: Neil Horman Date: Tue Jun 28 15:40:02 2005 -0700 [IPVS]: Close race conditions on ip_vs_conn_tab list modification In an smp system, it is possible for an connection timer to expire, calling ip_vs_conn_expire while the connection table is being flushed, before ct_write_lock_bh is acquired. Since the list iterator loop in ip_vs_con_flush releases and re-acquires the spinlock (even though it doesn't re-enable softirqs), it is possible for the expiration function to modify the connection list, while it is being traversed in ip_vs_conn_flush. The result is that the next pointer gets set to NULL, and subsequently dereferenced, resulting in an oops. Signed-off-by: Neil Horman Acked-by: JulianAnastasov Signed-off-by: David S. Miller commit 689be43945e9ca7dd704522e55af1b8a73a994d3 Author: David S. Miller Date: Tue Jun 28 15:25:31 2005 -0700 [NET]: Remove gratuitous use of skb->tail in network drivers. Many drivers use skb->tail unnecessarily. In these situations, the code roughly looks like: dev = dev_alloc_skb(...); [optional] skb_reserve(skb, ...); ... skb->tail ... But even if the skb_reserve() happens, skb->data equals skb->tail. So it doesn't make any sense to use anything other than skb->data in these cases. Another case was the s2io.c driver directly mucking with the skb->data and skb->tail pointers. It really just wanted to do an skb_reserve(), so that's what the code was changed to do instead. Another reason I'm making this change as it allows some SKB cleanups I have planned simpler to merge. In those cleanups, skb->head, skb->tail, and skb->end pointers are removed, and replaced with skb->head_room and skb->tail_room integers. Signed-off-by: David S. Miller Acked-by: Jeff Garzik commit f835e471b557c45d2e5701ea5215f6e739b4eb39 Author: Robert Olsson Date: Tue Jun 28 15:00:39 2005 -0700 [IPV4]: Broken memory allocation in fib_trie This should help up the insertion... but the resize is more crucial. and complex and needs some thinking. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 7e568e62e9d4674d487cdc11f369e49e56ce6703 Merge: adb2705a89e8b41abcf29c0ed86f4ce93ab36734 50273978975ee62938b7ca612e281927cd789c13 Author: Linus Torvalds Date: Tue Jun 28 15:00:08 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit adb2705a89e8b41abcf29c0ed86f4ce93ab36734 Merge: f340c0d1a3f40fdcba69cd291530a4debc58748f 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb Author: Linus Torvalds Date: Tue Jun 28 14:59:07 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 commit f340c0d1a3f40fdcba69cd291530a4debc58748f Author: Ingo Molnar Date: Tue Jun 28 16:40:42 2005 +0200 [PATCH] Tweak idle thread setup semantics This patch tweaks idle thread setup semantics a bit: instead of setting NEED_RESCHED in init_idle(), we do an explicit schedule() before calling into cpu_idle(). This patch, while having no negative side-effects, enables wider use of cond_resched()s. (which might happen in the stock kernel too, but it's particulary important for voluntary-preempt) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 082cf69eb82681f4eacb3a5653834c7970714bef Author: Jens Axboe Date: Tue Jun 28 16:35:11 2005 +0200 [PATCH] ll_rw_blk: prevent huge request allocations Currently we cap request allocations at q->nr_requests, but we allow a batching io context to allocate up to 32 more (default setting). This can flood the queue with request allocations, with only a few batching processes. The real fix would be to limit the number of batchers, but as that isn't currently tracked, I suggest we just cap the maximum number of allocated requests to eg 50% over the limit. This was observed in real life, users typically see this as vmstat bo numbers going off the wall with seconds of no queueing afterwards. Behaviour this bursty is not beneficial. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit f8b58edf3acf0dcc186b8330939000ecf709368a Author: Neil Brown Date: Mon Jun 27 22:29:34 2005 -0700 [PATCH] md: bio leak fix insert a missing bio_put when writting the md superblock. Without this we have a steady growth in the "bio" slab. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 314b6a4d80a7a5217c86ffdca926b6f406da0e0e Author: Alexey Dobriyan Date: Mon Jun 27 22:29:33 2005 -0700 [PATCH] kexec: fix sparse warnings Signed-off-by: Alexey Dobriyan Cc: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97afa0a25afb43a82954662773a9d48d61b2996a Author: Andrew Morton Date: Mon Jun 27 22:29:31 2005 -0700 [PATCH] cciss_ioctl() warning fix Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50273978975ee62938b7ca612e281927cd789c13 Author: Ben Dooks Date: Tue Jun 28 22:42:06 2005 +0100 [PATCH] ARM: 2763/1: S3C24XX - mark IRQ_LCD as valid Patch from Ben Dooks Fix the IRQ_LCD so that it is marked as valid since we no longer de-mux this in the main IRQ handler. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 2f85a42964dd43fed3a339701db046bee5a8b903 Author: Vlad Yasevich Date: Tue Jun 28 13:24:23 2005 -0700 [SCTP] Make init & delayed sack timeouts configurable by user. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 7a1af5d7bb94af16b980a53330436b9fadc12435 Author: Maxime Bizon Date: Tue Jun 28 13:21:12 2005 -0700 [IPV4]: ipconfig.c: fix dhcp timeout behaviour I think there is a small bug in ipconfig.c in case IPCONFIG_DHCP is set and dhcp is used. When a DHCPOFFER is received, ip address is kept until we get DHCPACK. If no ack is received, ic_dynamic() returns negatively, but leaves the offered ip address in ic_myaddr. This makes the main loop in ip_auto_config() break and uses the maybe incomplete configuration. Not sure if it's the best way to do, but the following trivial patch correct this. Signed-off-by: Maxime Bizon Signed-off-by: David S. Miller commit 2c2910a401f1ce2ac9136171e7522e731e1a2a8c Author: Dietmar Eggemann Date: Tue Jun 28 13:06:23 2005 -0700 [IPV4]: Snmpv2 Mib IP counter ipInAddrErrors support I followed Thomas' proposal to see every martian destination as a case where the ipInAddrErrors counter has to be incremented. There are two advantages by doing so: (1) The relation between the ipInReceive counter and all the other ipInXXX counters is more accurate in the case the RTN_UNICAST code check fails and (2) it makes the code in ip_route_input_slow easier. Signed-off-by: Dietmar Eggemann Signed-off-by: David S. Miller commit f2be64b3b15f52ceb83ff26abc10705a31ae5352 Author: Tony Lindgren Date: Tue Jun 28 21:01:16 2005 +0100 [PATCH] ARM: 2760/1: Add a warning on dynamic tick timekeeping on some platforms Patch from Tony Lindgren This patch was suggested by RMK, and adds a warning on the accuracy of timekeeping when using dynamic tick on some platforms. Depending on the timer implementation, dynamic tick may affect the accuracy of timekeeping. Currently at least OMAP is known to have accurate timekeeping with dynamic tick. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 072cd703b6a2a3adc14fbc2d969424c7022a7892 Author: Ben Dooks Date: Tue Jun 28 21:01:03 2005 +0100 [PATCH] ARM: 2762/1: S3C24XX Audio platform data Patch from Ben Dooks This provides the s3c24xx audio platform data which can be supplied from any of the board specific drivers. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit fa0ebff62a8a25952a082641db0ed6b1cfc6c38c Author: Richard Purdie Date: Tue Jun 28 21:01:03 2005 +0100 [PATCH] ARM: 2761/1: OProfile: Add call graphing support for arm Patch from Richard Purdie Add functions to generate backtraces of both kernel and user processes which allows oprofile's call graphing functionality to be used on arm. This requires unstripped binaries/libs which use a frame pointer. Signed-off-by: Richard Purdie Signed-off-by: Zwane Mwaikambo Signed-off-by: Russell King commit ae9cda5d65f3d8a495241cbdcc2d56f721c83cc3 Author: YOSHIFUJI Hideaki Date: Tue Jun 28 13:00:30 2005 -0700 [IPV6]: Don't dump temporary addresses twice Each IPv6 Temporary Address (w/ CONFIG_IPV6_PRIVACY) is dumped twice to netlink. Because temporary addresses are listed in idev->addr_list, there's no need to dump idev->tempaddr separately. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 8a47077a0b5aa2649751c46e7a27884e6686ccbf Author: Patrick McHardy Date: Tue Jun 28 12:56:45 2005 -0700 [NETLINK]: Missing padding fields in dumped structures Plug holes with padding fields and initialized them to zero. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9ef1d4c7c7aca1cd436612b6ca785b726ffb8ed8 Author: Patrick McHardy Date: Tue Jun 28 12:55:30 2005 -0700 [NETLINK]: Missing initializations in dumped data Mostly missing initialization of padding fields of 1 or 2 bytes length, two instances of uninitialized nlmsgerr->msg of 16 bytes length. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b3563c4fbff906991a1b4ef4609f99cca2a0de6a Author: Patrick McHardy Date: Tue Jun 28 12:54:43 2005 -0700 [NETLINK]: Clear padding in netlink messages Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4095ebf1e641b0f37ee1cd04c903bb85cf4ed25b Author: Harald Welte Date: Tue Jun 28 12:49:30 2005 -0700 [NETFILTER]: ipt_CLUSTERIP: fix ARP mangling This patch adds mangling of ARP requests (in addition to replies), since ARP caches are made from snooping both requests and replies. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 85c1937b2693a0d4e39bb2644d720ed3703b9830 Author: David S. Miller Date: Tue Jun 28 12:39:40 2005 -0700 [EBTABLES]: Fix thinkos in ebt_log.c When converting over the skb_header_pointer(), I converted parts of this module incorrectly. Kill the 'u' union in ebt_log() and all the bogus references to it. Signed-off-by: David S. Miller commit 61998bcb4bf0efa0276e88c7853091e482a826f4 Merge: c36ad397a30fcf9369d82584324cc24189eb6b1c 0a139e79976b9eb60517edec63406236a789f812 Author: Linus Torvalds Date: Tue Jun 28 10:20:11 2005 -0700 Merge head 'upstream-20050628-1' of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb Merge: 1cde8a16815bd85c8137d1ea556398983c597c11 99f95e5286df2f69edab8a04c7080d986ee4233b Author: Greg KH Date: Mon Jun 27 22:07:56 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 1cde8a16815bd85c8137d1ea556398983c597c11 Author: Greg Kroah-Hartman Date: Thu Jun 23 17:35:56 2005 -0700 [PATCH] PCI: use the MCFG table to properly access pci devices (x86-64) Now that we have access to the whole MCFG table, let's properly use it for all pci device accesses (as that's what it is there for, some boxes don't put all the busses into one entry.) If, for some reason, the table is incorrect, we fallback to the "old style" of mmconfig accesses, namely, we just assume the first entry in the table is the one for us, and blindly use it. Signed-off-by: Greg Kroah-Hartman commit d57e26ceb7dbf44cd08128cb6146116d4281b58b Author: Greg Kroah-Hartman Date: Thu Jun 23 17:35:56 2005 -0700 [PATCH] PCI: use the MCFG table to properly access pci devices (i386) Now that we have access to the whole MCFG table, let's properly use it for all pci device accesses (as that's what it is there for, some boxes don't put all the busses into one entry.) If, for some reason, the table is incorrect, we fallback to the "old style" of mmconfig accesses, namely, we just assume the first entry in the table is the one for us, and blindly use it. Signed-off-by: Greg Kroah-Hartman commit 545493917dc90298e1c38f018ad893f5518928e7 Author: Greg Kroah-Hartman Date: Thu Jun 23 17:35:56 2005 -0700 [PATCH] PCI: add proper MCFG table parsing to ACPI core. This patch is the first step in properly handling the MCFG PCI table. It defines the structures properly, and saves off the table so that the pci mmconfig code can access it. It moves the parsing of the table a little later in the boot process, but still before the information is needed. Signed-off-by: Greg Kroah-Hartman commit d18c3db58bc544fce6662ca7edba616ca9788a70 Author: Greg Kroah-Hartman Date: Thu Jun 23 17:35:56 2005 -0700 [PATCH] PCI: make drivers use the pci shutdown callback instead of the driver core callback. Now we can change the pci core to always set this pointer, as pci drivers should use it, not the driver core callback. Signed-off-by: Greg Kroah-Hartman commit 4002307d2b563a6ab317ca4d7eb1d201a6673d37 Author: Keith Moore Date: Thu Jun 2 12:42:37 2005 +0200 [PATCH] cpqphp: fix oops during unload without probe drivers/pci/hotplug/cpqphp_core.c calls cpqphp_event_start_thread() in one_time_init(), which is called whenever the hardware is probed. Unfortunately, cpqphp_event_stop_thread() is *always* called when the module is unloaded. If the hardware is never probed, then cpqphp_event_stop_thread() tries to manipulate a couple of uninitialized mutexes. Signed-off-by: Keith Moore Signed-off-by: Greg Kroah-Hartman commit 70549ad9cf074e12f12cdc931b29b2616dfb873a Author: Greg Kroah-Hartman Date: Mon Jun 6 23:07:46 2005 -0700 [PATCH] PCI: clean up the MSI code a bit. Mostly just cleans up the irq handling logic to be smaller and a bit more descriptive as to what it really does. Signed-off-by: Greg Kroah-Hartman commit bb4a61b6eaee01707f24deeefc5d7136f25f75c5 Author: Andrew Morton Date: Mon Jun 6 23:07:46 2005 -0700 [PATCH] PCI: fix up errors after dma bursting patch and CONFIG_PCI=n With CONFIG_PCI=n: In file included from include/linux/pci.h:917, from lib/iomap.c:6: include/asm/pci.h:104: warning: `enum pci_dma_burst_strategy' declared inside parameter list include/asm/pci.h:104: warning: its scope is only this definition or declaration, which is probably not what you want. include/asm/pci.h: In function `pci_dma_burst_advice': include/asm/pci.h:106: dereferencing pointer to incomplete type include/asm/pci.h:106: `PCI_DMA_BURST_INFINITY' undeclared (first use in this function) include/asm/pci.h:106: (Each undeclared identifier is reported only once include/asm/pci.h:106: for each function it appears in.) make[1]: *** [lib/iomap.o] Error 1 Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e24c2d963a604d9eaa560c90371fa387d3eec8f1 Author: David S. Miller Date: Thu Jun 2 12:55:50 2005 -0700 [PATCH] PCI: DMA bursting advice After seeing, at best, "guesses" as to the following kind of information in several drivers, I decided that we really need a way for platforms to specifically give advice in this area for what works best with their PCI controller implementation. Basically, this new interface gives DMA bursting advice on PCI. There are three forms of the advice: 1) Burst as much as possible, it is not necessary to end bursts on some particular boundary for best performance. 2) Burst on some byte count multiple. A DMA burst to some multiple of number of bytes may be done, but it is important to end the burst on an exact multiple for best performance. The best example of this I am aware of are the PPC64 PCI controllers, where if you end a burst mid-cacheline then chip has to refetch the data and the IOMMU translations which hurts performance a lot. 3) Burst on a single byte count multiple. Bursts shall end exactly on the next multiple boundary for best performance. Sparc64 and Alpha's PCI controllers operate this way. They disconnect any device which tries to burst across a cacheline boundary. Actually, newer sparc64 PCI controllers do not have this behavior. That is why the "pdev" is passed into the interface, so I can add code later to check which PCI controller the system is using and give advice accordingly. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 2311b1f2bbd36fa5f366a7448c718b2556e0f02c Author: Michael Ellerman Date: Fri May 13 17:44:10 2005 +1000 [PATCH] PCI: fix-pci-mmap-on-ppc-and-ppc64.patch This is an updated version of Ben's fix-pci-mmap-on-ppc-and-ppc64.patch which is in 2.6.12-rc4-mm1. It fixes the patch to work on PPC iSeries, removes some debug printks at Ben's request, and incorporates your fix-pci-mmap-on-ppc-and-ppc64-fix.patch also. Originally from Benjamin Herrenschmidt This patch was discussed at length on linux-pci and so far, the last iteration of it didn't raise any comment. It's effect is a nop on architecture that don't define the new pci_resource_to_user() callback anyway. It allows architecture like ppc who put weird things inside of PCI resource structures to convert to some different value for user visible ones. It also fixes mmap'ing of IO space on those archs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Michael Ellerman Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a0d399a808916d22c1c222c6b5ca4e8edd6d91a9 Author: Kenji Kaneshige Date: Thu Apr 28 00:25:59 2005 -0700 [PATCH] ACPI based I/O APIC hot-plug: acpiphp support This patch adds PCI based I/O xAPIC hot-add support to ACPIPHP driver. When PCI root bridge is hot-added, all PCI based I/O xAPICs under the root bridge are hot-added by this patch. Hot-remove support is TBD. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 0e888adc41ffc02b700ade715c182a17e766af84 Author: Kenji Kaneshige Date: Thu Apr 28 00:25:58 2005 -0700 [PATCH] ACPI based I/O APIC hot-plug: ia64 support This is an ia64 implementation of acpi_register_ioapic() and acpi_unregister_ioapic() interfaces. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b1bb248a5d2230a3d8ef42199c742194a8580b15 Author: Kenji Kaneshige Date: Thu Apr 28 00:25:58 2005 -0700 [PATCH] ACPI based I/O APIC hot-plug: add interfaces This patch adds the following new interfaces for I/O xAPIC hotplug. The implementation of these interfaces depends on each architecture. o int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base); This new interface is to add a new I/O xAPIC specified by phys_addr and gsi_base pair. phys_addr is the physical address to which the I/O xAPIC is mapped and gsi_base is global system interrupt base of the I/O xAPIC. acpi_register_ioapic returns 0 on success, or negative value on error. o int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base); This new interface is to remove a I/O xAPIC specified by gsi_base. acpi_unregister_ioapic returns 0 on success, or negative value on error. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8d50e332c8bd4f4e8cc76e8ed7326aa6f18182aa Author: Rajesh Shah Date: Thu Apr 28 00:25:57 2005 -0700 [PATCH] acpi hotplug: decouple slot power state changes from physical hotplug Current acpiphp code does not distinguish between the physical presence and power state of a device/slot. That is, if a device has to be disabled, it also tries to physically ejects the device. This patch decouples power state from physical presence. You can now echo to the corresponding sysfs power control file to repeatedly enable and disable a device without having to physically re-insert it. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8e7561cfbdf00fb1cee694cef0e825d0548aedbc Author: Rajesh Shah Date: Thu Apr 28 00:25:56 2005 -0700 [PATCH] acpi hotplug: aCPI based root bridge hot-add acpiphp changes to support acpi based root bridge hot-add. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2f523b15901f654a9448bbd47ebe1e783ec3195b Author: Rajesh Shah Date: Thu Apr 28 00:25:55 2005 -0700 [PATCH] acpi hotplug: fix slot power-down problem with acpiphp Earlier I reported that Matthew's acpiphp rewrite had problem in powering down slot on my i386 system. The following patch is needed to get the acpiphp rewrite properly powering down the slot. Signed-off-by: Dely Sy Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 364d5094a43ff2ceff3d19e40c4199771cb6cb8f Author: Rajesh Shah Date: Thu Apr 28 00:25:54 2005 -0700 [PATCH] acpi hotplug: clean up notify handlers on acpiphp unload A root bridge may not have directly attached hotpluggable slots under it. Instead, it may have p2p bridges with slots under it. In this case, we need to clean up the p2p bridges and slots properly too. Patch below applies on top of the original patch, and fixes this problem. Without this, acpiphp leaves behind notify handlers on module unload, and subsequent module load attempts don't work properly too. Patch was tested on an ia64 Tiger4 box. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 42f49a6ae5dca90cd0594475502bf1c43ff1dc07 Author: Rajesh Shah Date: Thu Apr 28 00:25:53 2005 -0700 [PATCH] acpi hotplug: convert acpiphp to use generic resource code This patch converts acpiphp to use the generic PCI resource assignment code. It's quite large, but most of it is deleting the acpiphp_pci and acpiphp_res files. It's tested on an hp Integrity rx8620 (which won't work without this patch). Testers with other hardware welcomed. Signed-off-by: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 4ce448e5fae62689b06027b46f470b944e5c2193 Author: Rajesh Shah Date: Thu Apr 28 00:25:53 2005 -0700 [PATCH] acpi bridge hotadd: Export the interface to get PCI id for an ACPI handle Export an acpi interface to get PCI domain/bus/devfn information from the corresponding namespace handle. Used by acpiphp code to transpate the device handle of the hot-plugged root bridge to the corresponding pci location information. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3fb02738b0fd36f47710a2bf207129efd2f5daa2 Author: Rajesh Shah Date: Thu Apr 28 00:25:52 2005 -0700 [PATCH] acpi bridge hotadd: Allow ACPI .add and .start operations to be done independently Create new interfaces to recursively add an acpi namespace object to the acpi device list, and recursively start the namespace object. This is needed for ACPI based hotplug of a root bridge hierarchy where the add operation must be performed first and the start operation must be performed separately after the hot-plugged devices have been properly configured. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit f7d473d919627262816459f8dba70d72812be074 Author: Rajesh Shah Date: Thu Apr 28 00:25:51 2005 -0700 [PATCH] acpi bridge hotadd: Read bridge resources when fixing up the bus Read bridge io/mem/pfmem ranges when fixing up the bus so that bus resources are tracked. This is required to properly support pci end device and bridge hotplug. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 542df5de56a23bf2d94b75e2b304ab0e5a5508a8 Author: Rajesh Shah Date: Thu Apr 28 00:25:50 2005 -0700 [PATCH] acpi bridge hotadd: Remove hot-plugged devices that could not be allocated resources When hot-plugging an I/O hierarchy that contains many bridges and leaf devices, it's possible that there are not enough resources to start all the device present. If we fail to assign a resource, clear the corresponding value in the pci_dev structure, so other code can take corrective action. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 091ca9f06382e46d77213c35a97f7d0be9e350d2 Author: Rajesh Shah Date: Thu Apr 28 00:25:49 2005 -0700 [PATCH] acpi bridge hotadd: Make the PCI remove routines safe for failed hot-plug When a root bridge hierarchy is hot-plugged, resource requirements for the new devices may be greater than what the root bridge is decoding. In this case, we want to remove devices that did not get needed resources. These devices have been scanned into bus specific lists but not yet added to the global device list. Make sure the pci remove functions can handle this case. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6ef6f0e33c4645fc8d23201ad5a6a289b4303cbb Author: Rajesh Shah Date: Thu Apr 28 00:25:49 2005 -0700 [PATCH] acpi bridge hotadd: Link newly created pci child bus to its parent on creation When a pci child bus is created, add it to the parent's children list immediately rather than waiting till pci_bus_add_devices(). For hot-plug bridges/devices, pci_bus_add_devices() may be called much later, after they have been properly configured. In the meantime, this allows us to use the normal pci bus search functions for the hot-plug bridges/buses. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e4ea9bb7e9f177e03a917b1f1213de0315f819ee Author: Rajesh Shah Date: Thu Apr 28 00:25:48 2005 -0700 [PATCH] acpi bridge hotadd: Take the PCI lock when modifying pci bus or device lists With root bridge and pci bridge hot-plug, new buses and devices can be added or removed at run time. Protect the pci bus and device lists with the pci lock when doing so. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit cc57450f5c044270d2cf1dd437c1850422262109 Author: Rajesh Shah Date: Thu Apr 28 00:25:47 2005 -0700 [PATCH] acpi bridge hotadd: Prevent duplicate bus numbers when scanning PCI bridge When hot-plugging a root bridge, as we try to assign bus numbers we may find that the hotplugged hieratchy has more PCI to PCI bridges (i.e. bus requirements) than available. Make sure we don't step over an existing bus when that happens. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 71c3511c22e8e0648094672abec898b3bf84c18b Author: Rajesh Shah Date: Thu Apr 28 00:25:46 2005 -0700 [PATCH] acpi bridge hotadd: Make pcibios_fixup_bus() hot-plug safe PCI scan code calls the arch specific pcibios_fixup_bus() each time it scans a new bridge. For root bridge hot-plug, the bridge and it's attached devices may not have been configured properly yet, so it's not safe to claim those resources at this time. This code goes away when we clean up the way pci resources are claimed (in pci_enable_device()), so this is only a stopgap fix. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit fab3fb0ac8c83072465b28ca859c420da6c6511c Author: Rajesh Shah Date: Thu Apr 28 00:25:45 2005 -0700 [PATCH] acpi bridge hotadd: Fix pci_enable_device() for p2p bridges When checking if a PCI to PCI bridge should be enabled to decode memory and/or IO resources, we need to look at all device resources not just the first 6. This is needed to allow PCI bridges to pass down memory and IO accesses to child devices even when the bridge itself does not consume resources in its PCI BARs. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit c431ada45d65b305a6aab4557067e564b23ce5a5 Author: Rajesh Shah Date: Thu Apr 28 00:25:45 2005 -0700 [PATCH] acpi bridge hotadd: ACPI based root bridge hot-add When you hot-plug a (root) bridge hierarchy, it may have p2p bridges and devices attached to it that have not been configured by firmware. In this case, we need to configure the devices before starting them. This patch separates device start from device scan so that we can introduce the configuration step in the middle. I kept the existing semantics for pci_scan_bus() since there are a huge number of callers to that function. Also, I have no way of testing the changes I made to the parisc files, so this needs review by those folks. Sorry for the massive cross-post, this touches files in many different places. Signed-off-by: Rajesh Shah Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit efe1ec27837d6639eae82e1f5876910ba6433c3f Author: Amit Gud Date: Tue Apr 12 19:04:27 2005 +0530 [PATCH] pci: remove deprecates Replace pci_find_device() with more safer pci_get_device(). Signed-off-by: Amit Gud Signed-off-by: Greg Kroah-Hartman commit 881a8c120acf7ec09c90289e2996b7c70f51e996 Author: Amit Gud Date: Tue Apr 12 19:03:33 2005 +0530 [PATCH] pci: remove deprecates Replace pci_find_device() with more safer pci_get_device(). Signed-off-by: Amit Gud Signed-off-by: Greg Kroah-Hartman commit 120bb4246a99cc6e9cc976573fcbcd0ee9d544ef Author: jayalk@intworks.biz Date: Mon Mar 21 20:20:42 2005 -0800 [PATCH] PCI Allow OutOfRange PIRQ table address I updated this to remove unnecessary variable initialization, make check_routing be inline only and not __init, switch to strtoul, and formatting fixes as per Randy Dunlap's recommendations. I updated this to change pirq_table_addr to a long, and to add a warning msg if the PIRQ table wasn't found at the specified address, as per thread with Matthew Wilcox. In our hardware situation, the BIOS is unable to store or generate it's PIRQ table in the F0000h-100000h standard range. This patch adds a pci kernel parameter, pirqaddr to allow the bootloader (or BIOS based loader) to inform the kernel where the PIRQ table got stored. A beneficial side-effect is that, if one's BIOS uses a static address each time for it's PIRQ table, then pirqaddr can be used to avoid the $pirq search through that address block each time at boot for normal PIRQ BIOSes. Signed-off-by: Jaya Kumar Signed-off-by: Greg Kroah-Hartman commit c36ad397a30fcf9369d82584324cc24189eb6b1c Merge: c903e41e67046e7f52bbc404bd5aa654d12540cc 99f95e5286df2f69edab8a04c7080d986ee4233b Author: Jeff Garzik Date: Tue Jun 28 00:46:22 2005 -0400 Merge /spare/repo/linux-2.6/ commit 0a139e79976b9eb60517edec63406236a789f812 Author: Tejun Heo Date: Sun Jun 26 23:52:50 2005 +0900 [PATCH] libata: ahci: remove ata_port_start/stop() calls This patch removes unnecessary ata_port_start/stop() calls from ahci_port_start/stop(). Signed-off-by: Tejun Heo commit 62ba2841f2a51848f7cb0499edae3f6803764f2c Author: Tejun Heo Date: Sun Jun 26 23:27:19 2005 +0900 [PATCH] libata: lengthen COMMRESET delay This patch lengthens the delay between DET setting and clearing for COMMRESET from 400us to 1ms. I couldn't find any requiremen regarding the duration of COMMRESET in SATA I/II specs but AHCI-1.1 10.4.2 states that it should be at least 1ms. Signed-off-by: Tejun Heo commit e922256ae4bb6ef954bd7e0740d9753460e0ab72 Author: Jeff Garzik Date: Tue Jun 28 00:03:37 2005 -0400 libata: update DMA blacklist Contributions from Alan Cox and maximilian attems. commit 99f95e5286df2f69edab8a04c7080d986ee4233b Author: Andrew Morton Date: Mon Jun 27 20:14:05 2005 -0700 [PATCH] cfq build fix drivers/block/cfq-iosched.c: In function 'cfq_put_queue': drivers/block/cfq-iosched.c:303: sorry, unimplemented: inlining failed in call to 'cfq_pending_requests': function body not available drivers/block/cfq-iosched.c:1080: sorry, unimplemented: called from here drivers/block/cfq-iosched.c: In function '__cfq_may_queue': drivers/block/cfq-iosched.c:1955: warning: the address of 'cfq_cfqq_must_alloc_slice', will always evaluate as 'true' make[1]: *** [drivers/block/cfq-iosched.o] Error 1 make: *** [drivers/block/cfq-iosched.o] Error 2 Cc: Jeff Garzik Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c903e41e67046e7f52bbc404bd5aa654d12540cc Author: Komuro Date: Mon Jun 27 23:23:05 2005 -0400 drivers/net/at1700: remove incorrect comment "Allied Telesis RE1000 Plus" is not supported at all by kernel 2.6.12. Signed-off-by: komurojun-mbn@nifty.com commit 8b2af8f0ca807eb13b59dc5961d2e99fc2b1bd87 Author: Edward Falk Date: Wed Jun 15 14:26:39 2005 -0700 [PATCH] Minor libata documentation patch I fleshed out libata.tmpl a bit while I was taking notes. commit 6e5a32754c67f0d156c2f196d604b2e9129a1fd5 Merge: b6d00f0de9e932e2884b3b7af8e43c0a61a271ee 63b614522cba5a015923c0e8f284be6e01c13f1a Author: Linus Torvalds Date: Mon Jun 27 20:10:18 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 commit cac8c81a59bd3b6815871b3172e8ccf15a3431e0 Author: Tobias Klauser Date: Mon May 16 19:15:11 2005 +0200 [PATCH] Use pci_set_dma_mask() instead of direct assignment of DMA mask The amd8111e driver directly assigns the DMA mask to the dma_mask member of the struct pci_dev instead of using pci_set_dma_mask(). This makes the call to pci_dma_supported() redundant as pci_set_dma_mask() does this check. I do not own this device so I only compile-tested this patch. Signed-off-by: Tobias Klauser commit 5f13e7ec5c1d98f4a63a3a79e66b2b121051f5ac Author: David Brownell Date: Mon May 16 08:53:52 2005 -0700 [PATCH] smc91x needs settable IRQ trigger type For boards that invert the SMC91x IRQ line (maybe an FPGA inverts it), the set_irq_type() call can't assume IRQT_RISING. These particular boards currently use OMAP-specific calls to change the trigger type, but the boards break when set_irq_type() stops being a NOP. Signed-off-by: David Brownell commit a5fe736eaf9bae1b45317313de04b564441b94f2 Author: Jeff Garzik Date: Mon Jun 27 22:47:18 2005 -0400 Update is_multicast_ether_addr() definition; net/ieee80211.h cleanups. commit 1bad3f4050b2a641bbfeaddb2717b28247311e9c Merge: 747802ab478399f13ff57751c2ebd22577be4eeb c7b645f934e52a54af58142d91fb51f881f8ce26 Author: Jeff Garzik Date: Mon Jun 27 22:05:03 2005 -0400 Merge /spare/repo/linux-2.6/ commit b6d00f0de9e932e2884b3b7af8e43c0a61a271ee Author: Dominik Brodowski Date: Mon Jun 27 16:29:02 2005 -0700 [PATCH] ACPI-based PCI resources: PCMCIA bugfix, but resources missing in trees Don't auto-configure yenta sockets for PCMCIA devices if it is connected to the root PCI bus on the x86 or x86_64 architectures. Previously, this was handled by the "ioport_resource"/"iomem_resource" check a few lines below, but with the new ACPI-based resource handling this doesn't catch all cases any longer. pci-yenta-cardbus-fix.patch and this patch should solve the initialization time trouble. However, the ACPI-based PCI resource handling is badly broken, IMHO: - many resources of devices don't show up in the resource trees ( /proc/iomem and /proc/ioports) any longer. This means that PCMCIA, but also possibly other subsystems (ISA, PnP, ...) do not know which resources it cannot use. - verify_root_windows() should fail if there are no iomem _or_ ioport resources, not only if there are no iomem _and_ ioport resources. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3248ff43f86493368b321376d447d84fa9a2737d Author: Dominik Brodowski Date: Mon Jun 27 16:29:01 2005 -0700 [PATCH] pcmcia: export modalias in sysfs Provide a "modalias" entry in sysfs for PCMCIA devices. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57b6281cea59639cce995745f1dc42fe9da2c533 Author: Dominik Brodowski Date: Mon Jun 27 16:29:01 2005 -0700 [PATCH] pcmcia: 8 and 16 bit access for static_map The PCMCIA card services layer is never setting the i/o map attributes when SS_CAP_STATIC_MAP is specified. Net result, sockets' set_io_map() calls always see requests with most flags clear, meaning 8 bit access. For hardware that always autosizes, that won't matter; and all current STATIC_MAP drivers ignore those attributes. A new driver (for at91rm9200) suffers badly from this, since this forces everything into 8 bit mode and that breaks both (a) cards requiring 16 bit access, and (b) ide-cs; but of course 8-bit cards work OK (as does accessing card attributes). So this patch arranges to pass the attributes down, matching the behavior for non-static mappings (using the first/only I/O window). Signed-off-by: David Brownell Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a8ceafce5f1e68c28c7ba52fd7e72ab0008eb46 Author: Dominik Brodowski Date: Mon Jun 27 16:29:00 2005 -0700 [PATCH] pcmcia: properly handle all errors of register_chrdev register_chrdev() can return errors (negative) other then -EBUSY, so check for any negative error code. Signed-off-by: Randy Dunlap Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9a55243d4a5f41b0035d36457b87463aa232807 Author: Jar Date: Mon Jun 27 16:28:58 2005 -0700 [PATCH] pcmcia: documentation fix Fix example hash generator in Documentation. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ad0a0a793cbd87a87488d59abc744374669498f Author: Dominik Brodowski Date: Mon Jun 27 16:28:58 2005 -0700 [PATCH] pcmcia: resource handling fixes - properly bail out in set_cis_map if call to socket driver's set_mem_map failed - don't abort do_mem_probe cycle if one entry failed (!CONFIG_PCMCIA_PROBE) - don't do iomem probing in chunks larger than 0x800000 (1 << 23) as yenta_socket and vrc4173_cardu.c fail to set_mem_map for windows equal to or larger than (1 << 24). Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f861bd23076efc4c86063721b9021d82481fd6b2 Author: Dominik Brodowski Date: Mon Jun 27 16:28:57 2005 -0700 [PATCH] pcmcia: select crc32 in Kconfig for PCMCIA PCMCIA needs CRC32. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aecab27aeabaa897d69fc082686df314329830de Author: Dominik Brodowski Date: Mon Jun 27 16:28:56 2005 -0700 [PATCH] pcmcia: mod_devicetable.h fix for different sizes in kernel- and userspace The size of pointers may differ between (userspace) modpost and (kernelspace) modules -- so fix mod_devicetable.h to reflect this possibility. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c7ab67602e65b3ba7aaa81f023b034cd7458ec6 Author: Dominik Brodowski Date: Mon Jun 27 16:28:56 2005 -0700 [PATCH] pcmcia: synclink_cs IRQ_INFO2_INFO is gone Remove the IRQ_INFO2_VALID flag in synclink_cs -- I overlooked it when removing all other users in PCMCIA drivers for 2.6.11. Thanks to Marcelo Tosatti for noticing it. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f354942cb301fed273f423fb5c4f57bde3efc5b2 Author: Dominik Brodowski Date: Mon Jun 27 16:28:55 2005 -0700 [PATCH] pcmcia: use request_region in i82365 randy_dunlap Convert deprecated check_region() calls to request/release region. Add return value check on one request_region(). I suspect that it may do an extra release_region(), which should generate a warning message from the kernel. Signed-off-by: randy_dunlap Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 378a33a686d457fa5a38d6ad134f5385a9cc7860 Author: Dominik Brodowski Date: Mon Jun 27 16:28:54 2005 -0700 [PATCH] pcmcia: release_class Properly wait for the class refcount to reach zero. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3448139b41b9e3b8799eed7d427cd50789dadc3e Author: Dominik Brodowski Date: Mon Jun 27 16:28:54 2005 -0700 [PATCH] pcmcia: ds.c cleanup Clean up ds.c Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33519ddd43f4adc221ee7b2801dedd19ac97540b Author: Dominik Brodowski Date: Mon Jun 27 16:28:53 2005 -0700 [PATCH] pcmcia: cs.c cleanup Clean up cs.c Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a8d46631e166a3c79fe1466ce8cfc4721fdf780 Author: Dominik Brodowski Date: Mon Jun 27 16:28:53 2005 -0700 [PATCH] pcmcia: move pcmcia resource handling out of cs.c Move the 16-bit PCMICA resource handling from pcmcia_core.o to pcmcia.o. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6ea0b9ec5131ac360581d6924fed536758bd024 Author: Dominik Brodowski Date: Mon Jun 27 16:28:52 2005 -0700 [PATCH] pcmcia: rename some functions Rename some functions in drivers/pcmcia/ to show they belong to the PCMCIA subsystem. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b659fb862db02c77ea7e6db7e70b6e888681579 Author: Dominik Brodowski Date: Mon Jun 27 16:28:51 2005 -0700 [PATCH] pcmcia: remove unneeded includes in ds.c Remove unnecessary includes in ds.c and pcmcia_ioctl.c Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc109497bd5799770fedfc6503119808497b3677 Author: Dominik Brodowski Date: Mon Jun 27 16:28:50 2005 -0700 [PATCH] pcmcia: merge struct pcmcia_bus_socket into struct pcmcia_socket Merge struct pcmcia_bus_socket into struct pcmcia_socket. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5e43913cfe95a18ad8929585a0bb58e46cf3390 Author: Dominik Brodowski Date: Mon Jun 27 16:28:50 2005 -0700 [PATCH] pcmcia: make PCMCIA status a bitfield make pcmcia_bus_socket->state a bitfield, and rename it pcmcia_state to prepare for struct pcmcia_bus_socket integration into struct pcmcia_socket. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90c6cdd1fa8dd4d69af792541a37b38576aa9b5a Author: Dominik Brodowski Date: Mon Jun 27 16:28:49 2005 -0700 [PATCH] pcmcia: clean up cs ds callback struct pcmcia_callback isn't needed for each socket, one is enough for all sockets. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7a480d229461e54a0b3b0439b2bf0e652545e3d Author: Dominik Brodowski Date: Mon Jun 27 16:28:47 2005 -0700 [PATCH] pcmcia: move PCMCIA ioctl to a separate file Move all PCMCIA_IOCTL-related code to a different file. Signed-off-by: Dominik Brodowski From: Richard Purdie The pcmcia-move-pcmcia-ioctl-to-a-separate-file patch was corrupted in -mm2 causing this problem. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a5555b81fde402119a6b4f2b38d3373d272ff69 Author: Dominik Brodowski Date: Mon Jun 27 16:28:47 2005 -0700 [PATCH] pcmcia: add a config option for the PCMICA ioctl Add a new config option to control the building of the PCMCIA IOCTL. Currently, it is not yet made public, though the help text is there already. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c29976a6469b81a7858812dc2d4b8430d74004a Author: Dominik Brodowski Date: Mon Jun 27 16:28:46 2005 -0700 [PATCH] pcmcia: mark parent bridge windows as resources available for PCMCIA devices Automatically mark the parent PCI-PCI bridge windows as resources available for PCMCIA usage. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22916638b124e859b595099bd0c86a1e09e767fb Author: Dominik Brodowski Date: Mon Jun 27 16:28:46 2005 -0700 [PATCH] pcmcia: update resource database adjust routines to use unsigned long values Make adjust_io and adjust_memory independent of adjust_t to allow for IO resources > x86's IO_SPACE_LIMIT. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5085cb26503a662a5cfdf53ce96fd606c1fbe9ba Author: Dominik Brodowski Date: Mon Jun 27 16:28:45 2005 -0700 [PATCH] pcmcia: add some Documentation Add some information useful for PCMCIA device driver authors to Documentation/pcmcia/, and reference it in dmesg in case of hash mismatches. Also add a reference to pcmciautils to Documentation/Changes. With recent changes, you don't need to concern yourself with pcmcia-cs even if you have PCMCIA hardware, so the example above the list needed to be adapted as well. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4d7510d3d3b4501c94b4b00cf42fd58d49aeddd Author: Jun Komuro Date: Mon Jun 27 16:28:44 2005 -0700 [PATCH] pcmcia: more IDs for TDK multifunction cards Add new pcmcia id_table for fmvj18x_cs and serial_cs. (TDK multi-function card (NetPartner9610 and MobileNetworker3200)) Signed-off-by: Jun Komuro Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22f3a8f5fc94be4dd31c4c5ec1d1dc2b9c83a8ac Author: David Brownell Date: Mon Jun 27 16:28:43 2005 -0700 [PATCH] pcmcia id_table for sl811.cs Catch up with some PCMCIA API changes: - Docs say that as of 2.6.11 the PCMCIA IRQInfo2 field is ignored, but it's not yet removed from the API; stop using it anyway. - As of 2.6.13 PCMCIA finally hotplugs and does driver binding without "cardmgr"; add a MODULE_DEVICE_TABLE to support this. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4af48c8c16dfc37400f63633373dd180b5540ead Author: Dominik Brodowski Date: Mon Jun 27 16:28:42 2005 -0700 [PATCH] pcmcia: id_table for synclink_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4ed3598987845e8d45672899084df1f8448718c Author: Dominik Brodowski Date: Mon Jun 27 16:28:42 2005 -0700 [PATCH] pcmcia: id_table for pdaudiocf.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77b73f9b00e3bea43ab4d30ae70fb85660dd07f1 Author: Dominik Brodowski Date: Mon Jun 27 16:28:41 2005 -0700 [PATCH] pcmcia: id_table for wl3501_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 707997343a1e5193fff74798af572a4d03740476 Author: Dominik Brodowski Date: Mon Jun 27 16:28:41 2005 -0700 [PATCH] pcmcia: id_table for sedlbauer_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aba14100055325c5af432fe3fd1aa5521cec3e0c Author: Dominik Brodowski Date: Mon Jun 27 16:28:40 2005 -0700 [PATCH] pcmcia: id_table for nsp_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 070812734facccf2d891eec0da2497ec3824e616 Author: Dominik Brodowski Date: Mon Jun 27 16:28:40 2005 -0700 [PATCH] pcmcia: id_table for ixj_pcmcia.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02ae38cfc5a49dde1ce979e710eec1d02279cb53 Author: Dominik Brodowski Date: Mon Jun 27 16:28:39 2005 -0700 [PATCH] pcmcia: id_table for elsa_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88eca2e526d087797a529aad478e5e6b42188415 Author: Dominik Brodowski Date: Mon Jun 27 16:28:39 2005 -0700 [PATCH] pcmcia: id_table for dtl1_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Acked-by: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fb22bb4d044f11a675c6947eac4923b84e0289e Author: Dominik Brodowski Date: Mon Jun 27 16:28:38 2005 -0700 [PATCH] pcmcia: id_table for com20020_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 279c936153199e105b96429dec11233ae153667c Author: Dominik Brodowski Date: Mon Jun 27 16:28:38 2005 -0700 [PATCH] pcmcia: id_table for btuart_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a01c3ed48e3319f9a4eb4e43b8c6abe00f1a1389 Author: Dominik Brodowski Date: Mon Jun 27 16:28:37 2005 -0700 [PATCH] pcmcia: id_table for bt3c_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Acked-by: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f70cb6d9f8b0fd97215250cff797ff8c3b24f1d Author: Dominik Brodowski Date: Mon Jun 27 16:28:35 2005 -0700 [PATCH] pcmcia: id_table for bluecard_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Acked-by: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a13bcf0d5abaf21a1eb7a988915ab97152f57f78 Author: Dominik Brodowski Date: Mon Jun 27 16:28:35 2005 -0700 [PATCH] pcmcia: id_table for avm_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c594c12cefa7c49f99d82cd2ccbcbf8baeb773ed Author: Dominik Brodowski Date: Mon Jun 27 16:28:34 2005 -0700 [PATCH] pcmcia: id_table for avma1_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a17a119381a5467144b18eaa954ba324e8a140b Author: Dominik Brodowski Date: Mon Jun 27 16:28:34 2005 -0700 [PATCH] pcmcia: id_table for atmel_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9a07afd9e7507ac02349b2ff59c579686dcd0fd Author: Dominik Brodowski Date: Mon Jun 27 16:28:33 2005 -0700 [PATCH] pcmcia: id_table for vxpocket.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11d28a30219671607a235a518f395659599a748e Author: Dominik Brodowski Date: Mon Jun 27 16:28:32 2005 -0700 [PATCH] pcmcia: id_table for pcmciamtd.c Add pcmcia_device_id table to pcmciamtd. The binding of anonymus cards (i.e. those who do neither report MANFID, CARDID, FUNCID nor product strings) is protected by a new config option. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c7046cd06c66bd81b285d15e422faeecdc9ca82 Author: Jun Komuro Date: Mon Jun 27 16:28:30 2005 -0700 [PATCH] pcmcia: add a few more IDs for pcnet_cs Add new pcmcia id_table for pcnet_cs. (Allied, Laneed, NextCom and Telecom Device) Signed-off-by: Jun Komuro Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce8a0037e110c1f4ec2fac7a3d791043e4e38cfc Author: Dominik Brodowski Date: Mon Jun 27 16:28:30 2005 -0700 [PATCH] pcmcia: id_table for pcnet_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 476835afd7fefa353e932e160c14effc67e2ba6e Author: Dominik Brodowski Date: Mon Jun 27 16:28:29 2005 -0700 [PATCH] pcmcia: id_table for parport_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8f7cc03bcb52e3f4894635aa1e7b9fca2f9ec67 Author: Dominik Brodowski Date: Mon Jun 27 16:28:29 2005 -0700 [PATCH] pcmcia: more IDs for ide_cs Add another ID for ide-cs Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f70b7d40d85a50c1f6d35350942501c4b0558335 Author: Dominik Brodowski Date: Mon Jun 27 16:28:28 2005 -0700 [PATCH] pcmcia: id_table for ide_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff07bb19d0f605d08a9649a3f94acf3e4a79819c Author: Dominik Brodowski Date: Mon Jun 27 16:28:28 2005 -0700 [PATCH] pcmcia: id_table for xirc2ps_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7422c56da9d985234e0b62307cbbd0dcf9b97593 Author: Dominik Brodowski Date: Mon Jun 27 16:28:27 2005 -0700 [PATCH] pcmcia: id_table for orinoco_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c672220694345ee5c3f2cf0becd3bd27dd663ad Author: Dominik Brodowski Date: Mon Jun 27 16:28:27 2005 -0700 [PATCH] pcmcia: id_table for smc91c92_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a5a6eeb6de79ab36ef1fceae8cc3c334b43fddc Author: Dominik Brodowski Date: Mon Jun 27 16:28:26 2005 -0700 [PATCH] pcmcia: id_table for qlogic_stub.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a355d07f2196d1d17aeebaa29a743f90e53dbd7 Author: Dominik Brodowski Date: Mon Jun 27 16:28:25 2005 -0700 [PATCH] pcmcia: id_table for sym53c500_cs.c Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b942123bcd6430afbb4d4c541bd6df996f02a68f Author: Dominik Brodowski Date: Mon Jun 27 16:28:25 2005 -0700 [PATCH] pcmcia: id_table for wavelan_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f57ea2a23245ba6db68f6a84ae903b3901965ade Author: Dominik Brodowski Date: Mon Jun 27 16:28:24 2005 -0700 [PATCH] pcmcia: id_table for ray_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a10d73dad86a023f343f80cc9cb71ea4e140192 Author: Dominik Brodowski Date: Mon Jun 27 16:28:24 2005 -0700 [PATCH] pcmcia: id_table for teles_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a58e26cb1163353d8a9b9cfd0d3f35df34f63141 Author: Dominik Brodowski Date: Mon Jun 27 16:28:23 2005 -0700 [PATCH] pcmcia: id_table for nmclan_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d402e95ebf8cc2fbf0e59e8424d65fe7847ad34 Author: Dominik Brodowski Date: Mon Jun 27 16:28:23 2005 -0700 [PATCH] pcmcia: id_table for netwave_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 469bf2b9389c9265ac0920da5b1a5c71fe496213 Author: Dominik Brodowski Date: Mon Jun 27 16:28:22 2005 -0700 [PATCH] pcmcia: id_table for ibmtr_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda4de8e1e51d55f02c64210ddbaca73997f890d Author: Dominik Brodowski Date: Mon Jun 27 16:28:22 2005 -0700 [PATCH] pcmcia: id_table for fmvj18x_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d1fb37621f40863929b60950406ec84d52bba16 Author: Dominik Brodowski Date: Mon Jun 27 16:28:21 2005 -0700 [PATCH] pcmcia: id_table for fdomain_stub Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c414f7550fedc0860a6cc65491006be49ac80edd Author: Dominik Brodowski Date: Mon Jun 27 16:28:20 2005 -0700 [PATCH] pcmcia: id_table for axnet_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7018d06d2371d67bdc995160fe2d38c6421b7c74 Author: Dominik Brodowski Date: Mon Jun 27 16:28:20 2005 -0700 [PATCH] pcmcia: id_table for airo_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dc27daa58ac579bff7d60043a23abd5e237cdda Author: Dominik Brodowski Date: Mon Jun 27 16:28:19 2005 -0700 [PATCH] pcmcia: id_table for aha152x Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ffec58c1e35c1e8f716c64e4860dbb00be4b221 Author: Dominik Brodowski Date: Mon Jun 27 16:28:19 2005 -0700 [PATCH] pcmcia: id_table for 3c589_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 270b6e94181d838194f621e773b9ab534371e618 Author: Dominik Brodowski Date: Mon Jun 27 16:28:18 2005 -0700 [PATCH] pcmcia: id_table for 3c574_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 325aa29fe50eabe487efe360426c01eb42825e60 Author: Dominik Brodowski Date: Mon Jun 27 16:28:18 2005 -0700 [PATCH] pcmcia: id_table for serial_cs Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2f0b5344161dabfab102ac0a54f330f61477972 Author: Dominik Brodowski Date: Mon Jun 27 16:28:17 2005 -0700 [PATCH] pcmcia: rescan bus always upon echoing into setup_done Always rescan the devices upon echo'ing something to available_resources_setup_done. This is needed for proper "coldplug" support. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e94e15f70559962f60915a09d44658b73a453fe2 Author: Dominik Brodowski Date: Mon Jun 27 16:28:15 2005 -0700 [PATCH] pcmcia: cleanups From: Adrian Bunk This patch contains the following cleanups: - make needlessly global code static - remove the following unneeded EXPORT_SYMBOL's: - ds.c: pcmcia_report_error - ds.c: pcmcia_bus_type Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daa9517d9eccc3598b2b0cdfa0b016ae4a4fcdce Author: Dominik Brodowski Date: Mon Jun 27 16:28:14 2005 -0700 [PATCH] pcmcia: request CIS via firmware interface Use the firmware method to load replacement CIS tables. It is recommended that the /lib/firmware/cis/ points to /etc/pcmcia/cis or the other way round so that both old-style cardmgr and new-style hotplug/firmware can access these "overwrite" files Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90829cfe1df2466c98a831f6c44f71026665cec1 Author: Dominik Brodowski Date: Mon Jun 27 16:28:12 2005 -0700 [PATCH] pcmcia: file2alias Create PCMCIA entries in modules.alias Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5b5577898d9330a78dea1c9e75da1540c36bf72 Author: Dominik Brodowski Date: Mon Jun 27 16:28:10 2005 -0700 [PATCH] pcmcia: allow function-ID based match The "func_id"-based matching is very fuzzy and can lead to false positives. Therefore, it should be tried to avoid relying on these matches. Until most/all existing func_id-based matches are replaced by manf_id/card_id/prod_id matches (a patch which will ask to send the appropriate card information to the PCMCIA mailing list will be added once other, more pressing issues are adressed), we need to emulate cardmgr behaviour by allowing func_id matches if no manf_id/card_id/prod_id match occurs. This can only be done in userspace because of modules possibly loaded with long delays. So, add a per-device sysfs file for this purpose. Signed-off-by: Dominik Brodowski Signed-off-by: Brice Goglin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f602ff7eb4e44e7245bfeeba4d078144703fcd76 Author: Dominik Brodowski Date: Mon Jun 27 16:28:09 2005 -0700 [PATCH] pcmcia: match "anonymous" cards If a card doesn't provide _any_ information about itself, assume it is a so-called "anonymous" card. pcmciamtd will bind to it if it is configured to do so. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff1fa9ef3c9fb23a6baa06b63f4bdf3de089b29a Author: Dominik Brodowski Date: Mon Jun 27 16:28:09 2005 -0700 [PATCH] pcmcia: CIS overrid via sysfs The one thing which surprises me in this patch that cis->Length needs to be set to count+1. Without it, it doesn't work, but with it, it doesn't make sense to me. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f299bccb422d707be3b074f9a669b34cb207a14 Author: Dominik Brodowski Date: Mon Jun 27 16:28:08 2005 -0700 [PATCH] pcmcia: export CIS in sysfs Export the CIS to userspace using a sysfs binary file in /sys/class/pcmcia_socket/pcmcia_scoket%n/ Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea7b38825bba66a81745a706da70a1c81adc95bd Author: Dominik Brodowski Date: Mon Jun 27 16:28:07 2005 -0700 [PATCH] pcmcia: match for fake CIS Add another match flag for devices needing a CIS override. The driver will only probe/attach if the CIS has been replaced before. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23a83bfe6ab51c745d109d979c78a96fe3e93f5c Author: Dominik Brodowski Date: Mon Jun 27 16:28:07 2005 -0700 [PATCH] pcmcia: check for invalid crc32 hashes in id_tables Check for invalid crc32 hashes in drivers' id_tables if CONFIG_PCMCIA_DEBUG is set. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ad275e3e7d253d44f03868e85977c908e334fed Author: Dominik Brodowski Date: Mon Jun 27 16:28:06 2005 -0700 [PATCH] pcmcia: device and driver matching The actual matching of pcmcia drivers and pcmcia devices. The original version of this was written by David Woodhouse. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ee13937525f6044d769b1a84d5db5669ac1959e Author: Dominik Brodowski Date: Mon Jun 27 16:28:05 2005 -0700 [PATCH] pcmcia: hotplug event for PCMCIA socket devices Generate hotplug event for PCMCIA sockets being registered. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 840c2ac5d3c1d50e8a181e3f661da814e89c8cf8 Author: Dominik Brodowski Date: Mon Jun 27 16:28:04 2005 -0700 [PATCH] pcmcia: hotplug event for PCMCIA devices Export information to /sbin/hotplug for PCMCIA devices: card_id, manf_id, func_id, bus_id (like pcmcia1.0) and crc32-hashes of the prod_id strings. Why not the prod_id strings themselves? a) They may contain all sorts of strange and difficult to handle characters, like " ". b) It's impossible to pass multiple strings to userspace. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7925407aa02653ba462b1d8b0b1229b99aee5411 Author: Ivan Kokshaysky Date: Mon Jun 27 16:28:02 2005 -0700 [PATCH] pci: yenta cardbus fix On Mon, Jun 20, 2005 at 07:15:34PM +1000, Grant Coady wrote: > Yenta: CardBus bridge found at 0000:00:0b.0 [1179:0001] > yenta 0000:00:0b.0: Preassigned resource 0 busy, reconfiguring... In -mm1 the cardbus resources might be assigned in pci_assign_unassigned_resources() pass. From your dmesg: PCI: Bus 2, cardbus bridge: 0000:00:0b.0 IO window: 00002000-00002fff IO window: 00003000-00003fff PREFETCH window: 12000000-13ffffff MEM window: 14000000-15ffffff Then yenta_allocate_res() tries to assign these resources again and, naturally, fails. This adds check for already assigned cardbus resources. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c803e8e2f15d02c5ad0a3888eea2bbd31dc59c5 Author: Linus Torvalds Date: Mon Jun 27 17:49:45 2005 -0700 Commit the manual part of the input layer merge. git did actually warn me about the fact that I hadn't actually done an "update-cache" on these two files, but the warning was at the bottom of a list of all the files that _did_ change in the merge, so I never noticed. My bad. commit c47abbbffd17a7e774ec1ef952a1c3621a9cb13b Author: Alan Cox Date: Mon Jun 27 15:24:31 2005 -0700 [PATCH] ide: sensible probing for PCI systems Old ISA/VESA systems sometimes put tertiary IDE controllers at addresses 0x1e8, 0x168, 0x1e0 or 0x160. Linux thus probes these addresses on x86 systems. Unfortunately some PCI systems now use these addresses for other purposes which leads to users seeing minute plus hangs during boot or even crashes. The following patch (again has been in Fedora for a while) only probes the obscure legacy ISA ports on machinea that are pre-PCI. This seems to keep everyone happy and if there is someone with that utterly weird corner case the ide= command line still provides a get out of jail card. Unsurprisingly we've not found anyone so affected. Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da9091ee3b5f9808c64abb925cefe7b100018614 Author: Alan Cox Date: Mon Jun 27 15:24:30 2005 -0700 [PATCH] ide: it8212 backport for Bartlomiej IDE This lets you throw out the iteraid stuff that has ended up back in due to stupid goings on in the IDE world. Its the same heavily tested code shipped in Fedora/Red Hat products but without the other dependancies on the Bartlomiej IDE layer. Pre-requisite: the ide-disk patch I sent to handle pure LBA devices. Obviously you lose things like hot unplug with the Bartlomiej IDE layer at the moment but that won't matter to most users. The patch does the following - Add IT8211/12 to pci_ids.h - Add Makefile/Kconfig entry - Add it8212 driver No core IDE code is touched by this diff Embedded system testing and the ability to force raid mode off by David Howells Made possible by the ite reference code, documentation and also several clarifications and pieces of assistance provided by ITE themselves Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb732d7b3699afe8859f27e93000860bb4103cca Author: Alan Cox Date: Mon Jun 27 15:24:29 2005 -0700 [PATCH] ide: fix crashes with hotplug serverworks You can't install the base kernel on a Stratus box because of the overuse of __init. Affects both IDE layers identically. It isn't the only misuser of __init so more review of other drivers (or fixing ide_register code to know about hotplug v non-hotplug chipsets) would be good. Original issue found by Stratus and their patch was the inspiration for this trivial one. Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b39b01ffb75e14ed76510e4229ffb575007df0fb Author: Alan Cox Date: Mon Jun 27 15:24:27 2005 -0700 [PATCH] ide: fix the HPT366 driver layer The highpoint driver is unreadable, buggy and crashes on some chipsets. The -ac one is more readable (but not ideal) and doesn't crash all over the place. Been in Fedora for some time. Backported from the Fedora one to the old Bartlomiej IDE core. No other dependencies. Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b189346cd10e28fa080347591066f0688405faee Author: Alan Cox Date: Mon Jun 27 15:24:26 2005 -0700 [PATCH] ide: ide-generic, allow for capture of other unsupported devices The ide-generic driver gives you DMA at bios tuned speed so can actually run a lot of unsupported devices quite well. It has a pci table so that it doesn't grab disks owned by other drivers but no way to override this. The patch adds an option ide-generic-all which makes the driver grab everything going that is IDE class. The diff is messy because I put the special case as case 0 to make the if conditional and long term maintenance easier. This has been in Fedora for some time. Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68ad9910b0525d0194f9c316c7cb14adbf8e0c0c Author: Alan Cox Date: Mon Jun 27 15:24:25 2005 -0700 [PATCH] ide: IDE timing violation on reset Pretty much theoretical for non MMIO thankfully. We _must_ use OUTBSYNC for commands or they may be posted and thus ruin the 400nS required delay. Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58ecd15652979f2001dc296dcfd303cc1bd33ce7 Author: Alan Cox Date: Mon Jun 27 15:24:24 2005 -0700 [PATCH] ide: samsung SN-124 works perfectly well with DMA Been in Red Hat products for ages Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6efd936046b123303ace4330fd2f26195ad7b1c4 Author: Alan Cox Date: Mon Jun 27 15:24:22 2005 -0700 [PATCH] ide: fix ide-disk inability to handle LBA only devices. Years old bug, has to be fixed for it8212 to work Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63b614522cba5a015923c0e8f284be6e01c13f1a Author: David S. Miller Date: Mon Jun 27 17:04:45 2005 -0700 [SPARC64]: Get rid of fast IRQ feature. The only real user was the assembler floppy interrupt handler, which does not need to be in assembly. This makes it so that there are less pieces of code which know about the internal layout of ivector_table[] and friends. Signed-off-by: David S. Miller commit b445e26cbf784cdba10f2b6c3e2cd3ee7bab360a Author: David S. Miller Date: Mon Jun 27 15:42:04 2005 -0700 [SPARC64]: Avoid membar instructions in delay slots. In particular, avoid membar instructions in the delay slot of a jmpl instruction. UltraSPARC-I, II, IIi, and IIe have a bug, documented in the UltraSPARC-IIi User's Manual, Appendix K, Erratum 51 The long and short of it is that if the IMU unit misses on a branch or jmpl, and there is a store buffer synchronizing membar in the delay slot, the chip can stop fetching instructions. If interrupts are enabled or some other trap is enabled, the chip will unwedge itself, but performance will suffer. We already had a workaround for this bug in a few spots, but it's better to have the entire tree sanitized for this rule. Signed-off-by: David S. Miller commit c7b645f934e52a54af58142d91fb51f881f8ce26 Author: Keshavamurthy Anil S Date: Mon Jun 27 15:17:16 2005 -0700 [PATCH] kprobes/ia64: refuse kprobe on ivt code Not safe to insert kprobes on IVT code. This patch checks to see if the address on which Kprobes is being inserted is in ivt code and if it is in ivt code then refuse to register kprobe. Signed-off-by: Anil S Keshavamurthy Acked-by: David Mosberger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a528e21c235862cc1ae50e7809eb9116dc40ea0c Author: Rusty Lynch Date: Mon Jun 27 15:17:15 2005 -0700 [PATCH] kprobes/ia64: refuse inserting kprobe on slot 1 Without the ability to atomically write 16 bytes, we can not update the middle slot of a bundle, slot 1, unless we stop the machine first. This patch will ensure the ability to robustly insert and remove a kprobe by refusing to insert a kprobe on slot 1 until a mechanism is in place to safely handle this case. Signed-off-by: Rusty Lynch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97f7943d70ff0e1e92ea627c44cfacfdae65dbc4 Author: Rusty Lynch Date: Mon Jun 27 15:17:15 2005 -0700 [PATCH] Return probe redesign: ppc64 specific implementation The following is a patch provided by Ananth Mavinakayanahalli that implements the new PPC64 specific parts of the new function return probe design. NOTE: Since getting Ananth's patch, I changed trampoline_probe_handler() to consume each of the outstanding return probem instances (feedback on my original RFC after Ananth cut a patch), and also added the arch_init() function (adding arch specific initialization.) I have cross compiled but have not testing this on a PPC64 machine. Changes include: * Addition of kretprobe_trampoline to act as a dummy function for instrumented functions to return to, and for the return probe infrastructure to place a kprobe on on, gaining control so that the return probe handler can be called, and so that the instruction pointer can be moved back to the original return address. * Addition of arch_init(), allowing a kprobe to be registered on kretprobe_trampoline * Addition of trampoline_probe_handler() which is used as the pre_handler for the kprobe inserted on kretprobe_implementation. This is the function that handles the details for calling the return probe handler function and returning control back at the original return address * Addition of arch_prepare_kretprobe() which is setup as the pre_handler for a kprobe registered at the beginning of the target function by kernel/kprobes.c so that a return probe instance can be setup when a caller enters the target function. (A return probe instance contains all the needed information for trampoline_probe_handler to do it's job.) * Hooks added to the exit path of a task so that we can cleanup any left-over return probe instances (i.e. if a task dies while inside a targeted function then the return probe instance was reserved at the beginning of the function but the function never returns so we need to mark the instance as unused.) Signed-off-by: Rusty Lynch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9508dbfe39112813612085c00d55bacd398eddc6 Author: Rusty Lynch Date: Mon Jun 27 15:17:12 2005 -0700 [PATCH] Return probe redesign: ia64 specific implementation The following patch implements function return probes for ia64 using the revised design. With this new design we no longer need to do some of the odd hacks previous required on the last ia64 return probe port that I sent out for comments. Note that this new implementation still does not resolve the problem noted by Keith Owens where backtrace data is lost after a return probe is hit. Changes include: * Addition of kretprobe_trampoline to act as a dummy function for instrumented functions to return to, and for the return probe infrastructure to place a kprobe on on, gaining control so that the return probe handler can be called, and so that the instruction pointer can be moved back to the original return address. * Addition of arch_init(), allowing a kprobe to be registered on kretprobe_trampoline * Addition of trampoline_probe_handler() which is used as the pre_handler for the kprobe inserted on kretprobe_implementation. This is the function that handles the details for calling the return probe handler function and returning control back at the original return address * Addition of arch_prepare_kretprobe() which is setup as the pre_handler for a kprobe registered at the beginning of the target function by kernel/kprobes.c so that a return probe instance can be setup when a caller enters the target function. (A return probe instance contains all the needed information for trampoline_probe_handler to do it's job.) * Hooks added to the exit path of a task so that we can cleanup any left-over return probe instances (i.e. if a task dies while inside a targeted function then the return probe instance was reserved at the beginning of the function but the function never returns so we need to mark the instance as unused.) Signed-off-by: Rusty Lynch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba8af12f432c4f00ddb0bc1068b57b20aac93ecf Author: Rusty Lynch Date: Mon Jun 27 15:17:10 2005 -0700 [PATCH] Return probe redesign: x86_64 specific changes The following patch contains the x86_64 specific changes for the new return probe design. Changes include: * Removing the architecture specific functions for querying a return probe instance off a stack address * Complete rework onf arch_prepare_kretprobe() and trampoline_probe_handler() * Removing trampoline_post_handler() * Adding arch_init() so that now we handle registering the return probe trampoline instead of kernel/kprobes.c doing it NOTE: Note that with this new design, the dependency on calculating a pointer to the task off the stack pointer no longer exist (resolving the problem of interruption stacks as pointed out in the original feedback to this port.) Signed-off-by: Rusty Lynch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bdbd37f6d01abc4c002bb8de90ea2c3bc7abe7e Author: Rusty Lynch Date: Mon Jun 27 15:17:09 2005 -0700 [PATCH] Return probe redesign: i386 specific changes The following patch contains the i386 specific changes for the new return probe design. Changes include: * Removing the architecture specific functions for querying a return probe instance off a stack address * Complete rework onf arch_prepare_kretprobe() and trampoline_probe_handler() * Removing trampoline_post_handler() * Adding arch_init() so that now we handle registering the return probe trampoline instead of kernel/kprobes.c doing it Signed-off-by: Rusty Lynch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 802eae7c800fb7f583e6c06afa363585af2bef00 Author: Rusty Lynch Date: Mon Jun 27 15:17:08 2005 -0700 [PATCH] Return probe redesign: architecture independent changes The following is the second version of the function return probe patches I sent out earlier this week. Changes since my last submission include: * Fix in ppc64 code removing an unneeded call to re-enable preemption * Fix a build problem in ia64 when kprobes was turned off * Added another BUG_ON check to each of the architecture trampoline handlers My initial patch description ==> From my experiences with adding return probes to x86_64 and ia64, and the feedback on LKML to those patches, I think we can simplify the design for return probes. The following patch tweaks the original design such that: * Instead of storing the stack address in the return probe instance, the task pointer is stored. This gives us all we need in order to: - find the correct return probe instance when we enter the trampoline (even if we are recursing) - find all left-over return probe instances when the task is going away This has the side effect of simplifying the implementation since more work can be done in kernel/kprobes.c since architecture specific knowledge of the stack layout is no longer required. Specifically, we no longer have: - arch_get_kprobe_task() - arch_kprobe_flush_task() - get_rp_inst_tsk() - get_rp_inst() - trampoline_post_handler() * Instead of splitting the return probe handling and cleanup logic across the pre and post trampoline handlers, all the work is pushed into the pre function (trampoline_probe_handler), and then we skip single stepping the original function. In this case the original instruction to be single stepped was just a NOP, and we can do without the extra interruption. The new flow of events to having a return probe handler execute when a target function exits is: * At system initialization time, a kprobe is inserted at the beginning of kretprobe_trampoline. kernel/kprobes.c use to handle this on it's own, but ia64 needed to do this a little differently (i.e. a function pointer is really a pointer to a structure containing the instruction pointer and a global pointer), so I added the notion of arch_init(), so that kernel/kprobes.c:init_kprobes() now allows architecture specific initialization by calling arch_init() before exiting. Each architecture now registers a kprobe on it's own trampoline function. * register_kretprobe() will insert a kprobe at the beginning of the targeted function with the kprobe pre_handler set to arch_prepare_kretprobe (still no change) * When the target function is entered, the kprobe is fired, calling arch_prepare_kretprobe (still no change) * In arch_prepare_kretprobe() we try to get a free instance and if one is available then we fill out the instance with a pointer to the return probe, the original return address, and a pointer to the task structure (instead of the stack address.) Just like before we change the return address to the trampoline function and mark the instance as used. If multiple return probes are registered for a given target function, then arch_prepare_kretprobe() will get called multiple times for the same task (since our kprobe implementation is able to handle multiple kprobes at the same address.) Past the first call to arch_prepare_kretprobe, we end up with the original address stored in the return probe instance pointing to our trampoline function. (This is a significant difference from the original arch_prepare_kretprobe design.) * Target function executes like normal and then returns to kretprobe_trampoline. * kprobe inserted on the first instruction of kretprobe_trampoline is fired and calls trampoline_probe_handler() (no change here) * trampoline_probe_handler() consumes each of the instances associated with the current task by calling the registered handler function and marking the instance as unused until an instance is found that has a return address different then the trampoline function. (change similar to my previous ia64 RFC) * If the task is killed with some left-over return probe instances (meaning that a target function was entered, but never returned), then we just free any instances associated with the task. (Not much different other then we can handle this without calling architecture specific functions.) There is a known problem that this patch does not yet solve where registering a return probe flush_old_exec or flush_thread will put us in a bad state. Most likely the best way to handle this is to not allow registering return probes on these two functions. (Significant change) This patch series applies to the 2.6.12-rc6-mm1 kernel, and provides: * kernel/kprobes.c changes * i386 patch of existing return probes implementation * x86_64 patch of existing return probe implementation * ia64 implementation * ppc64 implementation (provided by Ananth) This patch implements the architecture independant changes for a reworking of the kprobes based function return probes design. Changes include: * Removing functions for querying a return probe instance off a stack address * Removing the stack_addr field from the kretprobe_instance definition, and adding a task pointer * Adding architecture specific initialization via arch_init() * Removing extern definitions for the architecture trampoline functions (this isn't needed anymore since the architecture handles the initialization of the kprobe in the return probe trampoline function.) Signed-off-by: Rusty Lynch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ec4b1f356b3bad928ae8e2aa9caebfa737d52df Author: Ananth N Mavinakayanahalli Date: Mon Jun 27 15:17:01 2005 -0700 [PATCH] kprobes: fix single-step out of line - take2 Now that PPC64 has no-execute support, here is a second try to fix the single step out of line during kprobe execution. Kprobes on x86_64 already solved this problem by allocating an executable page and using it as the scratch area for stepping out of line. Reuse that. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3b8a1a8496c83bc4a3cc76505c29255af15572c Merge: 60564a313a5738960064d6c555ec066d9332f278 0ed0c0c48c508578c30aa58f755ca0d692636906 Author: Linus Torvalds Date: Mon Jun 27 15:13:26 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 commit 60564a313a5738960064d6c555ec066d9332f278 Author: Mike Miller Date: Mon Jun 27 14:36:50 2005 -0700 [PATCH] cciss: remove partition info from CCISS_GETLUNINFO This patch fulfills a promise I made to Christoph sometime back. I am removing the partition info from the CCISS_GETLUNINFO ioctl as I was informed my "driver had no damn business reading that structure." ;) The application folks are to use /proc or /sys for partition info from now on. I am only aware of a few apps that use this ioctl and I'm not sure they ever used the partition info. Signed-off-by: Mike Miller Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd6fb584cf7f18ec6b221192b57d712ecc8c1859 Author: Mike Miller Date: Mon Jun 27 14:36:49 2005 -0700 [PATCH] cciss: pci domain info pass 2 This is pass 2 of my patch to add pci domain info to an existing ioctl. This time I insert the domain between dev_fn and board_id as Willy suggested and change the var to unsigned short to ease Christoph's concerns. Although I thought unsigned int was the correct var type for this. I also thought it didn't matter where I inserted it in the structure. Signed-off-by: Mike Miller Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3de0a70bd926ff974adb27a38d4fd1049f05e54e Author: Mike Miller Date: Mon Jun 27 14:36:48 2005 -0700 [PATCH] cciss: pci id fix This patch fixes a PCI ID I got wrong before. It also adds support for another new SAS controller due out this summer. I didn't have a marketing name prior to my last submission. Also modifies the copyright date range. Signed-off-by: Mike Miller Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21c121ccd5559a07089d1aef9ca6c04c6d8b6758 Author: Roland Dreier Date: Mon Jun 27 14:36:47 2005 -0700 [PATCH] MAINTAINERS: Update Roland Dreier's email Cisco bought Topspin, so I'm now a shiny happy Cisco employee. Update my entry in MAINTAINERS. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48442962ebccec92d8a65f465420423cd2ce0bc8 Author: Roland Dreier Date: Mon Jun 27 14:36:47 2005 -0700 [PATCH] IB: Fix pack/unpack when size_bits == 64 Fix handling of fields with size_bits == 64. Pointed out by Hal Rosenstock. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dae4c1d2362292ccd3318ff67d18aa5c22ee820c Author: Roland Dreier Date: Mon Jun 27 14:36:46 2005 -0700 [PATCH] IB: Fix race in sa_query Use a copy of the id we'll return to the consumer so that we don't dereference query->sa_query after calling send_mad(). A completion may occur very quickly and end up freeing the query before we get to do anything after send_mad(). Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cae54bdf6f8b643e0e7a36ed531951f19e14fe56 Author: Roland Dreier Date: Mon Jun 27 14:36:46 2005 -0700 [PATCH] IB/mthca: Bump version It's about time for a version bump. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed878458eeff9754d66f1b0325df6ebbfcdce668 Author: Roland Dreier Date: Mon Jun 27 14:36:45 2005 -0700 [PATCH] IB/mthca: Align FW command mailboxes to 4K Future versions of Mellanox HCA firmware will require command mailboxes to be aligned to 4K. Support this by using a pci_pool to allocate all mailboxes. This has the added benefit of shrinking the source and text of mthca. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80fd8238734c852a8ed1ea39f8444a2df33bd161 Author: Roland Dreier Date: Mon Jun 27 14:36:45 2005 -0700 [PATCH] IB/mthca: Encapsulate command interface init Encapsulate mthca command interface initialization/cleanup. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 761f9eb8c31f72692aad118e51e2a59a80467088 Author: Roland Dreier Date: Mon Jun 27 14:36:44 2005 -0700 [PATCH] IB/mthca: Fix memory leak on error path Free page_list buffer on error path of mthca_reg_phys_mr(). Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d56d6f9502a15ef64395cb3a6fc7bfdc365b1e3d Author: Roland Dreier Date: Mon Jun 27 14:36:43 2005 -0700 [PATCH] IB/mthca: Split off MTT allocation Split allocation of MTT range from creation of MR. This will be useful for implementing shared memory regions and userspace verbs. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a03a5a67b243e9a24805ee18272ad25e5b2ca92c Author: Roland Dreier Date: Mon Jun 27 14:36:43 2005 -0700 [PATCH] IB/mthca: Move mthca_is_memfree checks Make mthca_table_put() and mthca_table_put_range() NOPs if the device is not mem-free, so that we don't have to have "if (mthca_is_memfree())" tests in the callers of these functions. This makes our code more readable and maintainable, and saves a couple dozen bytes of text in ib_mthca.ko as well. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a852092e8cb305595ff630dfc3e9b25966a98276 Author: Roland Dreier Date: Mon Jun 27 14:36:42 2005 -0700 [PATCH] IB/mthca: Fix memset size Fix memset to use sizeof *props instead of just sizeof props. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e6970b5e96c3281e26b7d2e4e1839f356d5f5ff Author: Roland Dreier Date: Mon Jun 27 14:36:42 2005 -0700 [PATCH] IB/mthca: Enable unreliable connected transport Add support for unreliable connected (UC) transport to mthca driver: - Add attributes for UC to modify QP table. - Add support for posting UC work requests. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34a4a753d15f905158d77fb81adc9c19a02a4639 Author: Roland Dreier Date: Mon Jun 27 14:36:41 2005 -0700 [PATCH] IB/mthca: Set RDMA/atomic capabilities correctly mthca apparently had the meanings of the max_rd_atomic and max_dest_rd_atomic QP attributes backwards. max_rd_atomic limits the maximum number of outstanding RDMA/atomic requests as an initiator (on a send queue), and max_dest_rd_atomic specifies the resources allocated to handle RMDA/atomic requests from the remote end of the connection. We were programming our QP context with these values swapped. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd123d7fcfde319bd723d14d975d60319a1b2ad8 Author: Roland Dreier Date: Mon Jun 27 14:36:40 2005 -0700 [PATCH] IB/mthca: Set QP static rate correctly Fix offset of static_rate in QP context. Pointed out by Dror Goldenberg. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64dc81fca7f6d5c51e50ffa850640ad8358acd1f Author: Roland Dreier Date: Mon Jun 27 14:36:40 2005 -0700 [PATCH] IB/mthca: Use dma_alloc_coherent instead of pci_alloc_consistent Switch all allocations of coherent memory from pci_alloc_consistent() to dma_alloc_coherent(), so that we can pass GFP_KERNEL. This should help when the system is low on memory. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb2af78bcdbb8801791de33f1775c98b9178daab Author: Roland Dreier Date: Mon Jun 27 14:36:39 2005 -0700 [PATCH] IB/mthca: Clean up CQ debug Clean up CQ debugging code: make dump_cqe print on one line, and only dump error CQ entries for local operation errors. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 177214af2946e86ce89324f379720ec0dc8d4a9e Author: Bernhard Fischer Date: Mon Jun 27 14:36:39 2005 -0700 [PATCH] IB/mthca: Clean up error messages - Fix incorrect cut-n-paste in error messages. - Add missing newlines in error messages. - Use DRV_NAME instead of "ib_mthca" in a couple of places. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd4e8fb49d2326364971a56f5a4b664a976f3712 Author: Tom Duffy Date: Mon Jun 27 14:36:37 2005 -0700 [PATCH] IB/mthca: Add Sun copyright notice Add Sun copyright to files modified by Tom Duffy. Signed-off-by: Tom Duffy Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffaa8bd6c904d1ab79b677905067349a5ff51d84 Author: Andrea Arcangeli Date: Mon Jun 27 14:36:36 2005 -0700 [PATCH] seccomp: tsc disable I believe at least for seccomp it's worth to turn off the tsc, not just for HT but for the L2 cache too. So it's up to you, either you turn it off completely (which isn't very nice IMHO) or I recommend to apply this below patch. This has been tested successfully on x86-64 against current cogito repository (i686 compiles so I didn't bother testing ;). People selling the cpu through cpushare may appreciate this bit for a peace of mind. There's no way to get any timing info anymore with this applied (gettimeofday is forbidden of course). The seccomp environment is completely deterministic so it can't be allowed to get timing info, it has to be deterministic so in the future I can enable a computing mode that does a parallel computing for each task with server side transparent checkpointing and verification that the output is the same from all the 2/3 seller computers for each task, without the buyer even noticing (for now the verification is left to the buyer client side and there's no checkpointing, since that would require more kernel changes to track the dirty bits but it'll be easy to extend once the basic mode is finished). Eliminating a cold-cache read of the cr4 global variable will save one cacheline during the tlb flush while making the code per-cpu-safe at the same time. Thanks to Mikael Pettersson for noticing the tlb flush wasn't per-cpu-safe. The global tlb flush can run from irq (IPI calling do_flush_tlb_all) but it'll be transparent to the switch_to code since the IPI won't make any change to the cr4 contents from the point of view of the interrupted code and since it's now all per-cpu stuff, it will not race. So no need to disable irqs in switch_to slow path. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ae3db110e62b0846aae1b5c6e661484ee3a5ed1 Author: Benjamin Herrenschmidt Date: Mon Jun 27 14:36:35 2005 -0700 [PATCH] ppc64: Add missing exports This patch adds a couple of missing symbol exports. flush_dcache_page is used by the AGP driver and rtc_lock by the RTC driver. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c8709334cec803368a432a33e0f2e116d48fe07 Author: Benjamin Herrenschmidt Date: Mon Jun 27 14:36:34 2005 -0700 [PATCH] ppc32: Remove CONFIG_PMAC_PBOOK This patch removes CONFIG_PMAC_PBOOK (PowerBook support). This is now split into CONFIG_PMAC_MEDIABAY for the actual hotswap bay that some powerbooks have, CONFIG_PM for power management related code, and just left out of any CONFIG_* option for some generally useful stuff that can be used on non-laptops as well. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcd16cc084f2b98ab64d27721abdb941f3d9c4cb Author: Benjamin Herrenschmidt Date: Mon Jun 27 14:36:33 2005 -0700 [PATCH] ppc32: remove obsolete macserial driver The macserial driver has been obsoleted by the new pmac_zilog driver for a while now and probably doesn't even work anymore on recent kernels. This patch removes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4ee69c8c1e7ff9790fbce29c7be50db57323a6f Author: Benjamin Herrenschmidt Date: Mon Jun 27 14:36:32 2005 -0700 [PATCH] ppc32: Bump PMU interrupt priority The Power Management Unit on PowerMacs is very sensitive to timeouts during async message exchanges. It uses rather crude protocol based on a shift register with an interrupt and is almost continuously exchanging messages with the host CPU on laptops. This patch adds a routine to the open_pic driver to be able to select a PMU driver so that it bumps it's interrupt priority to above the normal level. This will allow PMU interrupts to occur while another interrupt is pending, and thus reduce the risk of machine beeing abruptly shutdown by the PMU due to a timeout in PMU communication caused by excessive interrupt latency. The problem is very rare, and usually just doesn't happen, but it is still useful to make things even more robust. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb1657468152c5e5232c7bf35cf0e9c41b5d9910 Author: Marcelo Tosatti Date: Mon Jun 27 13:09:00 2005 -0300 [PATCH] 8xx: avoid "dcbst" misbehaviour with unpopulated TLB The proposed _tlbie call at update_mmu_cache() is safe because: Addresses for which update_mmu_cache() gets invocated are never inside the static kernel virtual mapping, meaning that there is no risk for the _tlbie() here to be thrashing the pinned entry, as Dan suspected. The intermediate TLB state in which this bug can be triggered is not visible by userspace or any other contexts, except the page fault handling path. So there is no need to worry about userspace dcbxxx users. The other solution to this is to avoid dcbst misbehaviour in the first place, which involves changing in-kernel "dcbst" callers to use 8xx specific SPR's. Summary: On 8xx, cache control instructions (particularly "dcbst" from flush_dcache_icache) fault as write operation if there is an unpopulated TLB entry for the address in question. To workaround that, we invalidate the TLB here, thus avoiding dcbst misbehaviour. Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4b3a80e399c989028acd5185c792fab82eda035 Author: Yoichi Yuasa Date: Mon Jun 27 14:36:30 2005 -0700 [PATCH] mips: fixed try_to_freeze build error arch/mips/kernel/signal.c: In function 'do_signal': arch/mips/kernel/signal.c:460: error: too many arguments to function 'try_to_freeze' Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3212c6be251219c0f4c2df0c93e122ff5be0d9dc Author: Bob Picco Date: Mon Jun 27 14:36:28 2005 -0700 [PATCH] fix WANT_PAGE_VIRTUAL in memmap_init I spotted this issue while in memmap_init last week. I can't say the change has any test coverage by me. start_pfn was formerly used in main "for" loop. The fix is replace start_pfn with pfn. Signed-off-by: Bob Picco Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c4142a133f7efee08238722b157656c3da7ca97 Author: Kumar Gala Date: Mon Jun 27 14:36:16 2005 -0700 [PATCH] ppc32: Fix compiling of sandpoint platform Lost a curly brace in translation. Everything is better now. Signed-off-by: Matt McClintock Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 747802ab478399f13ff57751c2ebd22577be4eeb Author: Stephen Hemminger Date: Mon Jun 27 11:33:16 2005 -0700 [PATCH] skge: version and copyright. Bump version and copyright year. Signed-off-by: Stephen Hemminger commit 19a33d4e6be2b627487676a69638e189e833675f Author: Stephen Hemminger Date: Mon Jun 27 11:33:15 2005 -0700 [PATCH] skge: Rx buffer optimization Optimize the receive buffer management code to replenish the buffers immediately (like tg3). Signed-off-by: Stephen Hemmminger commit d25f5a6774c3c567b11f8637a787603a62d102b1 Author: Stephen Hemminger Date: Mon Jun 27 11:33:14 2005 -0700 [PATCH] skge: handle Tx/Rx arbiter timeout Need to handle receive and transmit packet arbiter timeouts. Transmit arbiter timeouts happens when Gigabit sends to 100Mbit port on same switch and pause occurs. Signed-off-by: Stephen Hemminger commit 7e676d9136d89d0cdf661de4b9a5f8955af94e03 Author: Stephen Hemminger Date: Mon Jun 27 11:33:13 2005 -0700 [PATCH] skge: add PHY related debug messages Cleanup messages (for debug) about PHY interrrupts, because when user can't get driver working that is often the problem. Use a consistent way of enabling interrupts by port. Signed-off-by: Stephen Hemminger commit 45bada65c2a0bcc00729646071e66042ced64998 Author: Stephen Hemminger Date: Mon Jun 27 11:33:12 2005 -0700 [PATCH] skge: make Genesis/Broadcom code work Rewrite the code for handling the Broadcom PHY to something that works. Remove link polling because Broadcom and Yukon don't need it. When I wrote initial code, didn't have a genesis chipset based board to test, so it was a non-working guess. Signed-off-by: Stephen Hemminger commit 31b619c5abaa5512e7b41f190f9b7903b902f29a Author: Stephen Hemminger Date: Mon Jun 27 11:33:11 2005 -0700 [PATCH] skge: cleanup ethtool mode support Unify mapping of supported modes based on hardware. Signed-off-by: Stephen Hemminger commit 89bf5f231f776443a9d65da0f774aa3632534749 Author: Stephen Hemminger Date: Mon Jun 27 11:33:10 2005 -0700 [PATCH] skge: remove XM phy (untested code) Remove support for the non-Broadcom genesis based boards. The code is untested, and probably won't work as is. The newer boards are all Yukon based, and only old Genesis board I can find uses Broadcom. Signed-off-by: Stephen Hemminger commit c506a5090272752932be6ac0c29ffcbca38f2404 Author: Stephen Hemminger Date: Mon Jun 27 11:33:09 2005 -0700 [PATCH] skge: remove Yukon2 related special cases Remove the bits and pieces added relating to Yukon II chipset. The Yukon 2 will be in a separate driver. Signed-off-by: Stephen Hemminger commit b18f2091bc9f93548ea63752278fceaeacedab20 Author: Stephen Hemminger Date: Mon Jun 27 11:33:08 2005 -0700 [PATCH] skge: remove unused declarations Get rid of definitions for chip versions and PHY chips that this driver does not support. Signed-off-by: Stephen Hemminger commit 4707953454677f985289b4e4bcbea41f0cc651c2 Author: Stephen Hemminger Date: Mon Jun 27 11:33:07 2005 -0700 [PATCH] skge: eliminate Yukon2 hooks The Yukon chips don't support TSO, and Yukon2 will be a separate driver. Signed-off-by: Stephen Hemminger commit 981d0377d94f4d611f1c73429c0c32b35b56855f Author: Stephen Hemminger Date: Mon Jun 27 11:33:06 2005 -0700 [PATCH] skge: replace chip_rev() accessor Replace inline accessor functions for chip revision and number of ports with simple structure members. Signed-off-by: Stephen Hemminger commit 467b3417f9985b9a83ccebef2d4e07e3e8a9495e Author: Stephen Hemminger Date: Mon Jun 27 11:33:05 2005 -0700 [PATCH] skge: use pci_read_config_word Rather than accessing PCI config space through MMIO space, use the standard PCI functions. Signed-off-by: Stephen Hemminger commit 6b0c1480491a9e2d9d34368e09e6acddbb173515 Author: Stephen Hemminger Date: Mon Jun 27 11:33:04 2005 -0700 [PATCH] skge: function amd macro name change The inlines and macro's needed some cleanup's and fixes: * change name of macro SKGEMAC_REG to SK_REG to better reflect usage and fix comments * ditto for SK_GEXM_REG -> SK_XMAC_REG and SKGEGMA_REG -> SK_GMA_REG * change skge_gm_ to just gm_ since it is just a local function and long names look ugly. * change skge_xm_ to just xm_ * fix xm_write32 to write as two u16's with correct byte order * fix xm_outaddr to correctly use offset Signed-off-by: Stephen Hemminger commit 275834d1095dcd52d0fefd0d3f7d0320552fe277 Author: Stephen Hemminger Date: Mon Jun 27 11:33:03 2005 -0700 [PATCH] skge: PCI_DEVICE() macro Use PCI_DEVICE() macro. Signed-off-by: Stephen Hemminger commit 955660652af35524974cf4623c02bc99a3785949 Author: Stephen Hemminger Date: Mon Jun 27 11:33:02 2005 -0700 [PATCH] skge: whietspace cleanup Cleanup whitespace around if() and switch() and end of lines Signed-off-by: Stephen Hemminger commit d498a2c76568d3bb5add06390f077b1a423b0794 Merge: 8b789b7d7e9b12b086d6d2f0759073a11447c7e7 ec9f47cd6a14ca069bb7552a984c0a338fc7262b Author: Linus Torvalds Date: Mon Jun 27 15:04:08 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit 8b789b7d7e9b12b086d6d2f0759073a11447c7e7 Merge: 61cca8c72eb284e80876bafdea057055f6e793e4 b46ffaefe3c251897de23e5a534dd922c969d67b Author: Linus Torvalds Date: Mon Jun 27 15:00:10 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 61cca8c72eb284e80876bafdea057055f6e793e4 Merge: e494f6333bef20fd9d8689062260c5d0136a3ea0 e254e9bff5283aad1af6d74d2a312ee011b84d61 Author: Linus Torvalds Date: Mon Jun 27 14:55:50 2005 -0700 Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit e494f6333bef20fd9d8689062260c5d0136a3ea0 Merge: 3bd19078c215d15e20b4447d9c4aa0065813b207 0c144d0d0303917000cc918e63567b5ded22d5e2 Author: Linus Torvalds Date: Mon Jun 27 14:54:50 2005 -0700 Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 3bd19078c215d15e20b4447d9c4aa0065813b207 Merge: 3e0777b8fa96f7073ed5d13d3bc1d573b766bef9 3e90928d81449ee10a06bc306916503d5c284a25 Author: Linus Torvalds Date: Mon Jun 27 14:53:48 2005 -0700 Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 commit 3e0777b8fa96f7073ed5d13d3bc1d573b766bef9 Merge: a94130e00038ebeb2f66901a4a4a9e05a03051c1 e5119885f00874453e837e3407014b73de2f4741 Author: Linus Torvalds Date: Mon Jun 27 14:47:31 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually Some manual fixups required due to clashes with the PF_FREEZE cleanups. commit 0ed0c0c48c508578c30aa58f755ca0d692636906 Author: Alan Stern Date: Wed Jun 15 15:49:48 2005 -0400 [PATCH] USB: usbcore: inverted test for resuming interfaces This one-liner fixes a test for interfaces that are already resumed. It would be nice if this could get into 2.6.12, but it's not critical since it only affects people doing selective (runtime) suspend/resume. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 822e14ac222d1dad3f5393b75603f0455aebbefc Author: David Brownell Date: Mon Jun 13 06:55:03 2005 -0700 [PATCH] USB: resolve ethernet gadget build glitch on pxa This fixes a build error on pxa25x processes with pxa2xx_udc and CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set The error is because on that CPU there's no status transfer support except with RNDIS. Workaround, enable the RNDIS support too. Signed-off-by: Ian Campbell Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e3bc8b4e00d0ce219165d469409f2770698574f6 Author: David Brownell Date: Wed Jun 15 08:04:30 2005 -0700 [PATCH] USB: usbnet debug message fix One debug message won't print the right value; OSDL bugid 4545. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 86dbde9cbdfe8bc2c2dfe5d33027d3acc55e0470 Author: Matthew Dharm Date: Mon Jun 6 17:22:42 2005 -0700 [PATCH] USB Storage: retry hard errors This patch started life as as527, and was rediffed by me. Since the IDE interface doesn't convey much information about types of errors, many USB-IDE adapters report all low-level errors with SK = 0x04, which is supposed to be used only for non-recoverable errors. As a result the SCSI midlayer doesn't retry the command. But quite often a retry would succeed, whereas an unnecessary retry doesn't really hurt anything. This patch uses a recently-implemented flag to tell the SCSI midlayer that such hardware errors should be retried. Signed-off-by: Alan Stern Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 4d07ef762fc8d6d35ecc1511a3b953a733a61a5f Author: Matthew Dharm Date: Mon Jun 6 17:21:41 2005 -0700 [PATCH] USB Storage: port reset on transport error This patch causes a port reset whenever there's a transport error or abort. If that fails it reverts back to doing a mass-storage device reset. It started life as as497 and was rediffed by me. This makes error recovery a lot quicker and more reliable. Signed-off-by: Alan Stern Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 5203ad441310a4c2abd4fb79015a6bdadc2a5a4f Author: Matthew Dharm Date: Mon Jun 6 17:19:29 2005 -0700 [PATCH] USB Storage: endpoint toggles and reset delays This patch does two things to help reset recovery. It started life as as496 and was rediffed by me. First, the patch checks the result of a CLEAR_HALT request and doesn't reset the endpoint's data toggle unless the request succeeded. Second, it reduces the timeout for a device reset from 20 seconds to 5 seconds. If all goes well, then I've finally figured quilt out and this patch should apply cleanly. Signed-off-by: Alan Stern Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 01205a0e60bb5a66d768b881fb8355981b912510 Author: Domen Puncer Date: Sun Jun 5 14:46:16 2005 +0200 [PATCH] USB: usblp: 2x up() in usblp_read up(&usblp->sem) was called twice in a row in this code path. Signed-off-by: Domen Puncer Signed-off-by: Greg Kroah-Hartman commit c11372da33c9d38cb35867915f15c74778e1a3a4 Author: Vincent Vanackere Date: Sun Jun 5 12:21:43 2005 +0200 [PATCH] USB: fix atiremote input doesn`t register `device` & `driver` section in sysfs (/sys/class/input/event#) > On Sun, Apr 10, 2005 at 07:21:28PM +0600, Viktor A. Danilov wrote: > > > > PROBLEM: aiptek input doesn`t register `device` & `driver` section in sysfs (/sys/class/input/event#) > > REASON: `dev` - field not filled... > > SOLUTION: in linux/drivers/usb/input/aiptek.c write > > aiptek->inputdev.dev = &intf->dev; > > before calling > > input_register_device(&aiptek->inputdev); The following (tested) patch fixes the exact same issue with the ATI Remote input driver. Signed-off-by: Greg Kroah-Hartman commit 16367877949a91b11bcc6f37b94d0033388b4256 Author: Kiril Jovchev Date: Sun Jun 5 01:52:33 2005 +0300 [PATCH] USB: add support for Creative WebCam mini to stv680 driver Added support for Creative WebCam Go Mini. Camera has STV680 chip and just different Product ID(0x4007) and Vendor ID (0x041e). Signed-off-by: Kiril Jovchev Signed-off-by: Greg Kroah-Hartman commit 2c45b6feb394337b4b468229632b8737375caf1d Author: C. Adam Oldham Date: Thu Jun 2 17:16:34 2005 -0400 [PATCH] USB: Fix race condition in usblp_write Initialize status fields in the read and write urbs to prevent a race condition with open/read/close - open/write/close sequences. Fixes bug #4432 at bugzilla.kernel.org Signed-off-by: Adam Oldham Signed-off-by: Greg Kroah-Hartman commit 5da0106f0b9b13afa4a902c01d4c98b002df55ff Author: David Brownell Date: Tue May 31 10:21:11 2005 -0700 [PATCH] USB: wireless usb declarations This provides declarations for new requests, descriptors, and bitfields as defined in the Wireless USB 1.0 spec. Device support will involve a new "Wire Adapter" device class, connecting a USB Host to a cluster of wireless USB devices. There will be two adapter types: * Host Wireless Adapter (HWA): the downstream link is wireless, which connects a wireless USB host to wireless USB devices (not unlike like a hub) including to the second type of adapter. * Device Wireless Adapter (DWA): the upstream link is wireless, for connecting existing USB devices through wired links into the cluser. All wireless USB devices will need persistent (and secure!) key storage, and it's probable that Linux -- or device firmware -- will need to be involved with that to bootstrap the initial secure key exchange. Some user interface is required in that initial key exchange, and since the most "hands-off" one is a wired USB link, I suspect wireless operation will usually not be the only mode for wireless USB devices. (Plus, devices can recharge batteries using wired USB...) All other key exchange protocols need error prone user interactions, like copying and/or verifying keys. It'll likely be a while before we have commercial Wireless USB hardware, much less Linux implementations that know how to use it. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 77078570abe0848c3076b4f7d42f79b1407f3e8f Author: David Brownell Date: Sat May 28 10:46:18 2005 -0700 [PATCH] USB: ehci-hcd - fix page pointer allocation in itd_patch() The itd_patch() function is responsible for allocating entries in the buffer page pointer list of the iTD. Particularly, a new page pointer is needed every time when buffer data crosses a page boundary. However, there is a bug in the allocation logic: the function does not allocate a new entry when the current transaction is the first transaction in the iTD (as indicated by first!=0). The consequence is that, when the data of the first transaction begins somewhere at the end of a page so that it actually does cross the page boundary, no new page pointer is allocated. This means that the data at the end of the first transaction (beyond the page boundary) will be accessed by the HC using the second page pointer, which is zero. Furthermore, the first page pointer will be later overwritten by the page pointers of the other transactions, which will garble it because the value is or-ed into the iTD field. All this particular check (for !first) does is cause incorrect behaviour, so it should be entirely removed (and with it the variable first that is not used for anything else). Signed-off-by: Clemens Ladisch Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e07fefa6b212f43c40fdbc1a62de690d91a4b617 Author: Alan Stern Date: Tue May 31 16:33:21 2005 -0400 [PATCH] USB UHCI: Detect invalid ports This patch changes the way uhci-hcd detects valid ports. The specification doesn't mention any way to find out how many ports a controller has, so the driver has to use some heuristics, reading the port status and control register and deciding whether the value makes sense. With this patch the driver will recognize a typical failure mode (all bits set to one) for nonexistent ports and won't assume there are always at least 2 ports -- such an assumption seems silly if the heuristics have already shown that the ports don't exist. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 486e2df6ce213d0c776befdf3fe5ffc61dd61688 Author: David Brownell Date: Tue May 24 17:51:52 2005 -0700 [PATCH] USB gadget: drain rndis response queue on disconnect Drain the rndis response queue on disconnect. This fixes a problem in which an rndis response left in the queue from a previous session could cause a subsequent session to fail. Signed-off-by: Andy Lowe Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 45e45ab45c266642276d01e56d9fb5dccbfad960 Author: David Brownell Date: Mon May 16 08:26:38 2005 -0700 [PATCH] USB: fix drivers/usb/gadget/ether.c compile error This fixes a compile glitch with CONFIG_USB_ETH_RNDIS disabled, and replaces some inline #ifdeffery (and other code) with inline functions which can evaluate to constants. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 391eca9d8892a940ff8dbfee2ca78942e05c2d37 Author: Alan Stern Date: Tue May 10 15:34:16 2005 -0400 [PATCH] USB: dummy_hcd: add suspend/resume support This patch adds support to dummy_hcd for suspending and resuming the root hub and the emulated platform devices. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit cc095b0b5b653dca3e106710a72ba28b5bb7456b Author: Alan Stern Date: Tue May 10 15:28:38 2005 -0400 [PATCH] USB: dummy_hcd: sparse cleanups This patch fixes the byte-ordering issue for setup packets in the dummy_hcd driver and cleans up a few things that sparse -Wbitwise dislikes. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f0706930091902641929f2229bfb106144782c94 Author: Duncan Sands Date: Sat May 28 22:06:20 2005 +0200 [PATCH] USB: usbatm kcalloc cleanup you seem to have applied the original, not the new improved one with whiter teeth that uses kcalloc instead of kmalloc + memset. Here's a patch that goes on top of the one you applied. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 843c944fb86e5e31ee7b319172e657ea22301322 Author: Andrew Morton Date: Mon May 30 01:09:06 2005 -0700 [PATCH] USB: fix usbatm gcc-2.95.x bug Work around the gcc-2.95.x macro expansion bug. Cc: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 65412e48e21ff4fdaf2aea1565ef4fb3ef5262ce Author: Duncan Sands Date: Fri May 27 10:00:08 2005 +0200 [PATCH] USB ATM: avoid oops on bind failure; plug memory leak Zero the entire instance, not just the struct usbatm_data head. Make sure the just allocated urb is freed if we fail to allocate a buffer. Based on a patch by Stanislaw W. Gruszka. Signed-off-by: Duncan Sands Acked-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit e20d6645f794b51835e6f740a5b6f95c7e3fd843 Author: Duncan Sands Date: Thu May 26 14:32:51 2005 +0200 [PATCH] USB ATM: reduce log spamming Reduce the number of "unknown vpi/vci" debug messages to (usually) at most one per-urb, rather than one per-cell. This is only an issue when (a) many packets come in but no connection is open; and (b) CONFIG_USB_DEBUG is set. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 86699e35923366ccb5c3451d24e94deb9dd0af29 Author: Duncan Sands Date: Wed May 11 20:15:37 2005 +0200 [PATCH] USB ATM: bits and bobs Makefile and Kconfig entries for the new drivers. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 0bb3cf37df1b59a1fed079e7f8f140ef9ec73130 Author: Duncan Sands Date: Wed May 11 20:17:09 2005 +0200 [PATCH] USB ATM: generic DSL modem driver xusbatm Doesn't do any firmware loading etc, just transmission and reception. The user needs to take care of modem initialization, and load the module with parameters giving the endpoints to use and so forth. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 1b0e614652344a2d39eb336f3dc07651782883bf Author: Duncan Sands Date: Wed May 11 20:19:29 2005 +0200 [PATCH] USB ATM: driver for the Conexant AccessRunner chipset cxacru Driver for modems based on the Conexant AccessRunner chipset. Original patch by Josep Comas, much reworked by Roman Kagan. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 48da7267ff1631b0bff1eab15db86adace11ea91 Author: Duncan Sands Date: Wed May 11 20:20:40 2005 +0200 [PATCH] USB ATM: port speedtch to new usbatm core Port the speedtch driver to the new usbatm core. The code is much the same as before, just reorganized, though I threw in some minor improvements (a new module parameter for choosing the altsetting, more robust urb failure handling, ...) while I was there. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 9574507c98087951866ef30c8bf876e23ca4b99e Author: Andrew Morton Date: Wed May 11 20:24:03 2005 +0200 [PATCH] USB: fix speedtch.c merge with next patch. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit c59bba75fa500f13ef14215d599ee0d7faa1b954 Author: Duncan Sands Date: Wed May 11 20:24:03 2005 +0200 [PATCH] USB ATM: new usbatm core Rework the core usbatm code: minidrivers (i.e. drivers for particular modems) now register themselves with the usbatm core, supplying methods for binding/unbinding etc. The design was inspired by usb-serial and usbnet. At the same time, more common code from the speedtch and cxacru (patch 3/5) drivers was generalized and moved into the core. The transmission and reception parts have been unified and simplified. Since this is a major change and I don't like underscores in file names, usb_atm.[ch] has been renamed usbatm.[ch]. Many thanks to Roman Kagan, who did a lot of the coding. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit d49d431744007cec0ee1a3ade96f9e0f100c7907 Author: David Brownell Date: Sat May 7 13:21:50 2005 -0700 [PATCH] USB: misc ehci updates Various minor EHCI updates * Dump some more info in the debug dumps, notably the product description (e.g. chip vendor), BIOS handhake flags, and debug port status (when it's not managed by the HCD). * Minor updates to the BIOS handoff code: always flag the HCD as owned by Linux (in case BIOS doesn't grab it "early"), and on the buggy-BIOS path always match the "early handoff" code and forcibly disable SMI IRQs. * For the disabled 64bit DMA support, there's now a constant to use for the mask; use it. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 9198769363d4dc1d63d49ecb2e2b189aceb42d94 Author: David Brownell Date: Sat May 7 13:20:19 2005 -0700 [PATCH] USB: pxa2xx_udc updates This has several small updates to the px2xx UDC driver: * small fixes from Eugeny S. Mints - local_irq_save() around potential endpoint disable race - fix handling of enqueue to OUT endpoints (potential oops) * add shutdown() method to disable any D+ pullup * rename methods accessing raw signals, referencing the signals * describes itself as for "pxa25x", since pxa27x is different Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 988199fe34411b413d5a388fc751c91eb4686f36 Author: David Brownell Date: Sat May 7 13:05:52 2005 -0700 [PATCH] USB: goku_udc updates (sparse, SETUP api change) Sparse updates; and the API change for SETUP packets being in USB byteorder. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 320f34595c3cf37d180a087a935c050e4ac0e4d5 Author: David Brownell Date: Sat May 7 13:05:18 2005 -0700 [PATCH] USB: net2280 updates (sparse, SETUP api change) This is mostly "sparse" related updates, one of which was a missing le32_to_cpu() should have affected big-endian hardware. Notable is the API change: setup packets are now provided in USB byte order. This affects only big-endian hardware, and the gadget drivers have been updated in a separate patch. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1bbc169621cbe502b9143a27eb12802a0f1d43a0 Author: David Brownell Date: Sat May 7 13:05:13 2005 -0700 [PATCH] USB: gadget driver updates (SETUP api change) This updates most of the gadget framework to expect SETUP packets use USB byteorder (matching the annotation in and usage in the host side stack): - definition in - gadget drivers: Ethernet/RNDIS, serial/ACM, file_storage, gadgetfs. - dummy_hcd It also includes some other similar changes as suggested by "sparse", which was used to detect byteorder bugs. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 028b271b687714f9fc7a1e89bb79f1fbeef154ee Author: David Brownell Date: Fri May 6 07:02:01 2005 -0700 [PATCH] USB: Kconfig fixes for usb/gadget This prevents gadget drivers from being selected when no controller has been selected, by adding an additional boolean and depending on it. It's mostly to help "allmodconfig". Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4244f72436ab77c3c29a6447af81734ab3925d85 Author: Florian Echtler Date: Fri May 6 19:05:39 2005 +0200 [PATCH] USB: upgrade of the idmouse driver Signed-off-by: Florian Echtler Signed-off-by: Andreas Deresch Signed-off-by: Greg Kroah-Hartman commit 685eb93f086eb15d9fb1e82c7400fd750f564640 Author: Alan Stern Date: Tue May 3 16:27:26 2005 -0400 [PATCH] USB dummy_hcd: Use root-hub interrupts instead of polling This patch makes the dummy_hcd driver use emulated root-hub interrupts instead of polling. It's in the spirit of similar changes being made to the other HCDs. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f1c39fad7d1bbea31744138cd3a532ff346cd4ab Author: Alan Stern Date: Tue May 3 16:24:04 2005 -0400 [PATCH] USB dummy_hcd: Centralize link state computations This patch adds to the dummy_hcd driver a new routine for keeping track of all changes in the state of the emulated USB link. The logic is now kept in one spot instead of spread around, and it's easier to verify and update the code. The behavior of the port features has been corrected in a few respects as well (for instance, if the POWER feature is clear then none of the other features can be set). Also added is support for the (relatively new) _connect() and _disconnect() calls of the Gadget API. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d9b762510c186584a6be0d3ece03e8a4b2ac13a8 Author: Alan Stern Date: Tue May 3 16:15:43 2005 -0400 [PATCH] USB dummy_hcd: Use separate pdevs for HC and UDC This patch makes the dummy_hcd driver create separate platform devices for the emulated host controller and emulated device controller. This gives a more accurate simulation and will permit testing of situations where only one of the two devices is suspended. This also changes the name of the host controller platform device to match the name of the driver. That way the normal platform bus probe mechanism will handle binding the driver to the device. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c2db8b5e5692a6f35913a829607ee6efde3c7cbd Author: Alan Stern Date: Fri Apr 29 16:30:48 2005 -0400 [PATCH] USB: dummy_hcd: USB_PORT_FEAT changed to USB_PORT_STAT This patch makes some cosmetic changes to dummy_hcd: Minor alterations of comments and whitespace. Replace USB_PORT_FEAT_xxx with USB_PORT_STAT_xxx. This is appropriate as the values are stored in a status variable and they aren't feature indices. Also it allows the elimination of a bunch of awkward bit shift operations. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 5742b0c95026c817d9c266174ca39a909e8d38ca Author: Alan Stern Date: Mon May 2 11:25:17 2005 -0400 [PATCH] USB dummy_hcd: Partial OTG emulation Partial OTG support for dummy_hcd, mostly as a framework for further work. It emulates the new OTG flags in the host and peripheral frameworks, if that option is configured. But it's incomplete: - Resetting the peripheral needs to clear the OTG state bits; a second enumeration won't work correctly. - This stops modeling HNP right when roles should switch the first time. It should probably disconnect, then set the usb_bus.is_b_host and usb_gadget.is_a_peripheral flags; then it'd enumerate almost normally, except for the role reversal. Roles could then switch a second time, back to "normal" (with those flags cleared). - SRP should be modeled as "resume from port-unpowered", which is a state that usbcore doesn't yet use. HNP can be triggered by enabling the OTG whitelist and configuring a gadget driver that's not in that list; or by configuring Gadget Zero to identify itself as the HNP test device. Sent-by: David Brownell Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 65111084c63d7674dc37833e8eb59cfdaa4d0bda Author: David Brownell Date: Thu Apr 28 13:52:31 2005 -0700 [PATCH] USB: more omap_udc updates (dma and omap1710) More omap_udc updates: * OMAP 1710 updates - new UDC bit for clearing endpoint toggle, affecting CLEAR_HALT - new OTG bits affecting wakeup * Fix the bug Vladimir noted, that IN-DMA transfer code path kicks in for under 1024 bytes (not "up to 1024 bytes") * Handle transceiver setup more intelligently - use transceiver whenever one's available; this can be handy for GPIO based, loopback, or transceiverless configs - cleanup correctly after the "unrecognized HMC" case * DMA performance tweaks - allow burst/pack for memory access - use 16 bit DMA access most of the time on TIPB * Add workarounds for some DMA errata (not observed "in the wild"): - DMA CSAC/CDAC reads returning zero - RX/TX DMA config registers bit 12 always reads as zero (TI patch) * More "sparse" warnings removed, notably "changing" the SETUP packet to return data in USB byteorder (an API change, null effect on OMAP except for these warnings). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 907cba35f7f24587f0eff60073e1f4e1e01c976d Author: David Brownell Date: Thu Apr 28 13:48:09 2005 -0700 [PATCH] USB: ethernet gadget updates (mostly cleanup) Some cleanup for the the Ethernet part of the Ethernet/RNDIS gadget driver: - Remove remnants of ancient endpoint init logic; this is simpler, clearer - Save a smidgeon of space in the object file - Get rid of some #ifdeffery, mostly by using some newish inlines - Reset more driver state as part of USB reset - Remove a needless wrapper around an RNDIS call - Improve and comment the status interrupt handling: * RNDIS sometimes needs to queue these transfers (rarely in normal cases, but reproducibly while Windows was deadlocking its USB stack) * Mark requests as busy/not - Enable the SET_NETDEV_DEV() call; sysfs seems to behave sanely now This is a net shrink of source code. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 340600ab4cf0cc41efd01a65af97ebb7d35a7f85 Author: David Brownell Date: Thu Apr 28 13:45:25 2005 -0700 [PATCH] USB: rndis updates (mostly cleanup) Some bugfixes and lots of cleanup (net code shrink): - On reset, force the RNDIS state machine its initial state - Hook up the RNDIS (outgoing) filters to the CDC mechanism - Lots of cleanup: * Eliminate duplicate copy of OID table; * Unify handlying of the OID "query" response data pointer; * Reduce code duplication for calculating query response lengths; * Remove some checks for "can't happen" errors; * Get rid of debugging #ifdefs by making the debug flag an integer level Most of the patch, by volume, relates to those query response cleanups. It incidentally shaves off a few hundred bytes of object code. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 247f3105636caa9d1d8a4c3dfb755de42633bc80 Author: Alan Stern Date: Mon Apr 25 11:28:04 2005 -0400 [PATCH] USB HCDs: no longer need to register root hub This patch changes the host controller drivers; they no longer need to register their root hubs because usbcore will take care of it for them. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 8ec8d20b21f00a36343ca0ebd6c6be9421724a1e Author: Alan Stern Date: Mon Apr 25 11:25:17 2005 -0400 [PATCH] usbcore: register root hub in usb_add_hcd This patch makes usbcore automatically allocate and register the root hub device for a new host controller when the controller is registered. This way the HCDs don't all have to include the same boilerplate code. As a pleasant side benefit, the register_root_hub routine can now be made static and not EXPORTed. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit bc96c0ad1ed0c938fefc0423aa99f086c5a2a1ea Author: Alan Stern Date: Mon Apr 25 11:21:31 2005 -0400 [PATCH] ohci-omap, sl811, dummy: remove hub_set_power_budget This patch changes the HCDs that used the old hub_set_power_budget call, making them use the new hcd->power_budget field instead. Signed-off-by: Alan Stern Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2532178a68b5ce4e421d50ea1b1dcc0a1359f19d Author: Alan Stern Date: Mon Apr 25 11:14:31 2005 -0400 [PATCH] UHCI: Don't store device pointer in QH or TD This patch simplifies the uhci-hcd driver by removing the device pointer currently stored in the QH and TD structures. Those pointers weren't being used for anything other than to increment the device's reference count, which is unnecessary since the device is used only when an URB completes, and outstanding URBs take their own reference to the device. As a useful side effect, this change means that uhci-hcd no longer needs to have the root-hub device available in the start routine. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7d35b9298539d2818c51fe9070b08cf9876016f4 Author: Alan Stern Date: Mon Apr 25 11:18:32 2005 -0400 [PATCH] usbcore: Remove hub_set_power_budget This patch removes the hub_set_power_budget routine, which was used by a couple of HCDs to indicate that the root hub was running on battery power. In its place is a new field added to struct usb_hcd, which HCDs can set before the root hub is registered. Special-case code in the hub driver knows to look at this field when configuring a root hub. Signed-off-by: Alan Stern Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit f58f97fa9d258e4110ee1257a63cd1af51787f69 Author: Colin Leroy Date: Sun May 1 11:29:10 2005 +0200 [PATCH] USB: check for device in zd1201_resume My patch adding PM support for zd1201 didn't check for the device on resume, which can oops if the device has been removed. This patch fixes it. Signed-off-by: Colin Leroy Signed-off-by: Greg Kroah-Hartman commit a3c900bb8cbacfecf0be51313e43f330663266a1 Author: Colin Leroy Date: Sun Apr 24 16:37:15 2005 -0700 [PATCH] USB: PM support for zd1201 This patch enables power management (suspend, resume) support for zd1201. It fixes problems after wakeup for me, but these problems did not appear everytime without this patch. it's a bit empirical, based on what the usbnet does, so maybe not correct... Maybe someone can give it a look before it's applied. Signed-off-by: Colin Leroy Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 507ca9bc0476662f3463888d583864834eab1e11 Author: Greg Kroah-Hartman Date: Sat Apr 23 12:49:16 2005 -0700 [PATCH] USB: add ability for usb-serial drivers to determine if their write urb is currently being used. This removes a lot of racy and buggy code by trying to check the status of the urb. Signed-off-by: Greg Kroah-Hartman commit f4df0e334a9fc731689e8ba4f42a0d72a7491348 Author: David Brownell Date: Sat Apr 23 12:49:16 2005 -0700 [PATCH] USB: add reboot notifier to ohci Adds a reboot notifier to OHCI, mostly to benefit kexec; plus minor #include tweaks. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ff7c79e4f37821235b51fb8e19088c08938cc8fc Author: David Brownell Date: Fri Apr 22 13:17:00 2005 -0700 [PATCH] USB: usbtest updates Updates to "usbtest" driver: * Improve some diagnostics. One path that never generated diagnostics before should now generate two ... unless you hit a GCC bug that all my compilers seem to have, go figure. * Add suspend/resume support, so this behaves when the Linux host being used for testing suspends. * Don't test the "zero byte ep0 read" case unless real-world relevance for the testing is is irrelevant. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 884b600f63dc7c646f415a5d8f356df1f66ff6f2 Author: Oliver Neukum Date: Thu Apr 21 21:28:02 2005 +0200 [PATCH] USB: fix acm trouble with terminals This patch fixes lost LF when ACM device is used with getty/login/bash, in case of a modem which takes calls. Signed-off-by: Pete Zaitcev Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d5926ae7a827bdd06b588ffbc56fd4525cd9214a Author: Alan Stern Date: Thu Apr 21 15:56:37 2005 -0400 [PATCH] usbcore support for root-hub IRQ instead of polling This is a revised version of an earlier patch to add support to usbcore for driving root hubs by interrupts rather than polling. There's a temporary flag added to struct usb_hcd, marking devices whose drivers are aware of the new mechanism. By default that flag doesn't get set so drivers will continue to see the same polling behavior as before. This way we can convert the HCDs one by one to use interrupt-based event reporting, and the temporary flag can be removed when they're all done. Also included is a small change to the hcd_disable_endpoint routine. Although endpoints normally shouldn't be disabled while a controller is suspended, it's legal to do so when the controller's driver is being rmmod'ed. Lastly the patch adds a new callback, .hub_irq_enable, for use by HCDs where the root hub's port-change interrupts are level-triggered rather than edge-triggered. The callback is invoked each time khubd has finished processing a root hub, to let the HCD know that the interrupt can safely be re-enabled. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 02597d2deec2a3de0e2b52c1f83904b65626a0d5 Author: Alan Stern Date: Thu Apr 28 14:51:27 2005 -0400 [PATCH] USB UHCI: Add shutdown method After all the discussion you might not be interested in this still, but nevertheless here it is. This patch adds a shutdown method to the uhci-hcd driver. Its prerequisite is the patch you wrote adding shutdown support for PCI. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c074b416b94c0aa4a371f24bf6cc13d8cf1fab59 Author: Alan Stern Date: Fri Apr 22 14:39:12 2005 -0400 [PATCH] USB UHCI: improved reset handling This patch improves the strategy uhci-hcd uses for performing controller resets and checking whether they are needed. The HCRESET command doesn't affect the Suspend, Resume, or Reset bits in the port status & control registers, so the driver must clear them by itself. This means the code to figure out how many ports there are has to be moved to an earlier spot in the driver. The R/WC bits in the USBLEGSUP register can be set by the hardware even in the absence of BIOS meddling with legacy support features. Hence it's not a good idea to check them while trying to determine whether the BIOS has altered the controller's state. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6c1b445c226dd82d0961725dec8051b95003723a Author: Alan Stern Date: Thu Apr 21 16:04:58 2005 -0400 [PATCH] USB UHCI: Use root-hub IRQs while suspended This patch, which has as478b as a prerequisite, enables the uhci-hcd driver to take advantage of root-hub IRQs rather than polling during the time it is suspended. (Unfortunately the hardware doesn't support port-change interrupts while the controller is running.) It also turns off the driver's private timer while the controller is suspended, as it isn't needed then. The combined elimination of polling interrupts and timer interrupts ought to be enough to allow some systems to save a noticeable amount of power while they are otherwise idle. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4daaa87c8f19c5f1978470e9e91b74d9e0fb0f8e Author: Alan Stern Date: Sat Apr 9 17:30:08 2005 -0400 [PATCH] USB UHCI: Fix up loose ends This patch tidies up a few loose ends left by the preceding patches. It indicates the controller supports remote wakeup whenever the PM capability is present -- which shouldn't cause any harm if the assumption turns out to be wrong. It refuses to suspend the controller if the root hub is still active, and it refuses to resume the root hub if the controller is suspended. It adds checks for a dead controller in several spots, and it adds memory barriers as needed to insure that I/O operations are completed before moving on. Actually I'm not certain the last part is being done correctly. With code like this: outw(..., ...); mb(); udelay(5); do we know for certain that the outw() will complete _before_ the delay begins? If not, how should this be written? Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a8bed8b6be75bc5a46aa599ab360d5f1db291c8f Author: Alan Stern Date: Sat Apr 9 17:29:00 2005 -0400 [PATCH] USB UHCI: Add root-hub suspend/resume support This patch implements (finally!) separate suspend and resume routines for the root hub and the controller in the UHCI driver. It also changes the sequence used to reset the controller during initial probing, so as to preserve the existing state during a Resume-From-Disk. (This new sequence is what should be used in the PCI Quirks code for early USB handoffs, incidentally.) Lastly it adds a notion of the controller being "inaccessible" while in a PCI low-power state, when normal I/O operations shouldn't be allowed. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c8f4fe4358c5e0a79b4bd47b814d19f1d1d06f21 Author: Alan Stern Date: Sat Apr 9 17:27:32 2005 -0400 [PATCH] USB UHCI: Add root hub states This patch starts making some serious changes to the UHCI driver. There's a set of private states for the root hub, and the internal routines for suspending and resuming work completely differently, with transitions based on the new states. Now the driver distinguishes between a privately auto-stopped state and a publicly suspended state, and it will properly suspend controllers with broken resume-detect interrupts instead of resetting them. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f5946f8220a866dcdb8edc6abe23c1443e252425 Author: Alan Stern Date: Sat Apr 9 17:26:00 2005 -0400 [PATCH] USB UHCI: Minor improvements This patch makes a few small improvements in the UHCI driver. Some code is moved between different source files and a more useful pointer is passed to a callback routine. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 014e73c99aa408f3766afe8d11a1caa3a708b736 Author: Alan Stern Date: Sat Apr 9 17:24:42 2005 -0400 [PATCH] USB UHCI: subroutine reordering This patch moves a few subroutines around in the uhci-hcd source file. Nothing else is changed. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 72ebddb59a644732ff0240cdf5d216952a2b0c6b Author: David Brownell Date: Mon Apr 11 18:34:17 2005 -0700 [PATCH] USB: turn a user mode driver error into a hard error This patch turns a user mode driver error into a hard error, and updates the relevant diagnostic slightly to help troubleshooting. gphoto was known to have this problem, hopefully it is now fixed (they have had plenty of warning...) This had been left as a soft error to give various user mode drivers a change to be properly fixed, with the statement that starting in about 2.6.10 it would be changed. It had been mostly safe as a soft error ... but that can not be guaranteed. Now that a year has passed, it's time to really insist that the user mode drivers finally fix their relevant bugs. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 589a0083a3c9e9610e54984998a46c07a2584b55 Author: Olav Kongas Date: Thu Apr 21 17:12:59 2005 +0300 [PATCH] USB: Fix oops at rmmod after failed probe in isp116x-hcd This patch fixes an oops triggered at rmmod of isp116x-hcd after the probe() has failed. Also, it extends the error message printed, if the driver cannot detect "Chip's Clock Ready" after a software reset. As Ian Campbell recently reported, this happens if the chip's H_WAKEUP pin is not pulled low during software reset. Several people have already had this issue, hence the update to the error message. Also, extend the error message about the failed clock detection after the software reset. Signed-off-by: Olav Kongas commit 4808a1c0261176f9c7e28e7f108d41a381a7d0fc Author: Olav Kongas Date: Sat Apr 9 22:57:39 2005 +0300 [PATCH] USB: Add isp116x-hcd USB host controller driver This patch provides an "isp116x-hcd" driver for Philips' ISP1160/ISP1161 USB host controllers. The driver: - is relatively small, meant for use on embedded platforms. - runs usbtests 1-14 without problems for days. - has been in use by 6-7 different people on ARM and PPC platforms, running a range of devices including USB hubs. - supports suspend/resume of both the platform device and the root hub; supports remote wakeup of the root hub (but NOT the platform device) by USB devices. - does NOT support ISO transfers (nobody has asked for them). - is PIO-only. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit 313980c92724cf42877a7bdafdef439ee9d68ccb Author: David Brownell Date: Mon Apr 11 15:38:25 2005 -0700 [PATCH] USB: omap_udc updates (mostly cleanups) Various USB patches, mostly for portability: - Fifo mode 1 didn't work previously (oopsed), so now it's fixed and (why not) defines even more endpoints for composite devices. - OMAP 1710 doesn't have an internal transceiver. - Small PM update: if the USB link is suspended, don't disconnect on entry to deep sleep. - Be more correct about handling zero length control reads. OMAP seems to mis-handle that protocol peculiarity though; best avoided. - Platform device resources (for UDC and OTG controllers) now use physical addresses, so /proc/iomem is more consistent. - Minor cleanups, notably (by volume) for "sparse" NULL warnings. Signed-off-by: David Brownell commit d794ac7ae3613c2abfb678617ac7d74c8ff0099c Author: Alan Stern Date: Mon Apr 18 12:43:25 2005 -0400 [PATCH] USB: g_file_storage: export "stall" parameter This patch changes the g_file_storage driver to make the "stall" module parameter generally available; currently it is available only if the testing version of the module has been configured. It also fixes a typo in a comment -- thanks, Pat! Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 76f4af8efc72b6091d230cbe718cedca06d2d79e Author: Alan Stern Date: Tue Apr 5 11:56:54 2005 -0400 [PATCH] USB: g_file_storage: Consolidate min()s This patch simplifies the g_file_storage driver by consolidating a bunch of min() calculations at a single spot. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a94130e00038ebeb2f66901a4a4a9e05a03051c1 Author: Dave Jones Date: Mon Jun 27 01:39:28 2005 -0400 [PATCH] fix silly config option. CONFIG_CONFIG_TUNER_MULTI_I2C probably isn't what the author meant to create. Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 96c51ce94e8415d2dfb08358bbd50e1589111f33 Author: Jens Axboe Date: Mon Jun 27 14:49:39 2005 +0200 [PATCH] CFQ io scheduler: scheduler switch oops If cfq is managing a queue and a new scheduler is later selected, it is possible for the cfqd unplug_work work to be queued after the kblockd work struct has been flushed. The problem is the ordering of cfq_shutdown_timer_wq() and blk_put_queue() in cfq_put_cfqd(). The latter may rearm the work, leaving cfq_kick_queue() with dead data. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 52a5e15f665385ac99607d6b9e0c3dbdf17c5cfa Author: Jens Axboe Date: Mon Jun 27 10:56:58 2005 +0200 [PATCH] CFQ io scheduler, add ioprio documentation Add ioprio documentation Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 3b18152c327707ae6a2eeba4cfb66457143753bc Author: Jens Axboe Date: Mon Jun 27 10:56:24 2005 +0200 [PATCH] CFQ io scheduler updates - Adjust slice values - Instead of one async queue, one is defined per priority level. This prevents kernel threads (such as reiserfs/x and others) that run at higher io priority from conflicting with others. Previously, it was a coin toss what io prio the async queue got, it was defined by who first set up the queue. - Let a time slice only begin, when the previous slice is completely done. Previously we could be somewhat unfair to a new sync slice, if the previous slice was async and had several ios queued. This might need a little tweaking if throughput suffers a little due to this, allowing perhaps an overlap of a single request or so. - Optimize the calling of kblockd_schedule_work() by doing it only when it is strictly necessary (no requests in driver and work left to do). - Correct sync vs async logic. A 'normal' process can be purely async as well, and a flusher can be purely sync as well. Sync or async is now a property of the class defined and requests pending. Previously writers could be considered sync, when they were really async. - Get rid of the bit fields in cfqq and crq, use flags instead. - Various other cleanups and fixes Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 3d25f3566bb606720a67caef77b16190df10dd98 Author: Jens Axboe Date: Mon Jun 27 10:55:49 2005 +0200 [PATCH] Fix cfq_find_next_crq() In cfq_find_next_crq(), cfq tries to find the next request by choosing one of two requests before and after the current one. Currently, when choosing the next request, if there's no next request, the next candidate is NULL, resulting in selection of the previous request. This results in weird scheduling. Once we reach the end, we always seek backward. The correct behavior is using the first request as the next candidate. cfq_choose_req() already has logics for handling wrapped requests. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 22e2c507c301c3dbbcf91b4948b88f78842ee6c9 Author: Jens Axboe Date: Mon Jun 27 10:55:12 2005 +0200 [PATCH] Update cfq io scheduler to time sliced design This updates the CFQ io scheduler to the new time sliced design (cfq v3). It provides full process fairness, while giving excellent aggregate system throughput even for many competing processes. It supports io priorities, either inherited from the cpu nice value or set directly with the ioprio_get/set syscalls. The latter closely mimic set/getpriority. This import is based on my latest from -mm. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit b46ffaefe3c251897de23e5a534dd922c969d67b Author: Deepak Saxena Date: Mon Jun 27 21:48:48 2005 +0100 [PATCH] ARM: 2759/1: Fix IXP4xx debug code (again) Patch from Deepak Saxena Accidently swapped the order of movne and orrne. Bad. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit eb4e10d091b369027ec205163e06f7eec335996f Author: Michael Burian Date: Mon Jun 27 15:58:39 2005 +0100 [PATCH] ARM: 2758/1: Fix comment in file header to read "ARM" instead i386 Patch from Michael Burian This does not look like an include file for "i386", so use "ARM" instead. Signed-off-by: Michael Burian Signed-off-by: Russell King commit f3bb742640338eca0d8c3fa8071df89168efbf0a Author: Russell King Date: Mon Jun 27 14:49:10 2005 +0100 [PATCH] ARM: Update mach-types Signed-off-by: Russell King commit c79ebfa8d2c126815e67cbf0dc2cb185dcae59f9 Author: Russell King Date: Mon Jun 27 14:23:38 2005 +0100 [PATCH] ARM: Fix speeling eroor in io.h Signed-off-by: Russell King commit a013053d4965d9a45300938e713a4b512e0257d8 Author: Russell King Date: Mon Jun 27 14:16:47 2005 +0100 [PATCH] ARM: Move memmap freeing into init.c It doesn't make sense for this to be in mm-armv.c now that 26-bit ARM support is no longer integrated into arch/arm. Signed-off-by: Russell King commit a343e6075a396e07eeff52c0da5629c8fd396be2 Author: Russell King Date: Mon Jun 27 14:08:56 2005 +0100 [PATCH] ARM: Move PGD kernel page table initialisation It doesn't make sense to have the PGD kernel pointers initialisation separate from the PGD user pointers, especially when we clean the data cache over the whole range. Signed-off-by: Russell King commit 2ea83398b75309d8fdc999c4bb252e72d7e4fd9d Author: Russell King Date: Mon Jun 27 14:04:05 2005 +0100 [PATCH] ARM: Add VST idle loop call This call allows the dynamic tick support to reprogram the timer immediately before the CPU idles. Signed-off-by: Russell King commit 99bcc0590806c4f7a4ecf1a11add335b56cde963 Author: Russell King Date: Mon Jun 27 13:59:43 2005 +0100 [PATCH] ARM: Add missed AAEC2000 file My scripts missed committing this file. Signed-off-by: Russell King commit ec9f47cd6a14ca069bb7552a984c0a338fc7262b Author: Russell King Date: Mon Jun 27 11:12:54 2005 +0100 [PATCH] Serial: Split 8250 port table Add separate files for the different 8250 ISA-based serial boards. Looking across all the various architectures, it seems reasonable that we can key the availability of the configuration options for these beasts to the bus-related symbols (iow, CONFIG_ISA). We also standardise the base baud/uart clock rate for these boards - I'm sure that isn't architecture specific, but is solely dependent on the crystal fitted on the board (which should be the same no matter what type of machine its fitted into.) Signed-off-by: Russell King commit addcc4a10f10ffde88b2ee6dc3af46fab6dff1e2 Author: Russell King Date: Mon Jun 27 10:29:26 2005 +0100 [PATCH] Serial: Remove {un,}register_serial from 68328serial.c 68328serial.c does not make use of register_serial/unregister_serial, which is traditionally used to register 8250-compatible UARTs with the 8250-compatible serial driver. Acked-by: David McCullough Signed-off-by: Russell King commit 3e90928d81449ee10a06bc306916503d5c284a25 Author: Tobias Klauser Date: Sun May 29 01:17:29 2005 +0200 [PATCH] sound/oss/via82cxxx_audio: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer commit 0c144d0d0303917000cc918e63567b5ded22d5e2 Author: Philip Pokorny Date: Sat May 28 01:24:47 2005 -0700 [PATCH] libata fix read capacity handling for more than 2TB This is a multi-part message in MIME format. commit e254e9bff5283aad1af6d74d2a312ee011b84d61 Author: John W. Linville Date: Wed Jun 8 15:11:57 2005 -0400 [PATCH] b44: check link state during open Check the link state during b44_open. This closes a 1 HZ window that existed after b44_open ran but before the b44_timer handler ran, during which ethtool would report "Link detected: yes" no matter what the link state actually was. Signed-off-by: John W. Linville commit 1fe2cb32763457a829d33b38ec117ffe5c98e045 Author: Adam Belay Date: Mon Jun 20 14:28:41 2005 -0700 [PATCH] fix tulip suspend/resume #2 This patch allows the tulip driver to suspend and resume properly. It was originally written by Karsten Keil and then modified by Adam Belay. Signed-off-by: Karsten Keil Signed-off-by: Adam Belay Signed-off-by: Andrew Morton commit 05ab195c9803946931390faa6cfb714bd1c1e3dc Author: Olaf Hering Date: Thu May 26 01:16:51 2005 +0200 [PATCH] uninitialized variable in prism54 isl38xx_trigger_device drivers/net/wireless/prism54/isl_38xx.c:131: warning: 'current_time.tv_sec' is used uninitialized in this function drivers/net/wireless/prism54/isl_38xx.c:131: warning: 'current_time.tv_usec' is used uninitialized in this function Signed-off-by: Olaf Hering commit ae0a97bfda598088b6f97db9d9f65cd6c4f439c6 Author: YOSHIFUJI Hideaki Date: Wed May 25 16:07:04 2005 +0900 [PATCH] NETDEV: fix receiving multicast frames. Some USB ethernet drivers did not accept multicast frames appropriately. IPv6 did not work with those drivers without this patch. Signed-off-by: YOSHIFUJI Hideaki commit e8d997952bbea4f408f56a55f18667f2817dbb44 Author: YOSHIFUJI Hideaki Date: Wed May 25 16:06:59 2005 +0900 [PATCH] NETDEV: Elecom (Laneed) LD-USBL/TX support. Elecom (Laneed) LD-USBL/TX support. Signed-off-by: YOSHIFUJI Hideaki commit 7b24017e9b4506d2f83e768bf2766cc1c4a3ee54 Author: Randy Dunlap Date: Mon Jun 13 12:31:53 2005 -0700 [PATCH] 3c523: needs a license Module needs a license to prevent kernel tainting. Signed-off-by: Randy Dunlap diffstat:= drivers/net/3c523.c | 1 + 1 files changed, 1 insertion(+) commit 0bbaf069f053957e8d733784e18a2992afd1dd3c Author: Kumar Gala Date: Mon Jun 20 10:54:21 2005 -0500 [PATCH] gianfar: Add support enhanced TSEC features on the MPC 8548 Jeff, Just incase this got lost in the recent netdev mailing list transition here is a nicer version of Andy's patch for gianfar. - kumar * TCP/IP/UDP checksumming and verification * VLAN tag insertion/extraction * Larger multicast hash-table * Padding to align IP headers Also added: * msg lvl support * Some whitespace cleanup Signed-off-by: Andy Fleming Signed-off-by: Kumar Gala commit be83668a253149d99085ca4afe6cd8dc8a43fcd0 Author: Nicolas Pitre Date: Sun Jun 19 23:56:21 2005 -0400 [PATCH] smc91x: plug race between TX tasklet and driver reset The race causes a kernel oops when smc_hardware_send_pkt() tries to dereference pending_tx_skb which would have been freed from one of the driver reset paths just after the tx_task tasklet has been scheduled. This race is possible on SMP but was uncovered by the kernel RT work. Signed-off-by: Nicolas Pitre commit ed4030d114efff53e2605ea4d07d39835b68b605 Author: Denis Vlasenko Date: Fri Jun 17 08:23:17 2005 +0300 [PATCH] via-rhine trivial whitespace patch --Boundary-00=_F5lsC5eH1wGW5o9 Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Jeff, In some messages in via-rhine.c there is a leading space for no apparent reason. This patch removes it. -- vda --Boundary-00=_F5lsC5eH1wGW5o9 Content-Type: text/x-diff; charset="koi8-r"; name="via-rhine.c.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="via-rhine.c.diff" commit 2b02893ed13ec6a5799099844b5a84d8cd631dbd Author: Malli Chilakala Date: Fri Jun 17 17:46:06 2005 -0700 [PATCH] e1000: Driver version, white space, comments & other Driver version, white space, comments & other Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 3893d54731b599fed2e6cdd477580c0fadea415a Author: Malli Chilakala Date: Fri Jun 17 17:44:49 2005 -0700 [PATCH] e1000: Included proposals to false late collisions due to H/W latencies Included proposals to false late collisions due to H/W latencies Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 6921368f64c59b2a1d4659a958c69458c94d8b75 Author: Malli Chilakala Date: Fri Jun 17 17:44:20 2005 -0700 [PATCH] e1000: Ethtool set speed/duplex validates parameters for consistency Ethtool set speed/duplex validates parameters for consistency Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit d439d4b7ac24b341a40a98995f6a6d3ef586eaf7 Author: Malli Chilakala Date: Fri Jun 17 17:43:56 2005 -0700 [PATCH] e1000: Enable ethtool phys_id feature for 82573 controllers Enable ethtool phys_id feature for 82573 controllers Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 683a38f374d65128c8dd392a724513f9b8818bf7 Author: Malli Chilakala Date: Fri Jun 17 17:43:25 2005 -0700 [PATCH] e1000: Fixed VLAN tag processing error for big-endian architectures Fixed VLAN tag processing error for big-endian architectures Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 012609a877bbb7508e273d642b245d7633bc45a4 Author: Malli Chilakala Date: Fri Jun 17 17:43:06 2005 -0700 [PATCH] e1000: Ethtool cleanup patch from Stephen Hemminger Ethtool cleanup patch from Stephen Hemminger * use ADVERTISED_xxx fields when setting advertised fields * don't hardcode constant for advertised field Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 4564327b46a8c6400cd10d6dd041f6b984539f88 Author: Malli Chilakala Date: Fri Jun 17 17:42:42 2005 -0700 [PATCH] e1000: Fixed the loopback test failure for 82573 based adapters Fixed the loopback test failure for 82573 based adapters Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit b01f66910b8b36b2fe9e8051222ea418ad040cea Author: Malli Chilakala Date: Fri Jun 17 17:42:29 2005 -0700 [PATCH] e1000: Fixed register and loopback test failures with 82573 controllers Fixed register and loopback test failures with 82573 controllers Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit c6963ef571eb59b29629714c6ba3070dcca0468d Author: Malli Chilakala Date: Fri Jun 17 17:42:07 2005 -0700 [PATCH] e1000: Cleanup debug message printed when Tx Unit hang is detected Cleanup debug message printed when Tx Unit hang is detected Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 60490fe030f3969a8706d94c7cf8469be6330678 Author: Malli Chilakala Date: Fri Jun 17 17:41:45 2005 -0700 [PATCH] e1000: Use netdev_priv() to get to netdev->priv Use netdev_priv() to get to netdev->priv - from shemminger@osdl.org Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 70cf362ba988b4e6c9027cd7acff158e46a95b15 Author: Malli Chilakala Date: Fri Jun 17 17:40:41 2005 -0700 [PATCH] e1000: Use correct WOL settings for 82544 adapters Use correct WOL settings for 82544 adapters Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 97876fc66fc2405f1a2ec09eb6a0206e5168d2d9 Author: Malli Chilakala Date: Fri Jun 17 17:40:19 2005 -0700 [PATCH] e1000: Synchronize phy access between stats update and MII_IOCTL Synchronize phy access between stats update and MII_IOCTL Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 0685c31b58a69e41393e974f6e6b8e0a4eadcf0b Author: Malli Chilakala Date: Fri Jun 17 17:31:44 2005 -0700 [PATCH] e100: NAPI performance enhancements NAPI performance enhancements - Fixed issues with shared interrupts and NAPI resulting in bad performance. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit f92d872876617cddbb0532291034f88941e855fd Author: Malli Chilakala Date: Fri Jun 17 17:30:22 2005 -0700 [PATCH] e100: e100_eeprom_load was called after e100_phy_init e100_eeprom_load was called after e100_phy_init causing phy_init not to use values set in EEPROM - from emann@mrv.com Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 648951451e6d2d532d4ace2f8e9c5cdf1d563e83 Author: Malli Chilakala Date: Fri Jun 17 17:27:41 2005 -0700 [PATCH] e100: fixed e100 MDI/MDI-X issues Added patch from Eran Mann to fix following e100 MDI/MDI-X issues * MDI/MDI-X autodetection should never be enabled for 82551ER/QM chips * enabling this feature based on eeprom settings Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 9758d0f028b4c73a5222168a5ffc340606ecbea1 Merge: 0dd3c7814750adc58ed3e7b79e1943a14a790db6 1a9fe638ebdcb28bded8ec2f71d0a339ebf438ea Author: Jeff Garzik Date: Mon Jun 27 00:27:47 2005 -0400 Merge /spare/repo/netdev-2.6/ branch 'orinoco' commit 1a9fe638ebdcb28bded8ec2f71d0a339ebf438ea Author: Jeff Garzik Date: Mon Jun 27 00:27:07 2005 -0400 wireless/orinoco: remove changelog, bump version commit 98c4cae1dafcf1abbfebc0189ff27df586a838b0 Author: Christoph Hellwig Date: Sun Jun 19 01:28:06 2005 +0200 [PATCH] orinoco: monitor mode support Patch from Pavel Roskin commit 8f2abf4430ef2a131926a537ee6325dc43b0ec28 Author: Christoph Hellwig Date: Sun Jun 19 01:28:02 2005 +0200 [PATCH] orinoco: always use 802.11 header for rx processing If the frame has ToDS flag set, mark it by setting skb->pkt_type to PACKET_OTHERHOST, so that applications unaware of promiscous mode won't get uplink (STA->AP) packets for STA->STA transmissions relayed by the AP. Thanks to John Denker and David Gibson for finding the problem and the solution. Patch from Pavel Roskin commit 95dd91fbd8d3c788ef93bc94b4b600889e04dba1 Author: Christoph Hellwig Date: Sun Jun 19 01:27:56 2005 +0200 [PATCH] orinoco: scanning support Patch from Pavel Roskin commit 16739b065f4b0965d975f5c756204c7aa911cd61 Author: Christoph Hellwig Date: Sun Jun 19 01:27:51 2005 +0200 [PATCH] orinoco: manual roaming for Symbol and Intersilfirmware Patch from Pavel Roskin commit 1fab2e8b7a9dd0226e42ad5d3688edd5065bd231 Author: Christoph Hellwig Date: Sun Jun 19 01:27:40 2005 +0200 [PATCH] orinoco: basic ethtool support I completely reimplemented this based on ethtool_ops, CVS has an ioctl-based version. commit 620554e406e3cc01434c658a1e597162d7e56fd6 Author: Christoph Hellwig Date: Sun Jun 19 01:27:33 2005 +0200 [PATCH] orinoco: wireless API 15 support (patch from Moustafa Youssef, updated by Jim Carter and Pavel Roskin). commit 5d558b7f36cc577d31b770d8987681ec6e6545e7 Author: Christoph Hellwig Date: Sun Jun 19 01:27:28 2005 +0200 [PATCH] orinoco: include We need constants from this header in the next patches. commit 279385949ebb41ad166fd37505fe552cdb74ed59 Author: Christoph Hellwig Date: Sun Jun 19 01:27:20 2005 +0200 [PATCH] bring over ieee80211.h from mainline the prototypes and inlines aren't actually needed, but let's not diverge from -mm too far. commit 0dd3c7814750adc58ed3e7b79e1943a14a790db6 Author: dmitry pervushin Date: Mon Jun 20 15:32:54 2005 -0700 [PATCH] cs89x0.c: support for Philips' pnx0105 network adapter This patch is to provide support for cs89x0-based network device on Philips' pnx0105 board. Signed-off-by: dmitry pervushin Signed-off-by: Andrew Morton commit 7aa55fcec236daed20dd362c99229184691d0e7f Author: Adrian Bunk Date: Tue Jun 21 01:47:06 2005 -0700 [PATCH] drivers/net/skfp/: cleanups This patch contains the following cleanups: - make needlessly global code static - remove the completely unused smtparse.c - remove the following unused global functions: - drvfbi.c: init_dma - drvfbi.c: dis_dma - drvfbi.c: get_rom_byte - drvfbi.c: mac_drv_vpd_read - drvfbi.c: mac_drv_pci_fix - fplustm.c: mac_set_func_addr - fplustm.c: mac_del_multicast - hwmtm.c: mac_drv_rx_frag - pcmplc.c: pcm_set_lct_short - smt.c: smt_please_reconnect - smt.c: smt_change_t_neg - smtdef.c: smt_set_defaults Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton commit 9b25978ef8ebe010f582489117f8a7a43a6b44a3 Author: Hideki Yamane Date: Mon Jun 27 00:18:32 2005 -0400 [netdrvr] tulip: add pci id commit f49d16ef2d6f008119d4ee2c895781fb229bad68 Author: Manfred Spraul Date: Sun Jun 26 11:36:52 2005 +0200 [PATCH] forcedeth: Add support for new device id This is a multi-part message in MIME format. commit 8f767fc83cf4e4f1241b5a0b949b54088d075411 Author: Manfred Spraul Date: Sat Jun 18 16:27:19 2005 +0200 [PATCH] forcedeth: Poll for link changes This is a multi-part message in MIME format. commit 9992d4aa6b3b169a7903e029fc2c3eaa4b4055a1 Author: Manfred Spraul Date: Sun Jun 5 17:36:11 2005 +0200 [PATCH] forcedeth: add two new pci ids This is a multi-part message in MIME format. commit a3948663ed89c2f17e37cd0936d964341edb193e Author: Tobias Klauser Date: Mon Jun 20 23:49:08 2005 +0200 [PATCH] drivers/block/sx8.c: Use the DMA_{64, 32}BIT_MASK constants Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() These patches include dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer commit 4f2ad81104a18946c64215adffce50c2a659fddd Author: Nishanth Aravamudan Date: Mon Jun 20 23:53:40 2005 +0200 [PATCH] net/lanstreamer: replace schedule_timeout() with ssleep()/msleep_interruptible() Use ssleep() / msleep_interruptible() [as appropriate] instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer commit f17697a37ccd2128f37250d2e7715c59931dc458 Author: Nishanth Aravamudan Date: Mon Jun 20 23:54:12 2005 +0200 [PATCH] net/pcnet32: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer commit 0da8b1454815862e03dae1a199936832a6e67868 Author: Nishanth Aravamudan Date: Mon Jun 20 23:54:25 2005 +0200 [PATCH] net/farsync: add set_current_state() before schedule_timeout() Insert set_current_state() before schedule_timeout() so the function delays as expected. Without the addition, schedule_timeout() will return immediately. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer commit a26c074c1cf130df95e9c297ef98fdd98348acf0 Author: Nishanth Aravamudan Date: Mon Jun 20 23:54:27 2005 +0200 [PATCH] net/sb1000: replace nicedelay() with ssleep() Use ssleep() instead of nicedelay() to guarantee the task delays as expected. Remove the prototype and definition of nicedelay(). This is a very weird function, because it is called to sleep in terms of usecs, but always sleeps for 1 second, completely ignoring the parameter. I have gone ahead and followed suit, just sleeping for a second in all cases, but maybe someone with the hardware could tell me if perhaps the paramter *should* matter. Additionally, nicedelay() is called in TASK_INTERRUPTIBLE state, but doesn't deal with signals in case these longer delays do not complete, so I believe ssleep() is more appropriate. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer commit 62595eb9066ea09f7f8a789a38bec16d70ee0321 Author: Domen Puncer Date: Mon Jun 20 23:54:37 2005 +0200 [PATCH] wireless: char* -> char[] conversion in airo.c This conversion makes code from line 7101 right: if (copy_to_user(com.data, swversion, sizeof(swversion))) size output (before, after): 55416 2228 160 57804 e1cc drivers/net/wireless/airo.o 55412 2228 160 57800 e1c8 drivers/net/wireless/airo.o more outputs from Alexey Dobriyan: 2.95.3: text data bss dec hex filename before 51118 2156 160 53434 d0ba drivers/net/wireless/airo.o after 51118 2156 160 53434 d0ba drivers/net/wireless/airo.o 3.3.5-20050130: before 46999 2156 160 49315 c0a3 drivers/net/wireless/airo.o after 46994 2156 160 49310 c09e drivers/net/wireless/airo.o 4.1.0-20050522: before 45555 2220 160 47935 bb3f drivers/net/wireless/airo.o after 45550 2220 160 47930 bb3a drivers/net/wireless/airo.o Signed-off-by: Domen Puncer commit 020f46a39eb7b99a575b9f4d105fce2b142acdf1 Merge: 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd 4da62fc70d7cbcf8fa606a8c806d9dc8faa0ceae Author: Linus Torvalds Date: Sun Jun 26 19:16:33 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd Merge: 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 26799e675e47c5aa3104628e2081a7299ea46557 Author: Linus Torvalds Date: Sun Jun 26 17:28:24 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 4da62fc70d7cbcf8fa606a8c806d9dc8faa0ceae Author: pageexec Date: Sun Jun 26 16:00:19 2005 -0700 [IPVS]: Fix for overflows From: $subject was fixed in 2.4 already, 2.6 needs it as well. The impact of the bugs is a kernel stack overflow and privilege escalation from CAP_NET_ADMIN via the IP_VS_SO_SET_STARTDAEMON/IP_VS_SO_GET_DAEMON ioctls. People running with 'root=all caps' (i.e., most users) are not really affected (there's nothing to escalate), but SELinux and similar users should take it seriously if they grant CAP_NET_ADMIN to other users. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 Author: Sascha Hauer Date: Mon Jun 20 15:32:51 2005 -0700 [PATCH] DM9000 network driver bugfix This patch fixes two bugs in the dm9000 network driver: - Don't read one byte too much in 8bit mode. - release correct resource Signed-off-by: Jochen Karrer Signed-off-by: Sascha Hauer Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 1db1a8740abc90f4715a48cd970506686e6da5b1 Author: Ismail Donmez Date: Mon Jun 20 15:32:52 2005 -0700 [PATCH] Documentation/networking/dmfe.txt: Make documentation nicer Patch indents dmfe.txt to look like other docs. It adds a tip about CNET cards using Davicom chipsets. Also it removes parts where it refers to how to build driver out-of-kernel which seems to be cruft from times where the driver was out of the kernel. Signed-off-by: Ismail Donmez Signed-off-by: Domen Puncer Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 400de2c0c4f4a2cc2e0270353e7eb512c1899a0c Author: Denis Vlasenko Date: Mon Jun 20 15:33:04 2005 -0700 [PATCH] fealnx.c calls dev_kfree_skb from atomic context Signed-off-by: Andrew Morton commit 1cc68ae0cf9e3384d9eef6985b312bf2bf1161b3 Author: Pavel Machek Date: Mon Jun 20 15:33:04 2005 -0700 [PATCH] fix int vs. pm_message_t confusion in airo Fix int vs. pm_message_t confusion in airo. Should change no code. Signed-off-by: Pavel Machek Cc: Jeff Garzik Signed-off-by: Andrew Morton commit feea1db26e5babbedf1f4f36223e21b2f2d6f499 Author: Maciej W. Rozycki Date: Mon Jun 20 15:33:03 2005 -0700 [PATCH] defxx: Use irqreturn_t for the interrupt handler This is a fix for the interrupt handler in the defxx driver to use irqreturn_t. Beside the obvious fix of returning a proper status at all, it actually checks board registers as appropriate for determining if an interrupt has been recorded in the bus-specific interface logic. The patch also includes an obvious one-line fix for SET_NETDEV_DEV needed for the EISA variation, for which I've decided there is no point in sending separately. Signed-off-by: Maciej W. Rozycki Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 16b110c3fd760620b4a787db6ed512fe531ab1b5 Author: Andrew Morton Date: Mon Jun 20 15:32:59 2005 -0700 [PATCH] dmfe warning fix drivers/net/tulip/dmfe.c: In function `dmfe_parse_srom': drivers/net/tulip/dmfe.c:1805: warning: passing arg 1 of `__le16_to_cpup' from incompatible pointer type drivers/net/tulip/dmfe.c:1817: warning: passing arg 1 of `__le32_to_cpup' from incompatible pointer type drivers/net/tulip/dmfe.c:1817: warning: passing arg 1 of `__le32_to_cpup' from incompatible pointer type This is basically a guess: Cc: Jeff Garzik Signed-off-by: Andrew Morton commit f04e3f092a855ce798f274b38712b90d51b73bca Author: Adrian Bunk Date: Mon May 16 21:13:03 2005 +0200 [PATCH] document that 8139TOO supports 8129/8130 The 8129/8130 support is a sub-option that is not visible if the user hasn't enabled the 8139 support. Let's make it a bit easier for users to find the driver for their nic. Signed-off-by: Adrian Bunk commit d470e3b483dcf79c16463bc740738dca76a035a9 Author: David S. Miller Date: Sun Jun 26 15:31:51 2005 -0700 [NETLINK]: Fix two socket hashing bugs. 1) netlink_release() should only decrement the hash entry count if the socket was actually hashed. This was causing hash->entries to underflow, which resulting in all kinds of troubles. On 64-bit systems, this would cause the following conditional to erroneously trigger: err = -ENOMEM; if (BITS_PER_LONG > 32 && unlikely(hash->entries >= UINT_MAX)) goto err; 2) netlink_autobind() needs to propagate the error return from netlink_insert(). Otherwise, callers will not see the error as they should and thus try to operate on a socket with a zero pid, which is very bad. However, it should not propagate -EBUSY. If two threads race to autobind the socket, that is fine. This is consistent with the autobind behavior in other protocols. So bug #1 above, combined with this one, resulted in hangs on netlink_sendmsg() calls to the rtnetlink socket. We'd try to do the user sendmsg() with the socket's pid set to zero, later we do a socket lookup using that pid (via the value we stashed away in NETLINK_CB(skb).pid), but that won't give us the user socket, it will give us the rtnetlink socket. So when we try to wake up the receive queue, we dive back into rtnetlink_rcv() which tries to recursively take the rtnetlink semaphore. Thanks to Jakub Jelink for providing backtraces. Also, thanks to Herbert Xu for supplying debugging patches to help track this down, and also finding a mistake in an earlier version of this fix. Signed-off-by: David S. Miller commit a9fc25108995f1f59ee30026818d7ec2bb016fbe Author: Nishanth Aravamudan Date: Sun May 1 23:34:57 2005 -0700 [PATCH] net/slip: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. commit 6835d09ad286db5df472dc91aae0a69128e7258b Author: Adrian Bunk Date: Mon May 2 03:47:00 2005 +0200 [PATCH] drivers/net/ewrk3.c: remove dead code This patch removes some obviously dead code found by the Coverity checker. Signed-off-by: Adrian Bunk commit 854608d824dc2c8e14c373e0c46cefda5386ed8a Author: Adrian Bunk Date: Mon May 2 03:46:52 2005 +0200 [PATCH] drivers/net/skfp/: fix LITTLE_ENDIAN This patch fixes the LITTLE_ENDIAN #define and a function prototype. Signed-off-by: Adrian Bunk commit de70b4c87b8f1d484cf533536c0c6ce2e05101cf Author: Adrian Bunk Date: Mon May 2 03:46:43 2005 +0200 [PATCH] drivers/net/tokenring/: cleanups This patch contains the follwing cleanups: - make needlessly global code static - remove obsolete Emacs settings Signed-off-by: Adrian Bunk commit 32e9e25ef20789c24ffa1f41489a13932cf82c77 Author: David S. Miller Date: Sun Jun 26 15:28:10 2005 -0700 [ATALK]: Include asm/byteorder.h in linux/atalk.h We're using __be16 in userland visible types, so we have to include asm/byteorder.h so that works. Signed-off-by: David S. Miller commit 64053beeb5a5f9cd79903a8c3dd35d1ef0a4685f Author: Robert Olsson Date: Sun Jun 26 15:27:10 2005 -0700 [PKTGEN]: Fix random packet sizes causing panic Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 93ad4fb04f5dd82fe8ace1db7617c9dcb954cf60 Author: Andreas Mohr Date: Mon Apr 11 16:47:43 2005 -0700 [PATCH] pcnet_cs.c: IRQ handler optimization During some performance diagnostics I stumbled on this slightly wasteful code in pcnet_cs.c which I made the patch included at the bottom for (two minor comment fixes included). Improvement: instead of *always* calculating lea 0x2c0(%edx),%ebx and then additionally doing the mov %edx,0xc0(%ebx) addition *if we need it*, we now do the *whole* calculation of mov %edx,0x380(%ebx) *only* if we need it. This even manages to save us a whole 16-byte alignment buffer loss in this compilation case. Result: slightly improves IRQ handler performance in both shared and non-shared IRQ case, which should make my rusty P3/700 a slight bit happier. Thank you for your support, Andreas Mohr old asm result (using gcc 3.3.5): 000015a0 : 15a0: 55 push %ebp 15a1: 89 e5 mov %esp,%ebp 15a3: 53 push %ebx 15a4: 8d 9a c0 02 00 00 lea 0x2c0(%edx),%ebx 15aa: e8 fc ff ff ff call 15ab 15af: 83 f8 01 cmp $0x1,%eax 15b2: 74 03 je 15b7 15b4: 5b pop %ebx 15b5: 5d pop %ebp 15b6: c3 ret 15b7: 31 d2 xor %edx,%edx 15b9: 89 93 c0 00 00 00 mov %edx,0xc0(%ebx) 15bf: eb f3 jmp 15b4 15c1: eb 0d jmp 15d0 15c3: 90 nop 15c4: 90 nop 15c5: 90 nop 15c6: 90 nop 15c7: 90 nop 15c8: 90 nop 15c9: 90 nop 15ca: 90 nop 15cb: 90 nop 15cc: 90 nop 15cd: 90 nop 15ce: 90 nop 15cf: 90 nop 000015d0 : new asm result: 000015a0 : 15a0: 55 push %ebp 15a1: 89 e5 mov %esp,%ebp 15a3: 53 push %ebx 15a4: 89 d3 mov %edx,%ebx 15a6: e8 fc ff ff ff call 15a7 15ab: 83 f8 01 cmp $0x1,%eax 15ae: 74 03 je 15b3 15b0: 5b pop %ebx 15b1: 5d pop %ebp 15b2: c3 ret 15b3: 31 d2 xor %edx,%edx 15b5: 89 93 80 03 00 00 mov %edx,0x380(%ebx) 15bb: eb f3 jmp 15b0 15bd: 8d 76 00 lea 0x0(%esi),%esi 000015c0 : Signed-off-by: Andrew Morton commit 1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4 Author: Domen Puncer Date: Sun Jun 26 18:22:14 2005 -0400 drivers/net/: Use the DMA_{64,32}BIT_MASK constants Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer commit 60fe7403209179fccd6629172c4b36acc69c5db6 Author: Adrian Bunk Date: Sun Jun 26 15:21:15 2005 -0700 [TCP]: Let TCP_CONG_ADVANCED default to n It doesn't seem to make much sense to let an "If unsure, say N." option default to y. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 6c3607676c12d77d70cc712310f52fbc6af5895d Author: David S. Miller Date: Sun Jun 26 15:20:20 2005 -0700 [IPV4]: Fix thinko in TCP_CONG_BIC default. Since it is tristate when we offer it as a choice, we should definte it also as tristate when forcing it as the default. Otherwise kconfig warns. Signed-off-by: David S. Miller commit 5ccabb9b45aff50e41d27a5f384ae2d2dd7640de Author: Magnus Damm Date: Tue Apr 5 20:05:50 2005 +0200 [PATCH] arlan: module parameter fixes Make sure the code compiles with and without ARLAN_ENTRY_EXIT_DEBUGGING. Only provide parameter descriptions when parameters are defined. Remove "arlan_"-prefix to shape up built-in parameter names: arlan.arlan_debug -> arlan.debug arlan.arlan_EEPROM_bad -> arlan.EEPROM_bad arlan.arlan_entry_and_exit_debug -> arlan.entry_and_exit_debug arlan.arlan_entry_debug -> arlan.entry_debug arlan.arlan_exit_debug -> arlan.exit_debug Signed-off-by: Magnus Damm commit 12b279f9c0cb70695865dc336161512fa6e75d50 Author: Tobias Klauser Date: Mon Apr 4 18:10:18 2005 +0200 [PATCH] net/sis900: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros. This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser commit e8c0eee96801f3c3f577b377b89ab01ab36ba7b6 Merge: 97f568d8e3dc031b092e6086c0534d5411fb2cf5 aef7b83c92dd0b7e994805440655d1d64147287b Author: Jeff Garzik Date: Sun Jun 26 18:09:43 2005 -0400 Merge /spare/repo/netdev-2.6/ branch 'register-netdev' commit aef7b83c92dd0b7e994805440655d1d64147287b Merge: b1fc5505e0dbcc3fd7c75bfe6bee39ec50080963 8678887e7fb43cd6c9be6c9807b05e77848e0920 Author: Jeff Garzik Date: Sun Jun 26 18:06:06 2005 -0400 Merge /spare/repo/linux-2.6/ commit 97f568d8e3dc031b092e6086c0534d5411fb2cf5 Author: Stephen Hemminger Date: Sun Jun 26 18:02:44 2005 -0400 8139cp: safer spin loop for get_statistics The spin loop in 8139cp is limited to 100 iterations when pulling hardware stats. There is no allowance for processor speed so on a fast machine, the stats may not be available that fast. Also, if the board doesn't return soon enough make sure turn the address back off to prevent later updates when memory has gone away. commit 223d47278a77091b62e7d063e95860f63ca55e20 Author: Kumar Gala Date: Sun Jun 26 17:58:51 2005 -0400 gianfar: Update Marvell PHY name This patch updates the name identifier to list both of the Marvell PHYs that are supported. Signed-off-by: Kumar Gala commit 169a3e66637c667b43dab7c319ffd5c99804cad8 Author: Jay Vosburgh Date: Sun Jun 26 17:54:11 2005 -0400 bonding: xor/802.3ad improved slave hash Add support for alternate slave selection algorithms to bonding balance-xor and 802.3ad modes. Default mode (what we have now: xor of MAC addresses) is "layer2", new choice is "layer3+4", using IP and port information for hashing to select peer. Originally submitted by Jason Gabler for balance-xor mode; modified by Jay Vosburgh to additionally support 802.3ad mode. Jason's original comment is as follows: The attached patch to the Linux Etherchannel Bonding driver modifies the driver's "balance-xor" mode as follows: - alternate hashing policy support for mode 2 * Added kernel parameter "xmit_policy" to allow the specification of different hashing policies for mode 2. The original mode 2 policy is the default, now found in xmit_hash_policy_layer2(). * Added xmit_hash_policy_layer34() This patch was inspired by hashing policies implemented by Cisco, Foundry and IBM, which are explained in Foundry documentation found at: http://www.foundrynet.com/services/documentation/sribcg/Trunking.html#112750 Signed-off-by: Jason Gabler Signed-off-by: Jay Vosburgh commit c3ade5cad07f4d67f2e16a28f3c73d9483a55e0e Author: Jay Vosburgh Date: Sun Jun 26 17:52:20 2005 -0400 bonding: gratuitous ARP Add support for generating gratuitous ARPs in bonding active-backup mode when failovers occur. Includes support for VLAN tagging the ARPs as needed. Signed-off-by: Jay Vosburgh commit 12755c16a9e4fa2fd5b0ca1963e83d671a6251da Author: Ralf Baechle Date: Sun Jun 26 17:45:52 2005 -0400 Tulip fixes for Cobalt Qube/RaQ commit 26799e675e47c5aa3104628e2081a7299ea46557 Author: Lennert Buytenhek Date: Sun Jun 26 22:24:19 2005 +0100 [PATCH] ARM: 2757/1: remove ixdp2400_init_irq from ixdp2800 code Patch from Lennert Buytenhek Compiling one kernel that supports both ixdp2400 and ixdp2800 gives an error, as a copy of the ixdp2400 irq init routing accidentally ended up in ixdp2800.c somehow. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit baaf7ed1797de1defce3e3a03f3c9c49cdf3b534 Author: Lennert Buytenhek Date: Sun Jun 26 22:24:17 2005 +0100 [PATCH] ARM: 2756/1: add ixp2000 msf mapping Patch from Lennert Buytenhek Add a mapping for the ixp2400 and ixp2800 msf unit. The msf is the ixp2000's 'media and switch fabric' unit, which handles the networking part of the chip. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 67603be482a0361a13c2238b79172849ee2e307c Author: Lennert Buytenhek Date: Sun Jun 26 22:24:16 2005 +0100 [PATCH] ARM: 2755/1: describe ixp2000 virtual memory map layout Patch from Lennert Buytenhek Add a comment to asm/arch-ixp2000/ixp2000-regs.h describing the ixp2000 virtual memory map layout. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 15aca90363719f11f200f510a13d18bda9dea789 Author: Lennert Buytenhek Date: Sun Jun 26 22:24:14 2005 +0100 [PATCH] ARM: 2754/1: move ixp2000 VMALLOC_END up Patch from Lennert Buytenhek As the ixdp cpld mappings now live at 0xfe000000, we can push VMALLOC_END upwards to 0xfb000000, where the first iotable mapping begins. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 91f6a589fb6bb4ce6b6b196e910d3b907e1d0a40 Author: Lennert Buytenhek Date: Sun Jun 26 22:24:13 2005 +0100 [PATCH] ARM: 2753/1: move ixdp* cpld mappings Patch from Lennert Buytenhek All ixdp platforms currently have a cpld mapped in at 0xfafff000. Since this address is not 1M-aligned, a regular page mapping will be used instead of a section mapping, which opens up the possibility of triggering ixp2400 erratum #66 as we only do the XCB=101 workaround thing for section mappings. There is still a lot of space higher up in the virtual memory map for 1M mappings, so move the cpld mapping to 0xfe000000 and make it 1M big so that a section mapping will be used for it. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 8b0ee07e108b2eefdab5bb73f33223f18926c3b2 Merge: 4638aef40ba9ebb9734caeed1f373c24015259fd 8678887e7fb43cd6c9be6c9807b05e77848e0920 Author: Jeff Garzik Date: Sun Jun 26 17:11:03 2005 -0400 Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6. commit 8678887e7fb43cd6c9be6c9807b05e77848e0920 Merge: bf82322ec5d5faa8bfd8f163909244d8c6b562d5 9a18664506dbce5e23f3c5de7b1c5a042dd26520 Author: Linus Torvalds Date: Sun Jun 26 09:55:39 2005 -0700 Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 commit bf82322ec5d5faa8bfd8f163909244d8c6b562d5 Merge: 7d681b23d6cc14a8c026ea6756242cb522cbbcae 6921e3310486a6e5ac3f36efcc7351347503c71a Author: Linus Torvalds Date: Sun Jun 26 09:53:42 2005 -0700 Merge 'drm-fixes' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 commit 09b8b5f843afc21daf710cc610e5ca890ee94696 Author: Russell King Date: Sun Jun 26 17:06:36 2005 +0100 [PATCH] ARM: Add SA_TIMER flag to timer interrupts VST needs to know which timer handler is for the timer interrupt. Mark all timer interrupts with the SA_TIMER flag. Signed-off-by: Russell King commit 7d681b23d6cc14a8c026ea6756242cb522cbbcae Author: Kumar Gala Date: Sun Jun 26 09:14:01 2005 -0500 [PATCH] ppc32: Fix MPC83xx IPIC external interrupt pending register offset The pending registers for IRQ1-IRQ7 were pointing to the interrupt pending register instead of the external one. Signed-off-by: Tony Li Signed-off-by: Kumar Gala Signed-off-by: Linus Torvalds commit 340ea3972ffc6c9f90b3ac38b70eade1c8efbf5b Author: Adrian Bunk Date: Sun Jun 26 03:27:22 2005 -0700 [PATCH] remove redundant info from SubmittingPatches Since the Trivial Patch Monkey is mentioned both in steps 4. and 5., I removed it from step4 (Select e-mail destination), since it should go under 'Select your CC list'. Signed-off-by: Cosmin Nicolaescu Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdb94f3a78366d46bc73c8c8d8fe0dfb9522ff36 Author: Andrew Morton Date: Sun Jun 26 03:27:21 2005 -0700 [PATCH] arm: swsusp build fix Another swsusp fixup. Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34f18a9887afaeb6e50168df512e1118f7d73542 Author: Andrew Morton Date: Sun Jun 26 03:27:20 2005 -0700 [PATCH] jffs2 build fix Missed conversion in the swsusp cleanup. Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6921e3310486a6e5ac3f36efcc7351347503c71a Author: Dave Airlie Date: Sun Jun 26 21:05:59 2005 +1000 drm: fix radeon irq properly After the previous fix in 2.6.12, this patch should properly fix the radeon IRQ handling code. From: Benjamin Herrenschmidt Signed-off-by: Dave Airlie commit 6f0dcb72d6a053fff9288b742d3bcc9b23f0f6db Author: Linus Torvalds Date: Sat Jun 25 20:09:12 2005 -0700 Fix up try_to_freeze() usage in arch/i386/kernel/signal.c The parentheses were missing. Noted by Pavel Machek. commit 2031d0f586839bc68f35bcf8580b18947f8491d4 Merge: 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 Author: Linus Torvalds Date: Sat Jun 25 17:16:53 2005 -0700 Merge Christoph's freeze cleanup patch commit 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 Author: Christoph Lameter Date: Fri Jun 24 23:13:50 2005 -0700 [PATCH] Cleanup patch for process freezing 1. Establish a simple API for process freezing defined in linux/include/sched.h: frozen(process) Check for frozen process freezing(process) Check if a process is being frozen freeze(process) Tell a process to freeze (go to refrigerator) thaw_process(process) Restart process frozen_process(process) Process is frozen now 2. Remove all references to PF_FREEZE and PF_FROZEN from all kernel sources except sched.h 3. Fix numerous locations where try_to_freeze is manually done by a driver 4. Remove the argument that is no longer necessary from two function calls. 5. Some whitespace cleanup 6. Clear potential race in refrigerator (provides an open window of PF_FREEZE cleared before setting PF_FROZEN, recalc_sigpending does not check PF_FROZEN). This patch does not address the problem of freeze_processes() violating the rule that a task may only modify its own flags by setting PF_FREEZE. This is not clean in an SMP environment. freeze(process) is therefore not SMP safe! Signed-off-by: Christoph Lameter Signed-off-by: Linus Torvalds commit 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 Author: Adrian Bunk Date: Sat Jun 25 14:59:37 2005 -0700 [PATCH] schedule the obsolete raw driver for removal Since kernel 2.6.3 the Kconfig text explicitely stated this driver was obsolete. (trolling for IBMers) Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c33ed271263f5fb6ca5ab888b98a55ae5d138c0b Author: Domen Puncer Date: Sat Jun 25 14:59:36 2005 -0700 [PATCH] list_for_each_entry: fs-dquot.c Make code more readable with list_for_each_entry_safe. Signed-off-by: Domen Puncer Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Acked-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97998d8fdb5530edd466b006423a422ea790cf23 Author: Adrian Bunk Date: Sat Jun 25 14:59:35 2005 -0700 [PATCH] drivers/char/rio/: kill rio_udelay There's no need for a function that only calls udelay. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d660a7403a801018dc65208dbcba4463c3038b1f Author: Adrian Bunk Date: Sat Jun 25 14:59:35 2005 -0700 [PATCH] MAINTAINERS: document that uclinux-dev@uclinux.org is subscribers-only Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fd5559c1f916f284b5b0866148e076866de6f99 Author: Alexey Dobriyan Date: Sat Jun 25 14:59:34 2005 -0700 [PATCH] DCO: use IANA-reserved second level domain name Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a72c7ba2e6df945484d7a85d7a82237270957fd Author: Nishanth Aravamudan Date: Sat Jun 25 14:59:33 2005 -0700 [PATCH] serial/68328serial: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() in send_break() to guarantee the task delays as expected. Change @duration's units to milliseconds, and modify arguments in callers appropriately. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d582b4ef6df853ca2da46135855cd6536c0205b Author: Nishanth Aravamudan Date: Sat Jun 25 14:59:32 2005 -0700 [PATCH] serial/68360serial: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() in send_break() to guarantee the task delays as expected. Change @duration's units to milliseconds, and modify arguments in callers appropriately. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f353488ce48e7a0311fe764284096481b455fbe9 Author: Tobias Klauser Date: Sat Jun 25 14:59:30 2005 -0700 [PATCH] Remove duplicate file in Documentation/networking The files wanpipe.txt and wan-router.txt in Documentation/networking contain the exact same information (diff between the two shows no document is "Linux WAN Router Utilities Package" and therefor the name wan-router.txt is more appropriate. Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 301a716446a8b24898808d0430c2ed0dce55890e Author: Tobias Klauser Date: Sat Jun 25 14:59:29 2005 -0700 [PATCH] Remove duplicate file in Documentation/networking (00-INDEX) wanpipe.txt and wan-router.txt in Documentation/networking contain the exact same information (diff between the two shows no Documentation/networking/00-INDEX as pointed out by Randy Dunlap. Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9ff7d6644827a7cc1b2ecf636112c4703f32633 Author: Tobias Klauser Date: Sat Jun 25 14:59:28 2005 -0700 [PATCH] Remove duplicate file in Documentation/networking (drivers_net_wan_Kconfig) wanpipe.txt and wan-router.txt in Documentation/networking contain the exact same information (diff between the two shows no drivers/net/wan/Kconfig. Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f11842ebbb3b98a88c38ef6c18345ccc792a54b Author: Tobias Klauser Date: Sat Jun 25 14:59:27 2005 -0700 [PATCH] sound/oss/cmpci: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 738c7b4f7f36ce2c547d0a2c2aa397aae904510f Author: Tobias Klauser Date: Sat Jun 25 14:59:27 2005 -0700 [PATCH] sound/oss/es1370: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ee538a2e867c7fbdb2a5940b610682d5d08e8be Author: Tobias Klauser Date: Sat Jun 25 14:59:26 2005 -0700 [PATCH] sound/oss/es1371: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit caac3a444ce3b5a8d76069abfbb699d2a65b3f09 Author: Tobias Klauser Date: Sat Jun 25 14:59:25 2005 -0700 [PATCH] sound/oss/esssolo1: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f90e7185ee00c1faa9d07b2f669d124772fdba17 Author: Christophe Lucas Date: Sat Jun 25 14:59:24 2005 -0700 [PATCH] printk: arch/i386/mm/pgtable.c printk() calls should include appropriate KERN_* constant. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee48dd579977c35f35760bc893115e649b026306 Author: Christophe Lucas Date: Sat Jun 25 14:59:24 2005 -0700 [PATCH] printk: arch/i386/mm/ioremap.c printk() calls should include appropriate KERN_* constant. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48b9d03c5f20a0585bb6f7d8c4abad3661df5d75 Author: J.A. Magallon Date: Sat Jun 25 14:59:22 2005 -0700 [PATCH] Kill signed chars scripts/ is full of mismatches between char* params an signed char* arguments, and viceversa. gcc4 now complaints loud about this. Patch below deletes all those 'signed'. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f14c6fd0fc9fbaf242254c84ba2632decb25e91a Author: Olaf Hering Date: Sat Jun 25 14:59:21 2005 -0700 [PATCH] update comment about gzip scratch size fix a comment about the array size. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfa1a55335a0e822b36607d25c980c4e2a8e5e87 Author: Nikita Danilov Date: Sat Jun 25 14:59:20 2005 -0700 [PATCH] ll_merge_requests_fn() cleanup ll_merge_requests_fn() assigns total_{phys,hw}_segments twice. Fix this and a typo. Signed-off-by: Nikita Danilov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 672c3fd9069e5a138f9d4afc9aeb5aa34aacce32 Author: Adrian Bunk Date: Sat Jun 25 14:59:18 2005 -0700 [PATCH] drivers/isdn/hisax/: possible cleanups This patch contains the following possible cleanups: - make needlessly global code static - remove the compiled but unused st5481_hdlc.{c,h} - kill enternow.h - enternow_pci.c: kill InByte/OutByte/BYTE - isdnl2.c: kill FreeSkb - remove or #if 0 the following unused functions: - config.c: IsdnCardState - ipacx.c: ipacx_new_ph - ipacx.c: dch_bh - ipacx.c: setup_ipacx - isdnl2.c: IsRR Signed-off-by: Adrian Bunk Acked-by: Kai Germaschewski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b3d4a2a3ef9488d4477e8823106abfd6039eb66 Author: Adrian Bunk Date: Sat Jun 25 14:59:17 2005 -0700 [PATCH] drivers/cdrom/cm206.c: cleanups This patch contains the following cleanups: - make needlessly global functions static - remove the following unused global function: - cm206_delay Signed-off-by: Adrian Bunk Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 995c6ed2b1bb309eb45c3006779dc90fb3f4150d Author: Adrian Bunk Date: Sat Jun 25 14:59:16 2005 -0700 [PATCH] drivers/char/ip2*: cleanups This patch contains the following cleanups: - i2cmd.c: #if 0 the unused function i2cmdUnixFlags - i2cmd.c: make the needlessly global funciton i2cmdBaudDef static - ip2main.c: remove dead code that wasn't reachable due to an #ifdef Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0933ad9c233b09ee5fd636525ed07c149c879980 Author: Jesper Juhl Date: Sat Jun 25 14:59:15 2005 -0700 [PATCH] kfree cleanups for drivers/firmware/ Here's a patch with kfree() cleanups for drivers/firmware/efivars.c Patch removes redundant NULL checks before kfree and also makes a small whitespace cleanup - moves two statements on same line to separate lines. Signed-off-by: Jesper Juhl Acked-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0159f76d9f5839c3c92bc3a91c865e94d5e489a8 Author: Jesper Juhl Date: Sat Jun 25 14:59:14 2005 -0700 [PATCH] kfree cleanups in ixj.c This patch removes redundant checks for NULL pointer before kfree() in drivers/telephony/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89e0b1134e46195c64bbad21010799ba567bf7f2 Author: Jesper Juhl Date: Sat Jun 25 14:59:14 2005 -0700 [PATCH] remove pointless NULL check before kfree in sony535.c There's no need to check for NULL, kfree() can cope. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07d46de415fba309a5648f078fdda118d489646b Author: Adrian Bunk Date: Sat Jun 25 14:59:13 2005 -0700 [PATCH] update Computone MAINTAINERS entry This patch states that Michael still maintains this driver and removes a no longer mailing list. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e84d1c36a505765c12e90289c9dbd575332840b Author: Adrian Bunk Date: Sat Jun 25 14:59:12 2005 -0700 [PATCH] i386: cleanup boot_cpu_logical_apicid variables There are currently two different boot_cpu_logical_apicid variables: - a global one in mpparse.c - a static one in smpboot.c Of these two, only the one in smpboot.c might be used (through boot_cpu_apicid). This patch therefore removes the one in mpparse.c . Signed-off-by: Adrian Bunk Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6260cd354ec2b3ec026d6c899dc01e442b5e6cc Author: Adrian Bunk Date: Sat Jun 25 14:59:11 2005 -0700 [PATCH] change the SOUND_PRIME handling SOUND_PRIME (for OSS) is a tristate. This doesn't make much sense if most users are checking for SOUND_PRIME!=0. This patch changes the semantics of SOUND_PRIME to being a limit for all OSS modules, IOW: SOUND_PRIME=m does now say that all OSS drivers can only be modular. As a side effect, since SOUND_PRIME already depends on SOUND, there's no longer a reason for drivers depending on SOUND_PRIME to additionally depend on SOUND. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93d17d3d84b7147e8f07aeeb15ec01aa92c6b564 Author: Adrian Bunk Date: Sat Jun 25 14:59:10 2005 -0700 [PATCH] drivers/block/ll_rw_blk.c: cleanups This patch contains the following cleanups: - make needlessly global code static - remove the following unused global functions: - blkdev_scsi_issue_flush_fn - __blk_attempt_remerge - remove the following unused EXPORT_SYMBOL's: - blk_phys_contig_segment - blk_hw_contig_segment - blkdev_scsi_issue_flush_fn - __blk_attempt_remerge Signed-off-by: Adrian Bunk Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8e1c7292ee9b64c35b3f6d7f905ca5e854aea95 Author: Adrian Bunk Date: Sat Jun 25 14:59:09 2005 -0700 [PATCH] drivers/char/mwave/tp3780i.c: remove dead code This patch removes some dead code found by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67da54cf5d577c9dda835d0cf42379657d15d6c9 Author: Adrian Bunk Date: Sat Jun 25 14:59:08 2005 -0700 [PATCH] drivers/video/matrox/matroxfb_misc.c: remove dead code This patch removes some obviously dead code found by the Coverity checker. This patch was already ACK'ed by Petr Vandrovec. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db407163773a8447dd869ee98348e05c81b4c337 Author: Adrian Bunk Date: Sat Jun 25 14:59:07 2005 -0700 [PATCH] fs/ncpfs/: remove unused #ifdef USE_OLD_SLOW_DIRECTORY_LISTING code This patch removes some unused #ifdef USE_OLD_SLOW_DIRECTORY_LISTING code. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94c9eca223048ae15df1989fae50eefda9daae7e Author: Adrian Bunk Date: Sat Jun 25 14:59:06 2005 -0700 [PATCH] fs/jffs/: cleanups This patch contains the following cleanups: - make needlessly global functions static - provide some debugging helper functions only for appropriate values of CONFIG_JFFS_FS_VERBOSE Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f15313bf42337ade55376303932d8b6a62e6be43 Author: Adrian Bunk Date: Sat Jun 25 14:59:05 2005 -0700 [PATCH] drivers/char/rocket.c: cleanups This patch contains the following cleanups: - make needlessly global code static - remove the TRUE/FALSE macros Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 681ea4b930768444e9d88651c1362b0bf6d2a42b Author: Adrian Bunk Date: Sat Jun 25 14:59:04 2005 -0700 [PATCH] drivers/char/nvram.c: possible cleanups This patch contains the following possible cleanups: - make the needlessly global function __nvram_set_checksum static - #if 0 the unused global function nvram_set_checksum - remove the EXPORT_SYMBOL's for both functions Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b01b47cf95682d02676efa5d0b48e759db405b3 Author: Adrian Bunk Date: Sat Jun 25 14:59:03 2005 -0700 [PATCH] drivers/char/mwave/3780i.c: cleanups This patch contains the following cleanups: - make a needlessly global function static - #if 0 the unused global function dsp3780I_ReadGenCfg Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbc6b5f55908d7351380bca69393f5839508ad3f Author: Adrian Bunk Date: Sat Jun 25 14:59:03 2005 -0700 [PATCH] drivers/char/istallion.c: remove an unneeded variable This patch removes an unneeded global variable. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f25ad2d3b886e61d7ec03a3bdefc22871c14e9da Author: Adrian Bunk Date: Sat Jun 25 14:59:02 2005 -0700 [PATCH] sound/oss/sscape.c: remove dead code The Coverity checker found that sscape_sb_enable never get's assigned any value different from 0, and therefore some code paths are impossible. This patch removes this variable and the dead code paths. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4cd16e2e8f0924d8e3a2391edc51556cad26d99 Author: Adrian Bunk Date: Sat Jun 25 14:59:01 2005 -0700 [PATCH] drivers/scsi/dpt*: remove version.h dependencies This patch removes version.h dependencies. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1ae13a4dd1ad732f6fb55a55dec93524feca8bc Author: Jesper Juhl Date: Sat Jun 25 14:59:01 2005 -0700 [PATCH] cosmetic fixes for example programs in Documentation/cdrom/sbpcd This patch makes a few minor changes to the example programs in Documentation/cdrom/sbpcd to kill off some warnings and build failures. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c0e33c133021ee241e9d51255b9fb18eb34ef0e Author: Nick Wilson Date: Sat Jun 25 14:59:00 2005 -0700 [PATCH] Use ALIGN to remove duplicate code This patch makes use of ALIGN() to remove duplicate round-up code. Signed-off-by: Nick Wilson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f45494480f31342125870c1a184999d7c5a59471 Author: Domen Puncer Date: Sat Jun 25 14:58:59 2005 -0700 [PATCH] x86_64: coding style and whitespace fixups Remove some of the unnecessary differences between arch/i386 and arch/x86_64. This patch fixes more whitespace issues, some miscellaneous typos, a wrong URL and a factually incorrect statement about the current boot sector code. Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23712b2fbf6b845289c1d41d929be0931fab2759 Author: Domen Puncer Date: Sat Jun 25 14:58:58 2005 -0700 [PATCH] lib/sha1.c: fix sparse warning lib/sha1.c:44:10: warning: cast to restricted type Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae49fe8655010616fa422273b34a1bfeaee57c1c Author: Domen Puncer Date: Sat Jun 25 14:58:57 2005 -0700 [PATCH] printk: drivers/char/ftape/compressor/zftape-compress.c printk() calls should include appropriate KERN_* constant. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56003191c466b8ef4b174da60f25ae58e92493f8 Author: Domen Puncer Date: Sat Jun 25 14:58:56 2005 -0700 [PATCH] printk: drivers/char/applicom.c printk() calls should include appropriate KERN_* constant. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4bfde5abd4a0f5498a268dba17ffc91d91964d6 Author: Domen Puncer Date: Sat Jun 25 14:58:55 2005 -0700 [PATCH] serial/icom: Remove custom msescs_to_jiffies() macro Remove the MSECS_TO_JIFFIES() macro because msescs_to_jiffies() from jiffies.h should be used. The macro isn't referenced anywhere anyway. Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c97f97b374fe07bc300dea629cba14612442c26d Author: Adrian Bunk Date: Sat Jun 25 14:58:55 2005 -0700 [PATCH] drivers/char/mwave/tp3780i.c: remove kernel 2.2 #if's This patch removes #if's for kernel 2.2 . Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f040ffab7488c02c0806ec8808fa619d463560f9 Author: Adrian Bunk Date: Sat Jun 25 14:58:54 2005 -0700 [PATCH] sound/oss/rme96xx.c: remove kernel 2.2 #if's This patch removes #if's for kernel 2.2 . Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f00945a8e35e46b98f3ec4adae747397393e3ee Author: Dave Jones Date: Sat Jun 25 14:58:53 2005 -0700 [PATCH] nm256 oss build failure static declaration follows non static Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 155542c271ba76fec37146b26aea1001019eb60d Author: Adrian Bunk Date: Sat Jun 25 14:58:53 2005 -0700 [PATCH] sound/oss/: cleanups This patch contains cleanups including the following: - make needlessly global code static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b8497276a96928bcb5947cc44e61f8b69fe66ac Author: Adrian Bunk Date: Sat Jun 25 14:58:52 2005 -0700 [PATCH] drivers/char/isicom.c: section fixes This patch fixes the following bugs: - __exit unregister_ioregion and unregister_drivers were called by __init isicom_init - __init isicom_init was called by __devinit isicom_setup Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a5f04bf798254390f89445ecf0b6f4c70ddc1f8 Author: Jesper Juhl Date: Sat Jun 25 14:58:51 2005 -0700 [PATCH] selinux: kfree cleanup kfree(NULL) is legal. Signed-off-by: Jesper Juhl Acked-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2ba192c96d12447472e105890a9cd1b97952747 Author: Adrian Bunk Date: Sat Jun 25 14:58:50 2005 -0700 [PATCH] drivers/scsi/initio.c: cleanups This patch contains the following cleanups: - make needlessly global code static - remove or #if 0 the following unused functions: - tul_pop_pend_scb - tul_device_reset - tul_reset_scsi_bus Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09417379be9b126e10ae7dcd7afc20b666146266 Author: Jesper Juhl Date: Sat Jun 25 14:58:49 2005 -0700 [PATCH] remove redundant NULL checks before kfree() in sound/ and avoid casting pointers about to be kfree()'ed Checking a pointer for NULL before calling kfree() on it is redundant, kfree() deals with NULL pointers just fine. This patch removes such checks from sound/ This patch also makes another, but closely related, change. It avoids casting pointers about to be kfree()'ed. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ae6673e029d609da7ef4311440d6de501d6967a Author: Jesper Juhl Date: Sat Jun 25 14:58:48 2005 -0700 [PATCH] get rid of redundant NULL checks before kfree() in arch/i386/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a6b454f8024bac68495b6cd51615feb0b54baa9 Author: Jesper Juhl Date: Sat Jun 25 14:58:48 2005 -0700 [PATCH] remove redundant NULL check before before kfree() in kernel/sysctl.c Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 486fd404fbc840e28a959d2f2842b6c46ed6b250 Author: Adrian Bunk Date: Sat Jun 25 14:58:47 2005 -0700 [PATCH] small partitions/msdos cleanups This patch makes the following changes to the msdos partition code: - remove CONFIG_NEC98_PARTITION leftovers - make parse_bsd static This patch was already ACK'ed by Andries Brouwer. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40086ea17e8cf12112438b3a855f44b26f7cb385 Author: Domen Puncer Date: Sat Jun 25 14:58:46 2005 -0700 [PATCH] arch/i386/crypto/aes.c: fix sparse warnings Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7c5844526f55b93fc9a44170cb7568c9bc95c4a Author: Domen Puncer Date: Sat Jun 25 14:58:46 2005 -0700 [PATCH] arch/i386/mm/fault.c: fix sparse warnings Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77617bd8068470556049ebcdd0625acc7ab71a2b Author: Domen Puncer Date: Sat Jun 25 14:58:45 2005 -0700 [PATCH] arch/i386/kernel/apm.c: fix sparse warnings Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f3ae3471f4c5921274c3869eef21b5611e85b50 Author: Domen Puncer Date: Sat Jun 25 14:58:44 2005 -0700 [PATCH] arch/i386/kernel/traps.c: fix sparse warnings Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29a1d2d1bc5a473eb88489251033b3c5651d2011 Author: Domen Puncer Date: Sat Jun 25 14:58:43 2005 -0700 [PATCH] init/do_mounts_initrd.c: fix sparse warning Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96ec3efdcbaea4f403f2a5f1204edbf903a01961 Author: Domen Puncer Date: Sat Jun 25 14:58:43 2005 -0700 [PATCH] kernel/timer: fix msleep_interruptible() comment The comment for msleep_interruptible() is wrong, as it will ignore wait-queue events, but will wake up early for signals. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b20f3ae5f0efe1812d2a1278e2127a335884d445 Author: Domen Puncer Date: Sat Jun 25 14:58:42 2005 -0700 [PATCH] char/tty_io: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() in send_break() to guarantee the task delays as expected. Change @duration's units to milliseconds, and modify arguments in callers appropriately. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8eddb620499dc638aeb4d5d3751974ca697ab39 Author: Domen Puncer Date: Sat Jun 25 14:58:41 2005 -0700 [PATCH] char/ds1620: use msleep() instead of schedule_timeout() Not sure why any driver needs to sleep for *two* ticks, so let's fix it. Use msleep() instead of schedule_timeout() to guarantee the task delays as expected. Signals are never checked for by the callers or in the function itself, so use TASK_UNINTERRUPTIBLE instead of TASK_INTERRUPTIBLE. The delay is presumed to have been written when HZ==100, and thus has been multiplied by 10 to pass to msleep(). Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Acked-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2a457cf26020fb7aa992915388001eb983d0aa8 Author: M.Baris Demiray Date: Sat Jun 25 14:58:40 2005 -0700 [PATCH] riotty.c cleanups and warning fix Fix a bunch of whitespace oddities and use `unsigned long' for a jiffies-holding variable. Signed-off-by: M.Baris Demiray Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b1ee233f52c247d3a074ce660ece08bf097a47b Author: randy_dunlap Date: Sat Jun 25 14:58:39 2005 -0700 [PATCH] au1100fb: convert to C99 inits. au1100: use C99 struct init. Signed-off-by: randy_dunlap Acked-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09dbb4768c962ac00f9ff416328a7e6bfbd92b21 Author: randy_dunlap Date: Sat Jun 25 14:58:39 2005 -0700 [PATCH] x86-64: add memcpy/memset prototypes Put function prototypes for memset() and memcpy() ahead of where there are used, to kill sparse warnings: arch/x86_64/boot/compressed/../../../../lib/inflate.c:317:3: warning: undefined identifier 'memset' arch/x86_64/boot/compressed/../../../../lib/inflate.c:601:11: warning: undefined identifier 'memcpy' arch/x86_64/boot/compressed/misc.c:151:2: warning: undefined identifier 'memcpy' arch/x86_64/boot/compressed/../../../../lib/inflate.c:317:3: warning: call with no type! arch/x86_64/boot/compressed/../../../../lib/inflate.c:601:17: warning: call with no type! arch/x86_64/boot/compressed/misc.c:151:9: warning: call with no type! Signed-off-by: randy_dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23b34f46fb762796e5c9c37e50d5a6cb56fd71fe Author: Adrian Bunk Date: Sat Jun 25 14:58:38 2005 -0700 [PATCH] drivers/isdn/act2000/capi.c: #if 0 an unused function This patch #if 0's an unused function. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08e51533a0a26c236879ad33b2798c16328051d9 Author: Adrian Bunk Date: Sat Jun 25 14:58:37 2005 -0700 [PATCH] drivers/isdn/hardware/avm/: misc cleanups This patch contains the following cleanups: - make some needlessly global functions static - b1dma.c __init/__exit the functions b1dma_{init,exit} Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35a26f150927300042e2d71aa80375b6c5295fbd Author: Adrian Bunk Date: Sat Jun 25 14:58:36 2005 -0700 [PATCH] unexport mca_find_device_by_slot I didn't find any possible modular usage of mca_find_device_by_slot in the kernel, and this patch therefore removes the EXPORT_SYMBOL. This patch should be safe since mca-legacy is nothing drivers should move to. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e206b0a66fcaf39dbef92640ce6a63d51fc5c53 Author: Adrian Bunk Date: Sat Jun 25 14:58:35 2005 -0700 [PATCH] drivers/isdn/i4l/: possible cleanups This patch contains the following possible cleanups: - make needlessly global code static - remove the following unused global function: - isdn_audio.c: isdn_audio_2adpcm_flush - remove the following unused struct: - isdn_net.c: isdn_concap_demand_dial_dops Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 886cca3a0fda659e17c730c20929134014ebe1f2 Author: Adrian Bunk Date: Sat Jun 25 14:58:35 2005 -0700 [PATCH] drivers/isdn/pcbit/: possible cleanups This patch contains the following possible cleanups: - make some needlessly global functions static - remove the following unused global functions: - callbacks.c: cb_out_3 - capi.c: capi_decode_disc_conf Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3ca5e762c2aca373f1762cbc622ebe20fd20869 Author: Adrian Bunk Date: Sat Jun 25 14:58:34 2005 -0700 [PATCH] drivers/isdn/sc/: possible cleanups This patch contains the following possible cleanips: - make some needlessly global code static - remove the compiled but completely unused debug.c - remove or #if 0 the following unused global functions: - command.c: loopback - command.c: loadproc - init.c: irq_supported - packet.c: print_skb - shmem.c: memset_shmem - timer.c: trace_timer Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 594dd2c98101a5dc279153ec806d554e6b8a1e35 Author: Nico Golde Date: Sat Jun 25 14:58:33 2005 -0700 [PATCH] cpufreq: governors documentation fixes I corrected a small error and enhanced the govenor.txt file with the ondemand daemon because the kernel configs link to the documentation but ondemand wasn't documentated. Feel free to include the patch in the attachment. Cc: Dominik Brodowski Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70c1a0a49b75854fbc78713bf753b5b4c6f0a421 Author: Jon Smirl Date: Sat Jun 25 14:58:32 2005 -0700 [PATCH] fbdev: remove unneeded fbsysfs printk Remove unneeded fbsysfs printk. Signed-off-by: Jon Smirl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ed5dc6cb40b163aa19e14eda0957dcc09167b80 Author: Jurriaan on adsl-gate Date: Sat Jun 25 14:58:31 2005 -0700 [PATCH] font selection Kconfig fixes We're accidentally selecting the new fonts by default. Don't. Signed-off-by: Jurriaan Kalkman Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7496cb75ec75b1e74283a481fb02f5d7ce7bdeb Author: Dave Jones Date: Sat Jun 25 14:58:30 2005 -0700 [PATCH] Fix vesafb/mtrr scaling problem. vesafb will do really silly things like.. mtrr: type mismatch for e0000000,8000000 old: write-back new: write-combining mtrr: type mismatch for e0000000,4000000 old: write-back new: write-combining mtrr: type mismatch for e0000000,2000000 old: write-back new: write-combining mtrr: type mismatch for e0000000,1000000 old: write-back new: write-combining mtrr: type mismatch for e0000000,800000 old: write-back new: write-combining mtrr: type mismatch for e0000000,400000 old: write-back new: write-combining mtrr: type mismatch for e0000000,200000 old: write-back new: write-combining mtrr: type mismatch for e0000000,100000 old: write-back new: write-combining mtrr: type mismatch for e0000000,80000 old: write-back new: write-combining mtrr: type mismatch for e0000000,40000 old: write-back new: write-combining mtrr: type mismatch for e0000000,20000 old: write-back new: write-combining mtrr: type mismatch for e0000000,10000 old: write-back new: write-combining mtrr: type mismatch for e0000000,8000 old: write-back new: write-combining mtrr: type mismatch for e0000000,4000 old: write-back new: write-combining mtrr: type mismatch for e0000000,2000 old: write-back new: write-combining mtrr: type mismatch for e0000000,1000 old: write-back new: write-combining mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x800 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x400 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x200 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x100 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x80 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x40 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x20 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x10 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x8 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x4 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x2 base: 0xe0000000 mtrr: size and base must be multiples of 4 kiB mtrr: size: 0x1 base: 0xe0000000 Stop scaling down at PAGE_SIZE. Also fix up some broken indentation. Signed-off-by: Dave Jones Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72414d3f1d22fc3e311b162fca95c430048d38ce Author: Maneesh Soni Date: Sat Jun 25 14:58:28 2005 -0700 [PATCH] kexec code cleanup o Following patch provides purely cosmetic changes and corrects CodingStyle guide lines related certain issues like below in kexec related files o braces for one line "if" statements, "for" loops, o more than 80 column wide lines, o No space after "while", "for" and "switch" key words o Changes: o take-2: Removed the extra tab before "case" key words. o take-3: Put operator at the end of line and space before "*/" Signed-off-by: Maneesh Soni Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f339ecb30c759f94a29992d4635d9194132b6cf Author: Alexander Nyberg Date: Sat Jun 25 14:58:27 2005 -0700 [PATCH] kdump: Save trap information for later analysis If we are faulting in kernel it is quite possible this will lead to a panic. Save trap number, cr2 (in case of page fault) and error_code in the current thread (these fields already exist for signal delivery but are not used here). This helps later kdump crash analyzing from user-space (a script has been submitted to dig this info out in gdb). Signed-off-by: Alexander Nyberg Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e274d144302068a00794ec22e73520c0615cb6f Author: Alexander Nyberg Date: Sat Jun 25 14:58:26 2005 -0700 [PATCH] kdump: Use real pt_regs from exception Makes kexec_crashdump() take a pt_regs * as an argument. This allows to get exact register state at the point of the crash. If we come from direct panic assertion NULL will be passed and the current registers saved before crashdump. This hooks into two places: die(): check the conditions under which we will panic when calling do_exit and go there directly with the pt_regs that caused the fatal fault. die_nmi(): If we receive an NMI lockup while in the kernel use the pt_regs and go directly to crash_kexec(). We're probably nested up badly at this point so this might be the only chance to escape with proper information. Signed-off-by: Alexander Nyberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86b1ae38c0a62409dc862a28e3f08920f55f944b Author: Hariprasad Nellitheertha Date: Sat Jun 25 14:58:25 2005 -0700 [PATCH] kdump: sysrq trigger mechanism for kexec based crashdumps Add a sysrq-trigger mechanism for kexec based crashdumps. Alt-Sysrq-c triggers a kexec based crashdump. Signed-off-by: Hariprasad Nellitheertha Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 315c215c0a7324894541d43b0e720f20cafca92e Author: Vivek Goyal Date: Sat Jun 25 14:58:24 2005 -0700 [PATCH] kdump: cleanups for dump file access in linear raw format Removed the dependency on backup region. Now all the information is encoded in ELF format. /dev/oldmem is a dummy interface. User space tool need to be intelligent enough to parse the elf headers and read the relevant memory areas with the help of /dev/oldmem. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50b1fdbd81edcc8bd343ca44aca2b87a29e2f15c Author: Vivek Goyal Date: Sat Jun 25 14:58:23 2005 -0700 [PATCH] kdump: Accessing dump file in linear raw format (/dev/oldmem) Hariprasad Nellitheertha This patch contains the code that enables us to access the previous kernel's memory as /dev/oldmem. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72658e9d5004fc0dd807bea9eda49e6a52e40103 Author: Vivek Goyal Date: Sat Jun 25 14:58:22 2005 -0700 [PATCH] kdump: Parse elf32 headers and export through /proc/vmcore o Adds support for parsing core ELF32 headers. o I am expecting ELF32 support to go away down the line. This patch has been introduced for testing purposes as gdb can not parse ELF64 headers for i386. When a decent user space solution is available, ELF32 support can go away. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 666bfddbe8b8fd4fd44617d6c55193d5ac7edb29 Author: Vivek Goyal Date: Sat Jun 25 14:58:21 2005 -0700 [PATCH] kdump: Access dump file in elf format (/proc/vmcore) From: "Vivek Goyal" o Support for /proc/vmcore interface. This interface exports elf core image either in ELF32 or ELF64 format, depending on the format in which elf headers have been stored by crashed kernel. o Added support for CONFIG_VMCORE config option. o Removed the dependency on /proc/kcore. From: "Eric W. Biederman" This patch has been refactored to more closely match the prevailing style in the affected files. And to clearly indicate the dependency between /proc/kcore and proc/vmcore.c From: Hariprasad Nellitheertha This patch contains the code that provides an ELF format interface to the previous kernel's memory post kexec reboot. Signed off by Hariprasad Nellitheertha Signed-off-by: Eric Biederman Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2030eae52b416a9a9f0ffda74c982b7f1e19496d Author: Vivek Goyal Date: Sat Jun 25 14:58:20 2005 -0700 [PATCH] Retrieve elfcorehdr address from command line This patch adds support for retrieving the address of elf core header if one is passed in command line. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60e64d46a58236e3c718074372cab6a5b56a3b15 Author: Vivek Goyal Date: Sat Jun 25 14:58:19 2005 -0700 [PATCH] kdump: Routines for copying dump pages This patch provides the interfaces necessary to read the dump contents, treating it as a high memory device. Signed off by Hariprasad Nellitheertha Signed-off-by: Eric Biederman Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f016456c96868c27df248a54d1cc919e7b70a23 Author: Vivek Goyal Date: Sat Jun 25 14:58:19 2005 -0700 [PATCH] kdump: Kconfig - config option CONFIG_CRASH_DUMP - Made it dependent on HIGHMEM. This is required as capture kernel treats the previous kernel's memory as high memmory and stitches a PTE for accessing it. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92aa63a5a1bf2e7b0c79e6716d24b76dbbdcf951 Author: Vivek Goyal Date: Sat Jun 25 14:58:18 2005 -0700 [PATCH] kdump: Retrieve saved max pfn This patch retrieves the max_pfn being used by previous kernel and stores it in a safe location (saved_max_pfn) before it is overwritten due to user defined memory map. This pfn is used to make sure that user does not try to read the physical memory beyond saved_max_pfn. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d58831e4163699de204dea199be2e903bf5d6eff Author: Vivek Goyal Date: Sat Jun 25 14:58:17 2005 -0700 [PATCH] kdump documentation update to introduce use of irqpoll o Specify "irqpoll" command line option which loading second kernel. This helps in reducing driver initialization failures in second kernel due to shared interrupts. o Enabled LAPIC/IOAPIC support for UP kernels in second kernel. This reduces the chances of devices sharing the irq and hence reduces the chances of driver initialization failures in second kernel. o Build a UP capture kernel and disabled SMP support. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b089f4a68eccd9782c89262c0d7cae146d5a8a40 Author: Vivek Goyal Date: Sat Jun 25 14:58:15 2005 -0700 [PATCH] kdump: Documentation for Kdump This patch contains the documentation for the kexec based crash dump tool. Quick kdump-howto ================================================================ 1) Download and build kexec-tools. 2) Download and build the latest kexec/kdump (-mm) kernel patchset. Two kernels need to be built in order to get this feature working. A) First kernel: a) Enable "kexec system call" feature: CONFIG_KEXEC=y b) Physical load address (use default): CONFIG_PHYSICAL_START=0x100000 c) Enable "sysfs file system support": CONFIG_SYSFS=y d) Boot into first kernel with the command line parameter "crashkernel=Y@X": For example: "crashkernel=64M@16M". B) Second kernel: a) Enable "kernel crash dumps" feature: CONFIG_CRASH_DUMP=y b) Physical load addreess, use same load address as X in "crashkernel" kernel parameter in d) above, e.g., 16 MB or 0x1000000. CONFIG_PHYSICAL_START=0x1000000 c) Enable "/proc/vmcore support" (Optional, in Pseudo filesystems). CONFIG_PROC_VMCORE=y 3) Boot into the first kernel. 4) Load the second kernel to be booted using: kexec -p --crash-dump --args-linux --append="root= maxcpus=1 init 1" 5) System reboots into the second kernel when a panic occurs. A module can be written to force the panic, for testing purposes. 6) See Documentation/kdump.txt for how to read the first kernel's memory image and how to analyze it. Signed-off-by: Hariprasad Nellitheertha Signed-off-by: Eric Biederman Signed-off-by: Vivek Goyal Signed-off-by: randy_dunlap Signed-off-by: Maneesh Soni Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3ea8ac8468f5c7fc65684331dfba3260d5b2d93 Author: Vivek Goyal Date: Sat Jun 25 14:58:14 2005 -0700 [PATCH] Kexec: Kexec on panic fix with nmi watchdog enabled o Problem: Kexec on panic hangs if first kernel is booted with nmi_watchdog command line parameter. This problem occurs because kexec crash shutdown code replaces the NMI callback handler. This handler saves the cpu register states and halts the cpu. If system is booted with nmi_watchdog parameter, then crashing cpu also runs this nmi handler and halts itself. o This patch fixes the problem by keeping a track of crashing cpu and not executing the new nmi handler on crashing cpu. o There is a dependence on smp_processor_id() function which might return insane value for cpu, if cpu field of thread_info is corrupted. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d55476c3f889e0f30d88e22da4682b5f10394ff Author: Vivek Goyal Date: Sat Jun 25 14:58:13 2005 -0700 [PATCH] kdump: NMI handler segment selector, stack pointer fix CPU does not save ss and esp on stack if execution was already in kernel mode at the time of NMI occurrence. This leads to saving of erractic values for ss and esp. This patch fixes the issue. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 625f1c8219d95300ed32e4c67eb62a50ded095ba Author: Vivek Goyal Date: Sat Jun 25 14:58:12 2005 -0700 [PATCH] Kdump: Export crash notes section address through sysfs o Following patch exports kexec global variable "crash_notes" to user space through sysfs as kernel attribute in /sys/kernel. Signed-off-by: Maneesh Soni Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf13f0eaffa31bf6a145c53c589654b11c72ddc7 Author: Heiko Carstens Date: Sat Jun 25 14:58:11 2005 -0700 [PATCH] kexec: s390 support Add kexec support for s390 architecture. From: Milton Miller - Fix passing of first argument to relocate_kernel assembly. - Fix Kconfig description. - Remove wrong comment and comments that describe obvious things. - Allow only KEXEC_TYPE_DEFAULT as image type -> dump not supported. Acked-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fce0d5740322b98b863f9e609f5a9bd4c06703af Author: R Sharada Date: Sat Jun 25 14:58:10 2005 -0700 [PATCH] ppc64: kexec support for ppc64 This patch implements the kexec support for ppc64 platforms. A couple of notes: 1) We copy the pages in virtual mode, using the full base kernel and a statically allocated stack. At kexec_prepare time we scan the pages and if any overlap our (0, _end[]) range we return -ETXTBSY. On PowerPC 64 systems running in LPAR (logical partitioning) mode, only a small region of memory, referred to as the RMO, can be accessed in real mode. Since Linux runs with only one zone of memory in the memory allocator, and it can be orders of magnitude more memory than the RMO, looping until we allocate pages in the source region is not feasible. Copying in virtual means we don't have to write a hash table generation and call hypervisor to insert translations, instead we rely on the pinned kernel linear mapping. The kernel already has move to linked location built in, so there is no requirement to load it at 0. If we want to load something other than a kernel, then a stub can be written to copy a linear chunk in real mode. 2) The start entry point gets passed parameters from the kernel. Slaves are started at a fixed address after copying code from the entry point. All CPUs get passed their firmware assigned physical id in r3 (most calling conventions use this register for the first argument). This is used to distinguish each CPU from all other CPUs. Since firmware is not around, there is no other way to obtain this information other than to pass it somewhere. A single CPU, referred to here as the master and the one executing the kexec call, branches to start with the address of start in r4. While this can be calculated, we have to load it through a gpr to branch to this point so defining the register this is contained in is free. A stack of unspecified size is available at r1 (also common calling convention). All remaining running CPUs are sent to start at absolute address 0x60 after copying the first 0x100 bytes from start to address 0. This convention was chosen because it matches what the kernel has been doing itself. (only gpr3 is defined). Note: This is not quite the convention of the kexec bootblock v2 in the kernel. A stub has been written to convert between them, and we may adjust the kernel in the future to allow this directly without any stub. 3) Destination pages can be placed anywhere, even where they would not be accessible in real mode. This will allow us to place ram disks above the RMO if we choose. Signed-off-by: Milton Miller Signed-off-by: R Sharada Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4c82d5132b0592f5d6befc5b652cbd4b08f12ff Author: R Sharada Date: Sat Jun 25 14:58:08 2005 -0700 [PATCH] ppc64 kexec: native hash clear Add code to clear the hash table and invalidate the tlb for native (SMP, non-LPAR) mode. Supports 16M and 4k pages. Signed-off-by: Milton Miller Signed-off-by: R Sharada Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70765aa4bdb8862a49fcf5b28f3deaf561cf5ae7 Author: Eric W. Biederman Date: Sat Jun 25 14:58:07 2005 -0700 [PATCH] kexec: kexec ppc support I have tweaked this patch slightly to handle an empty list of pages to relocate passed to relocate_new_kernel. And I have added ppc_md.machine_crash_shutdown. To keep up with the changes in the generic kexec infrastructure. From: Albert Herranz The following patch adds support for kexec on the ppc32 platform. Non-OpenFirmware based platforms are likely to work directly without additional changes on the kernel side. The kexec-tools userland package may need to be slightly updated, though. For OpenFirmware based machines, additional work is still needed on the kernel side before kexec support is ready. Benjamin Herrenschmidt is kindly working on that part. In order for a ppc platform to use the kexec kernel services it must implement some ppc_md hooks. Otherwise, kexec will be explicitly disabled, as suggested by benh. There are 3+1 new ppc_md hooks that a platform supporting kexec may implement. Two of them are mandatory for kexec to work. See include/asm-ppc/machdep.h for details. - machine_kexec_prepare(image) This function is called to make any arrangements to the image before it is loaded. This hook _MUST_ be provided by a platform in order to activate kexec support for that platform. Otherwise, the platform is considered to not support kexec and the kexec_load system call will fail (that makes all existing platforms by default non-kexec'able). - machine_kexec_cleanup(image) This function is called to make any cleanups on image after the loaded image data it is freed. This hook is optional. A platform may or may not provide this hook. - machine_kexec(image) This function is called to perform the _actual_ kexec. This hook _MUST_ be provided by a platform in order to activate kexec support for that platform. If a platform provides machine_kexec_prepare but forgets to provide machine_kexec, a kexec will fall back to a reboot. A ready-to-use machine_kexec_simple() generic function is provided to, hopefully, simplify kexec adoption for embedded platforms. A platform may call this function from its specific machine_kexec hook, like this: void myplatform_kexec(struct kimage *image) { machine_kexec_simple(image); } - machine_shutdown() This function is called to perform any machine specific shutdowns, not already done by drivers. This hook is optional. A platform may or may not provide this hook. An example (trimmed) platform specific module for a platform supporting kexec through the existing machine_kexec_simple follows: /* ... */ #ifdef CONFIG_KEXEC int myplatform_kexec_prepare(struct kimage *image) { /* here, we can place additional preparations */ return 0; /* yes, we support kexec */ } void myplatform_kexec(struct kimage *image) { machine_kexec_simple(image); } #endif /* CONFIG_KEXEC */ /* ... */ void __init platform_init(unsigned long r3, unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7) { /* ... */ #ifdef CONFIG_KEXEC ppc_md.machine_kexec_prepare = myplatform_kexec_prepare; ppc_md.machine_kexec = myplatform_kexec; #endif /* CONFIG_KEXEC */ /* ... */ } The kexec ppc kernel support has been heavily tested on the GameCube Linux port, and, as reported in the fastboot mailing list, it has been tested too on a Moto 82xx ppc by Rick Richardson. Signed-off-by: Albert Herranz Signed-off-by: Eric Biederman Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f5609df0c943b005847d3b2765d6dd47b624011 Author: Eric W. Biederman Date: Sat Jun 25 14:58:04 2005 -0700 [PATCH] crashdump: x86_64: crashkernel option This is the x86_64 implementation of the crashkernel option. It reserves a window of memory very early in the bootup process, so we never use it for anything but the kernel to switch to when the running kernel panics. In addition to reserving this memory a resource structure is registered so looking at /proc/iomem it is clear what happened to that memory. ISSUES: Is it possible to implement this in a architecture generic way? What should be done with architectures that always use an iommu and thus don't report their RAM memory resources in /proc/iomem? Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5234f5eb04abbbfa306ccfbc2ccbb6e73f515b15 Author: Eric W. Biederman Date: Sat Jun 25 14:58:02 2005 -0700 [PATCH] kexec: x86_64 kexec implementation This is the x86_64 implementation of machine kexec. 32bit compatibility support has been implemented, and machine_kexec has been enhanced to not care about the changing internal kernel paget table structures. From: Alexander Nyberg build fix Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d89559589a588d1a654329d8cd9a3ad33aaad9be Author: Eric W. Biederman Date: Sat Jun 25 14:58:02 2005 -0700 [PATCH] kexec: x86_64: factor out apic shutdown code Factor out the apic and smp shutdown code from machine_restart so it can be called by in the kexec reboot path as well. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bc3b91aeed71a904e431d12ca90e9b6bcb42c91 Author: Eric W. Biederman Date: Sat Jun 25 14:58:01 2005 -0700 [PATCH] crashdump: x86 crashkernel option This is the x86 implementation of the crashkernel option. It reserves a window of memory very early in the bootup process, so we never use it for anything but the kernel to switch to when the running kernel panics. In addition to reserving this memory a resource structure is registered so looking at /proc/iomem it is clear what happened to that memory. ISSUES: Is it possible to implement this in a architecture generic way? What should be done with architectures that always use an iommu and thus don't report their RAM memory resources in /proc/iomem? Signed-off-by: Eric Biederman Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63d30298efc387c72557d11e2a7b467554c05a64 Author: Eric W. Biederman Date: Sat Jun 25 14:58:00 2005 -0700 [PATCH] kexec: x86 shutdown APICs during crash_shutdown In the case of a crash/panic an architecture specific function machine_crash_shutdown is called. This patch adds to the x86 machine_crash function the standard kernel code for shutting down apics. Every line of code added to that function increases the risk that we will call code after a kernel panic that is not safe. This patch should not make it to the stable kernel without a being reviewed a lot more. It is unclear how much a hardned kernel can take when it comes to misconfigured apics. So since a normal kernel has problems this patch does a clean shutdown. It is my expectation this patch will be dropped from future generations of the kexec work. But for the moment it is a crutch to keep from breaking everything. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c818b45a202b8f632b4031edcba8599efda42b7 Author: Eric W. Biederman Date: Sat Jun 25 14:57:59 2005 -0700 [PATCH] kexec: x86: snapshot registers during crash shutdown After the kernel panics if we wish to generate an entire machine core file it is very nice to know the register state at the time the machine crashed. After long discussion it was realized that if you are going to be saving the information anyway it is reasonable to store the information in a format that it will be used and recognized in so the register state is stored in the standard ELF note format. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4ac4263a019c791e906f284bb03891d3c25a845 Author: Eric W. Biederman Date: Sat Jun 25 14:57:58 2005 -0700 [PATCH] crashdump: x86: add NMI handler to capture other CPUs One of the dangers when switching from one kernel to another is what happens to all of the other cpus that were running in the crashed kernel. In an attempt to avoid that problem this patch adds a nmi handler and attempts to shoot down the other cpus by sending them non maskable interrupts. The code then waits for 1 second or until all known cpus have stopped running and then jumps from the running kernel that has crashed to the kernel in reserved memory. The kernel spin loop is used for the delay as that should behave continue to be safe even in after a crash. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5033cba087f6ac773002123aafbea1aad4267682 Author: Eric W. Biederman Date: Sat Jun 25 14:57:56 2005 -0700 [PATCH] kexec: x86 kexec core This is the i386 implementation of kexec. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd2a13054ffc25783a74afb5e4a0f2115e45f9cd Author: Eric W. Biederman Date: Sat Jun 25 14:57:55 2005 -0700 [PATCH] kexec: x86: factor out apic shutdown code Factor out the apic and smp shutdown code from machine_restart so it can be called by in the kexec reboot path as well. By switching to the bootstrap cpu by default on reboot I can delete/simplify some motherboard fixups well. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50cccc699ed849d31c9e3f7643db33edade20e4e Author: Vivek Goyal Date: Sat Jun 25 14:57:55 2005 -0700 [PATCH] Kexec on panic vmlinux initrd fix This is a minor bug fix in kexec to resolve the problem of loading panic kernel with initrd. o Problem: Loading a capture kenrel fails if initrd is also being loaded. This has been observed for vmlinux image for kexec on panic case. o This patch fixes the problem. In segment location and size verification logic, minor correction has been done. Segment memory end (mend) should be mstart + memsz - 1. This one byte offset was source of failure for initrd loading which was being loaded at hole boundary. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc009d92435f99498cbc579ce76bf28e837e2c14 Author: Eric W. Biederman Date: Sat Jun 25 14:57:52 2005 -0700 [PATCH] kexec: add kexec syscalls This patch introduces the architecture independent implementation the sys_kexec_load, the compat_sys_kexec_load system calls. Kexec on panic support has been integrated into the core patch and is relatively clean. In addition the hopefully architecture independent option crashkernel=size@location has been docuemented. It's purpose is to reserve space for the panic kernel to live, and where no DMA transfer will ever be setup to access. Signed-off-by: Eric Biederman Signed-off-by: Alexander Nyberg Signed-off-by: Adrian Bunk Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0537508a9921efced238b20967e50e519ac34af Author: Eric W. Biederman Date: Sat Jun 25 14:57:52 2005 -0700 [PATCH] kexec: x86_64: add CONFIG_PHYSICAL_START For one kernel to report a crash another kernel has created we need to have 2 kernels loaded simultaneously in memory. To accomplish this the two kernels need to built to run at different physical addresses. This patch adds the CONFIG_PHYSICAL_START option to the x86_64 kernel so we can do just that. You need to know what you are doing and the ramifications are before changing this value, and most users won't care so I have made it depend on CONFIG_EMBEDDED bzImage kernels will work and run at a different address when compiled with this option but they will still load at 1MB. If you need a kernel loaded at a different address as well you need to boot a vmlinux. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a9190853c34289d9181acd9c620c76143bf88ca Author: Vivek Goyal Date: Sat Jun 25 14:57:51 2005 -0700 [PATCH] kexec: reserve Bootmem fix for booting nondefault location kernel This patch fixes a problem with reserving memory during boot up of a kernel built for non-default location. Currently boot memory allocator reserves the memory required by kernel image, boot allocaotor bitmap etc. It assumes that kernel is loaded at 1MB (HIGH_MEMORY hard coded to 1024*1024). But kernel can be built for non-default locatoin, hence existing hardcoding will lead to reserving unnecessary memory. This patch fixes it. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d345e3fc9e9177deb7c82e5c79e32d77eb63cce Author: Eric W. Biederman Date: Sat Jun 25 14:57:49 2005 -0700 [PATCH] kexec: x86: add CONFIG_PYSICAL_START For one kernel to report a crash another kernel has created we need to have 2 kernels loaded simultaneously in memory. To accomplish this the two kernels need to built to run at different physical addresses. This patch adds the CONFIG_PHYSICAL_START option to the x86 kernel so we can do just that. You need to know what you are doing and the ramifications are before changing this value, and most users won't care so I have made it depend on CONFIG_EMBEDDED bzImage kernels will work and run at a different address when compiled with this option but they will still load at 1MB. If you need a kernel loaded at a different address as well you need to boot a vmlinux. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ded01e83ec3b60191b03b9f88f53acd4e6112f5 Author: Eric W. Biederman Date: Sat Jun 25 14:57:48 2005 -0700 [PATCH] kexec: x86_64: vmlinux: fix physical addresses The vmlinux on x86_64 does not report the correct physical address of the kernel. Instead in the physical address field it currently reports the virtual address of the kernel. This is patch is a bug fix that corrects vmlinux to report the proper physical addresses. This is potentially a help for crash dump analysis tools. This definitiely allows bootloaders that load vmlinux as a standard ELF executable. Bootloaders directly loading vmlinux become of practical importance when we consider the kexec on panic case. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad0d75ebacdbf1004d004803df0ba371c6bdbe2a Author: Eric W. Biederman Date: Sat Jun 25 14:57:47 2005 -0700 [PATCH] kexec: x86: vmlinux: fix physical addresses The vmlinux on i386 does not report the correct physical address of the kernel. Instead in the physical address field it currently reports the virtual address of the kernel. This is patch is a bug fix that corrects vmlinux to report the proper physical addresses. This is potentially a help for crash dump analysis tools. This definitiely allows bootloaders that load vmlinux as a standard ELF executable. Bootloaders directly loading vmlinux become of practical importance when we consider the kexec on panic case. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60bad7fadf59313a6359f8828bb0087884ad001a Author: Eric W. Biederman Date: Sat Jun 25 14:57:46 2005 -0700 [PATCH] kexec: vmlinux: fix physical addresses In vmlinux.lds.h the code is carefull to define every section so vmlinux properly reports the correct physical load address of code, as well as it's virtual address. The new SECURITY_INIT definition fails to follow that convention and and causes incorrect physical address to appear in the vmlinux if there are any security initcalls. This patch updates the SECURITY_INIT to follow the convention in the rest of the file. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 208fb93162d51faa69b9774fa7809858d84fd9dc Author: Eric W. Biederman Date: Sat Jun 25 14:57:45 2005 -0700 [PATCH] kexec: x86_64: restore apic virtual wire mode on shutdown When coming out of apic mode attempt to set the appropriate apic back into virtual wire mode. This improves on previous versions of this patch by by never setting bot the local apic and the ioapic into veritual wire mode. This code looks at data from the mptable to see if an ioapic has an ExtInt input to make this decision. A future improvement is to figure out which apic or ioapic was in virtual wire mode at boot time and to remember it. That is potentially a more accurate method, of selecting which apic to place in virutal wire mode. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 650927ef8ab1e9b05b77a3f32ca7adcedaae9306 Author: Eric W. Biederman Date: Sat Jun 25 14:57:44 2005 -0700 [PATCH] kexec: x86: resture apic virtual wire mode on shutdown When coming out of apic mode attempt to set the appropriate apic back into virtual wire mode. This improves on previous versions of this patch by by never setting bot the local apic and the ioapic into veritual wire mode. This code looks at data from the mptable to see if an ioapic has an ExtInt input to make this decision. A future improvement is to figure out which apic or ioapic was in virtual wire mode at boot time and to remember it. That is potentially a more accurate method, of selecting which apic to place in virutal wire mode. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 719e711050482be667dafd39ec787859d353931c Author: Eric W. Biederman Date: Sat Jun 25 14:57:43 2005 -0700 [PATCH] kexec: x86_64: add i8259 shutdown method From: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cee5dab4856f51c5cad3aecc630ad0a4d2217a85 Author: Eric W. Biederman Date: Sat Jun 25 14:57:43 2005 -0700 [PATCH] kexec: x86: i8259 shutdown: disable interrupts From: Eric W. Biederman This patch disables interrupt generation from the legacy pic on reboot. Now that there is a sys_device class it should not be called while drivers are still using interrupts. There is a report about this breaking ACPI power off on some systems. http://bugme.osdl.org/show_bug.cgi?id=4041 However the final comment seems to exonerate this code. So until I get more information I believe that was a false positive. Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70adada4282b52130ef31c7722d3fd8d94dacbc2 Author: Eric W. Biederman Date: Sat Jun 25 14:57:42 2005 -0700 [PATCH] kexec: x86_64: e820 64bit fix From: Eric W. Biederman It is ok to reserve resources > 4G on x86_64 struct resource is 64bit now :) Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9635b47d910223745258768418003580ef7dba17 Author: Eric W. Biederman Date: Sat Jun 25 14:57:41 2005 -0700 [PATCH] kexec: x86: local apic fix From: "Maciej W. Rozycki" Fix a kexec problem whcih causes local APIC detection failure. The problem is detect_init_APIC() is called early, before the command line have been processed. Therefore "lapic" (and "nolapic") have not been seen, yet. Signed-off-by: Maciej W. Rozycki Signed-off-by: Eric Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f43d03fe2c4962c11d8227ac9505e590bad758b Author: Eric W. Biederman Date: Sat Jun 25 14:57:40 2005 -0700 [PATCH] kexec: x86: rename APIC_MODE_EXINT From: "Maciej W. Rozycki" Rename APIC_MODE_EXINT to APIC_MODE_EXTINT - I think it should be named after what the mode is called in documentation. From: "Eric W. Biederman" I have reduced this patch to just the name change in the header. And integrated the changes into the patches that add those lines. Otherwise I ran into some ugly dependencies. Signed-off-by: Maciej W. Rozycki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8cbd99bd3a023db8d6356d19a5f6f539d367327 Author: Ingo Molnar Date: Sat Jun 25 14:57:39 2005 -0700 [PATCH] sched: voluntary kernel preemption This patch adds a new preemption model: 'Voluntary Kernel Preemption'. The 3 models can be selected from a new menu: (X) No Forced Preemption (Server) ( ) Voluntary Kernel Preemption (Desktop) ( ) Preemptible Kernel (Low-Latency Desktop) we still default to the stock (Server) preemption model. Voluntary preemption works by adding a cond_resched() (reschedule-if-needed) call to every might_sleep() check. It is lighter than CONFIG_PREEMPT - at the cost of not having as tight latencies. It represents a different latency/complexity/overhead tradeoff. It has no runtime impact at all if disabled. Here are size stats that show how the various preemption models impact the kernel's size: text data bss dec hex filename 3618774 547184 179896 4345854 424ffe vmlinux.stock 3626406 547184 179896 4353486 426dce vmlinux.voluntary +0.2% 3748414 548640 179896 4476950 445016 vmlinux.preempt +3.5% voluntary-preempt is +0.2% of .text, preempt is +3.5%. This feature has been tested for many months by lots of people (and it's also included in the RHEL4 distribution and earlier variants were in Fedora as well), and it's intended for users and distributions who dont want to use full-blown CONFIG_PREEMPT for one reason or another. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f704f56af95bec3c1ca719d64d0becef74d40899 Author: Ingo Molnar Date: Sat Jun 25 14:57:38 2005 -0700 [PATCH] enable PREEMPT_BKL on !PREEMPT+SMP too The only sane way to clean up the current 3 lock_kernel() variants seems to be to remove the spinlock-based BKL implementations altogether, and to keep the semaphore-based one only. If we dont want to do that for whatever reason then i'm afraid we have to live with the current complexity. (but i'm open for other cleanup suggestions as well.) To explore this possibility we'll (at a minimum) have to know whether the semaphore-based BKL works fine on plain SMP too. The patch below enables this. The patch may make sense in isolation as well, as it might bring performance benefits: code that would formerly spin on the BKL spinlock will now schedule away and give up the CPU. It might introduce performance regressions as well, if any performance-critical code uses the BKL heavily and gets overscheduled due to the semaphore. I very much hope there is no such performance-critical codepath left though. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc19ca86a023fcd552c78e77a7be6ce271f92a28 Author: Ingo Molnar Date: Sat Jun 25 14:57:36 2005 -0700 [PATCH] consolidate PREEMPT options into kernel/Kconfig.preempt This patch consolidates the CONFIG_PREEMPT and CONFIG_PREEMPT_BKL preemption options into kernel/Kconfig.preempt. This, besides reducing source-code, also enables more centralized tweaking of preemption related options. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f1867a5b3dc3034cbea403b229d65eed4a7f62e Author: Dinakar Guniguntala Date: Sat Jun 25 14:57:36 2005 -0700 [PATCH] Dynamic sched domains: ia64 changes ia64 changes similar to kernel/sched.c. Signed-off-by: Dinakar Guniguntala Acked-by: Paul Jackson Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85d7b94981e2e919697bc235aad7367b33c3864b Author: Dinakar Guniguntala Date: Sat Jun 25 14:57:34 2005 -0700 [PATCH] Dynamic sched domains: cpuset changes Adds the core update_cpu_domains code and updated cpusets documentation Signed-off-by: Dinakar Guniguntala Acked-by: Paul Jackson Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a20ff27ef75d866730ee796acd811a925af762f Author: Dinakar Guniguntala Date: Sat Jun 25 14:57:33 2005 -0700 [PATCH] Dynamic sched domains: sched changes The following patches add dynamic sched domains functionality that was extensively discussed on lkml and lse-tech. I would like to see this added to -mm o The main advantage with this feature is that it ensures that the scheduler load balacing code only balances against the cpus that are in the sched domain as defined by an exclusive cpuset and not all of the cpus in the system. This removes any overhead due to load balancing code trying to pull tasks outside of the cpu exclusive cpuset only to be prevented by the tasks' cpus_allowed mask. o cpu exclusive cpusets are useful for servers running orthogonal workloads such as RT applications requiring low latency and HPC applications that are throughput sensitive o It provides a new API partition_sched_domains in sched.c that makes dynamic sched domains possible. o cpu_exclusive cpusets sets are now associated with a sched domain. Which means that the users can dynamically modify the sched domains through the cpuset file system interface o ia64 sched domain code has been updated to support this feature as well o Currently, this does not support hotplug. (However some of my tests indicate hotplug+preempt is currently broken) o I have tested it extensively on x86. o This should have very minimal impact on performance as none of the fast paths are affected Signed-off-by: Dinakar Guniguntala Acked-by: Paul Jackson Acked-by: Nick Piggin Acked-by: Matthew Dobson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37e4ab3f0cba13adf3535d373fd98e5ee47b5410 Author: Olivier Croquette Date: Sat Jun 25 14:57:32 2005 -0700 [PATCH] Changing RT priority without CAP_SYS_NICE Presently, a process without the capability CAP_SYS_NICE can not change its own policy, which is OK. But it can also not decrease its RT priority (if scheduled with policy SCHED_RR or SCHED_FIFO), which is what this patch changes. The rationale is the same as for the nice value: a process should be able to require less priority for itself. Increasing the priority is still not allowed. This is for example useful if you give a multithreaded user process a RT priority, and the process would like to organize its internal threads using priorities also. Then you can give the process the highest priority needed N, and the process starts its threads with lower priorities: N-1, N-2... The POSIX norm says that the permissions are implementation specific, so I think we can do that. In a sense, it makes the permissions consistent whatever the policy is: with this patch, process scheduled by SCHED_FIFO, SCHED_RR and SCHED_OTHER can all decrease their priority. From: Ingo Molnar cleaned up and merged to -mm. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3464a102a69a4e00efb0a763e274ce290995b4b Author: Chen Shang Date: Sat Jun 25 14:57:31 2005 -0700 [PATCH] sched: micro-optimize task requeueing in schedule() micro-optimize task requeueing in schedule() & clean up recalc_task_prio(). Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77391d71681d05d2f4502f91ad62618522abf624 Author: Nick Piggin Date: Sat Jun 25 14:57:30 2005 -0700 [PATCH] sched: relax pinned balancing The maximum rebalance interval allowed by the multiprocessor balancing backoff is often not large enough to handle corner cases where there are lots of tasks pinned on a CPU. Suresh reported: I see system livelock's if for example I have 7000 processes pinned onto one cpu (this is on the fastest 8-way system I have access to). After this patch, the machine is reported to go well above this number. Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 476d139c218e44e045e4bc6d4cc02b010b343939 Author: Nick Piggin Date: Sat Jun 25 14:57:29 2005 -0700 [PATCH] sched: consolidate sbe sbf Consolidate balance-on-exec with balance-on-fork. This is made easy by the sched-domains RCU patches. As well as the general goodness of code reduction, this allows the runqueues to be unlocked during balance-on-fork. schedstats is a problem. Maybe just have balance-on-event instead of distinguishing fork and exec? Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 674311d5b411e9042df4fdf7aef0b3c8217b6240 Author: Nick Piggin Date: Sat Jun 25 14:57:27 2005 -0700 [PATCH] sched: RCU domains One of the problems with the multilevel balance-on-fork/exec is that it needs to jump through hoops to satisfy sched-domain's locking semantics (that is, you may traverse your own domain when not preemptable, and you may traverse others' domains when holding their runqueue lock). balance-on-exec had to potentially migrate between more than one CPU before finding a final CPU to migrate to, and balance-on-fork needed to potentially take multiple runqueue locks. So bite the bullet and make sched-domains go completely RCU. This actually simplifies the code quite a bit. From: Ingo Molnar schedstats RCU fix, and a nice comment on for_each_domain, from Ingo. Signed-off-by: Ingo Molnar Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dbd5342074a1e570ec84edf859deb9be588006d Author: Nick Piggin Date: Sat Jun 25 14:57:26 2005 -0700 [PATCH] sched: multilevel sbe sbf The fundamental problem that Suresh has with balance on exec and fork is that it only tries to balance the top level domain with the flag set. This was worked around by removing degenerate domains, but is still a problem if people want to start using more complex sched-domains, especially multilevel NUMA that ia64 is already using. This patch makes balance on fork and exec try balancing over not just the top most domain with the flag set, but all the way down the domain tree. Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 245af2c7870bd5940f7bfad19a0a03b32751fbc5 Author: Suresh Siddha Date: Sat Jun 25 14:57:25 2005 -0700 [PATCH] sched: remove degenerate domains Remove degenerate scheduler domains during the sched-domain init. For example on x86_64, we always have NUMA configured in. On Intel EM64T systems, top most sched domain will be of NUMA and with only one sched_group in it. With fork/exec balances(recent Nick's fixes in -mm tree), we always endup taking wrong decisions because of this topmost domain (as it contains only one group and find_idlest_group always returns NULL). We will endup loading HT package completely first, letting active load balance kickin and correct it. In general, this patch also makes sense with out recent Nick's fixes in -mm. From: Nick Piggin Modified to account for more than just sched_groups when scanning for degenerate domains by Nick Piggin. And allow a runqueue's sd to go NULL rather than keep a single degenerate domain around (this happens when you run with maxcpus=1). Signed-off-by: Suresh Siddha Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41c7ce9ad9a859871dffbe7dbc8b1f9571724e3c Author: Nick Piggin Date: Sat Jun 25 14:57:24 2005 -0700 [PATCH] sched: null domains Fix the last 2 places that directly access a runqueue's sched-domain and assume it cannot be NULL. That allows the use of NULL for domain, instead of a dummy domain, to signify no balancing is to happen. No functional changes. Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4866cde064afbb6c2a488c265e696879de616daa Author: Nick Piggin Date: Sat Jun 25 14:57:23 2005 -0700 [PATCH] sched: cleanup context switch locking Instead of requiring architecture code to interact with the scheduler's locking implementation, provide a couple of defines that can be used by the architecture to request runqueue unlocked context switches, and ask for interrupts to be enabled over the context switch. Also replaces the "switch_lock" used by these architectures with an oncpu flag (note, not a potentially slow bitflag). This eliminates one bus locked memory operation when context switching, and simplifies the task_running function. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48c08d3f8ff94fa118187e4d8d4a5707bb85e59d Author: Ingo Molnar Date: Sat Jun 25 14:57:22 2005 -0700 [PATCH] sched: uninline task_timeslice "Chen, Kenneth W" uninline task_timeslice() - reduces code footprint noticeably, and it's slowpath code. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 687f1661d302bc70ce906594a6d3f615ef075a50 Author: Nick Piggin Date: Sat Jun 25 14:57:21 2005 -0700 [PATCH] sched: sched tuning Do some basic initial tuning. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68767a0ae428801649d510d9a65bb71feed44dd1 Author: Nick Piggin Date: Sat Jun 25 14:57:20 2005 -0700 [PATCH] sched: schedstats update for balance on fork Add SCHEDSTAT statistics for sched-balance-fork. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 147cbb4bbe991452698f0772d8292f22825710ba Author: Nick Piggin Date: Sat Jun 25 14:57:19 2005 -0700 [PATCH] sched: balance on fork Reimplement the balance on exec balancing to be sched-domains aware. Use this to also do balance on fork balancing. Make x86_64 do balance on fork over the NUMA domain. The problem that the non sched domains aware blancing became apparent on dual core, multi socket opterons. What we want is for the new tasks to be sent to a different socket, but more often than not, we would first load up our sibling core, or fill two cores of a single remote socket before selecting a new one. This gives large improvements to STREAM on such systems. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cafb20c1f9976a70d633bb1e1c8c24eab00e4e80 Author: Nick Piggin Date: Sat Jun 25 14:57:17 2005 -0700 [PATCH] sched: no aggressive idle balancing Remove the very aggressive idle stuff that has recently gone into 2.6 - it is going against the direction we are trying to go. Hopefully we can regain performance through other methods. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3f21bce1fefdf92a4d1705e888d390b10f3ac6f Author: Nick Piggin Date: Sat Jun 25 14:57:15 2005 -0700 [PATCH] sched: tweak affine wakeups Do less affine wakeups. We're trying to reduce dbt2-pgsql idle time regressions here... make sure we don't don't move tasks the wrong way in an imbalance condition. Also, remove the cache coldness requirement from the calculation - this seems to induce sharp cutoff points where behaviour will suddenly change on some workloads if the load creeps slightly over or under some point. It is good for periodic balancing because in that case have otherwise have no other context to determine what task to move. But also make a minor tweak to "wake balancing" - the imbalance tolerance is now set at half the domain's imbalance, so we get the opportunity to do wake balancing before the more random periodic rebalancing gets preformed. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7897986bad8f6cd50d6149345aca7f6480f49464 Author: Nick Piggin Date: Sat Jun 25 14:57:13 2005 -0700 [PATCH] sched: balance timers Do CPU load averaging over a number of different intervals. Allow each interval to be chosen by sending a parameter to source_load and target_load. 0 is instantaneous, idx > 0 returns a decaying average with the most recent sample weighted at 2^(idx-1). To a maximum of 3 (could be easily increased). So generally a higher number will result in more conservative balancing. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99b61ccf0bf0e9a85823d39a5db6a1519caeb13d Author: Nick Piggin Date: Sat Jun 25 14:57:12 2005 -0700 [PATCH] sched: less aggressive idle balancing Remove the special casing for idle CPU balancing. Things like this are hurting for example on SMT, where are single sibling being idle doesn't really warrant a really aggressive pull over the NUMA domain, for example. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db935dbd43c4290d710304662cc908f733afea06 Author: Nick Piggin Date: Sat Jun 25 14:57:11 2005 -0700 [PATCH] sched: add debugging These conditions should now be impossible, and we need to fix them if they happen. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3950745131e23472fb5ace2ee4a2093e7590ec69 Author: Nick Piggin Date: Sat Jun 25 14:57:09 2005 -0700 [PATCH] sched: fix SMT scheduling problems SMT balancing has a couple of problems. Firstly, active_load_balance is too complex - basically it should be a dumb helper for when the periodic balancer has determined there is an imbalance, but gets stuck because the task is running. So rip out all its "smarts", and just make it move one task to the target CPU. Second, the busy CPU's sched-domain tree was being used for active balancing. This means that it may not see that nr_balance_failed has reached a critical level. So use the target CPU's sched-domain tree for this. We can do this because we hold its runqueue lock. Lastly, reset nr_balance_failed to a point where we allow cache hot migration. This will help ensure active load balancing is successful. Thanks to Suresh Siddha for pointing out these issues. Signed-off-by: Nick Piggin Signed-off-by: Suresh Siddha Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16cfb1c04c3cbe3759f339d3333e7e1e7d59712a Author: Nick Piggin Date: Sat Jun 25 14:57:08 2005 -0700 [PATCH] sched: reduce active load balancing Fix up active load balancing a bit so it doesn't get called when it shouldn't. Reset the nr_balance_failed counter at more points where we have found conditions to be balanced. This reduces too aggressive active balancing seen on some workloads. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8102679447da7fcbcb5226ee0207c3a034bc6d5f Author: Nick Piggin Date: Sat Jun 25 14:57:07 2005 -0700 [PATCH] sched: improve load balancing pinned tasks John Hawkes explained the problem best: A large number of processes that are pinned to a single CPU results in every other CPU's load_balance() seeing this overloaded CPU as "busiest", yet move_tasks() never finds a task to pull-migrate. This condition occurs during module unload, but can also occur as a denial-of-service using sys_sched_setaffinity(). Several hundred CPUs performing this fruitless load_balance() will livelock on the busiest CPU's runqueue lock. A smaller number of CPUs will livelock if the pinned task count gets high. Expanding slightly on John's patch, this one attempts to work out whether the balancing failure has been due to too many tasks pinned on the runqueue. This allows it to be basically invisible to the regular blancing paths (ie. when there are no pinned tasks). We can use this extra knowledge to shut down the balancing faster, and ensure the migration threads don't start running which is another problem observed in the wild. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0f364f4069f76a3613a797c388832822d179076 Author: Nick Piggin Date: Sat Jun 25 14:57:06 2005 -0700 [PATCH] sched: cleanup wake_idle New sched-domains code means we don't get spans with offline CPUs in them. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44f410a7ce593e7e75667b93494223998069f3f1 Author: Jon Smirl Date: Sat Jun 25 14:57:05 2005 -0700 [PATCH] hpet: do_div fix We don't need to use do_div() on a 32-bit quantity. Signed-off-by: Jon Smirl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6283d58e7464f82b1c1c33943f0bd51c1e83899a Author: Qu Fuping Date: Sat Jun 25 14:55:44 2005 -0700 [PATCH] reiserfs: do not ignore i/io error on readpage Reiserfs's readpage does not notice i/o errors. This patch makes reiserfs_readpage to return -EIO when i/o error appears. This patch makes reiserfs to not ignore I/O error on readpage. Signed-off-by: Qu Fuping Signed-off-by: Vladimir V. Saveliev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 442ff702233287df3f50ec3a7fd0a73d7367cf5a Author: Jean-Christophe Dubois Date: Sat Jun 25 14:55:43 2005 -0700 [PATCH] mconf.c needs locale.h This is failing on my cross-compilation environment (From a solaris system) using gcc-3.4.1 (as the compiler can't find a prototype for the setlocale() function). Signed-off-by: Jean-Christophe Dubois Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0cfbd995d091b10841eeb948976f5d1fbf13cdd Author: Badari Pulavarty Date: Sat Jun 25 14:55:42 2005 -0700 [PATCH] fix for generic_file_write iov problem Here is the fix for the problem described in http://bugzilla.kernel.org/show_bug.cgi?id=4721 Basically, problem is generic_file_buffered_write() is accessing beyond end of the iov[] vector after handling the last vector. If we happen to cross page boundary, we get a fault. I think this simple patch is good enough. If we really don't want to depend on the "count", then we need pass nr_segs to filemap_set_next_iovec() and decrement it and check it. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ae0b77811d97552b3b3c745e97de18849583bf7 Author: Hugh Dickins Date: Sat Jun 25 14:55:41 2005 -0700 [PATCH] fix fsync(dir) return value for ram-based filesystems Any filesystem which is using simple_dir_operations will retunr -EINVAL for fsync() on a directory. Make it return zero instead. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f9beccb95a47a15e446f64fbb7041dc6edce4d9 Author: Kylene Jo Hall Date: Sat Jun 25 14:55:41 2005 -0700 [PATCH] tpm: fix misc name memory problem I was using invalid memory for the miscdevice.name. This patch fixes the problem which was manifested by an ugly entry in /proc/misc. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1dda8abe6feb906306a627b170654ddd8addcdac Author: Kylene Jo Hall Date: Sat Jun 25 14:55:40 2005 -0700 [PATCH] tpm: Fix pubek parsing Fix parsing of the PUBEK for display which was leading to showing the wrong modulus length and modulus. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daacdfa6e7d6e57c5d1b8e72b1c863feb53d8a82 Author: Kylene Jo Hall Date: Sat Jun 25 14:55:39 2005 -0700 [PATCH] tpm: Support new National TPMs This patch is work to support new National TPMs that problems were reported with on Thinkpad T43 and Thinkcentre S51. Thanks to Jens and Gang for their debugging work on these issues. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2b18660066997420b716c1881a6be8b82700d97 Author: Paul E. McKenney Date: Sat Jun 25 14:55:38 2005 -0700 [PATCH] RCU: clean up a few remaining synchronize_kernel() calls 2.6.12-rc6-mm1 has a few remaining synchronize_kernel()s, some (but not all) in comments. This patch changes these synchronize_kernel() calls (and comments) to synchronize_rcu() or synchronize_sched() as follows: - arch/x86_64/kernel/mce.c mce_read(): change to synchronize_sched() to handle races with machine-check exceptions (synchronize_rcu() would not cut it given RCU implementations intended for hardcore realtime use. - drivers/input/serio/i8042.c i8042_stop(): change to synchronize_sched() to handle races with i8042_interrupt() interrupt handler. Again, synchronize_rcu() would not cut it given RCU implementations intended for hardcore realtime use. - include/*/kdebug.h comments: change to synchronize_sched() to handle races with NMIs. As before, synchronize_rcu() would not cut it... - include/linux/list.h comment: change to synchronize_rcu(), since this comment is for list_del_rcu(). - security/keys/key.c unregister_key_type(): change to synchronize_rcu(), since this is interacting with RCU read side. - security/keys/process_keys.c install_session_keyring(): change to synchronize_rcu(), since this is interacting with RCU read side. Signed-off-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae67cd643e9e64217fd92457324625c67fec6e35 Author: Alexey Dobriyan Date: Sat Jun 25 14:55:36 2005 -0700 [PATCH] Makefile: s/gcc-option/cc-option/ Fixes http://bugme.osdl.org/show_bug.cgi?id=4726 Signed-off-by: Alexey Dobriyan Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d0145a7deab4027a0f0a7de74c2d103b8f029cf Author: Lee Nicks Date: Sat Jun 25 14:55:36 2005 -0700 [PATCH] compilation errors in drivers/serial/mpsc.c The following patch fix gcc 4 compilation errors in drivers/serial/mpsc.c Signed-off-by: Lee Nicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66a464dbc8e0345b6f972b92bf1118e043d7c987 Author: Michael Holzheu Date: Sat Jun 25 14:55:33 2005 -0700 [PATCH] s390: debug feature changes This patch changes the memory allocation method for the s390 debug feature. Trace buffers had been allocated using the get_free_pages() function before. Therefore it was not possible to get big memory areas in a running system due to memory fragmentation. Now the trace buffers are subdivided into several subbuffers with pagesize. Therefore it is now possible to allocate more memory for the trace buffers and more trace records can be written. In addition to that, dynamic specification of the size of the trace buffers is implemented. It is now possible to change the size of a trace buffer using a new debugfs file instance. When writing a number into this file, the trace buffer size is changed to 'number * pagesize'. In the past all the traces could be obtained from userspace by accessing files in the "proc" filesystem. Now with debugfs we have a new filesystem which should be used for debugging purposes. This patch moves the debug feature from procfs to debugfs. Since the interface of debug_register() changed, all device drivers, which use the debug feature had to be adjusted. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b979de395c7e1b7e59f74a870e1d1911853eccb Author: Christian Borntraeger Date: Sat Jun 25 14:55:32 2005 -0700 [PATCH] s390: add vmcp interface Add interface to issue VM control program commands. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77fa22450de00d535de2cc8be653983560828000 Author: Heiko Carstens Date: Sat Jun 25 14:55:30 2005 -0700 [PATCH] s390: improved machine check handling Improved machine check handling. Kernel is now able to receive machine checks while in kernel mode (system call, interrupt and program check handling). Also register validation is now performed. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f901e5d1e06b3326c100c5d0df43656311befb81 Author: Cornelia Huck Date: Sat Jun 25 14:55:29 2005 -0700 [PATCH] s/390: compile fix for dcssblk Fix compile breakage in the dcss block driver introduced by the attribute changes. Signed-off-by: Cornelia Huck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c551288e34cff0a78b3103ce2e12099dffa41071 Author: Cornelia Huck Date: Sat Jun 25 14:55:28 2005 -0700 [PATCH] s/390: use klist in dasd driver Convert the dasd driver to use the new klist interface. Signed-off-by: Cornelia Huck Cc: Greg KH Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0744bd2925a4a24865963322534107d2ad553f9 Author: Cornelia Huck Date: Sat Jun 25 14:55:27 2005 -0700 [PATCH] s/390: Use klist in cio Convert the common I/O layer to use the klist interfaces. This patch has been adapted from the previous version to the changed interface semantics. Also, gcc 4.0 compile warnings have been removed. Signed-off-by: Cornelia Huck Cc: Greg KH Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84dd8d7e9c080b4db66b00b8bc36ccf09a90f824 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat Jun 25 14:55:26 2005 -0700 [PATCH] uml: add profile_pc for i386 Cope with a conditional i386 definition, which is wrong for UML. Before we just used that one, but it wasn't defined for CONFIG_SMP, so in that case we got link errors. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29d56cfe3ca599ddc3ae9156e7e469c044d97b96 Author: Jeff Dike Date: Sat Jun 25 14:55:25 2005 -0700 [PATCH] uml: hot-unplug code cleanup Clean up the hot-unplugging code. There is now an id procedure which is called to figure out what device we're talking to. The error messages from that are now done from mconsole_remove instead of the driver. remove is now called with the device number, after it has been checked, so doesn't need to do sanity checking on it. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc47a0d18a1994b4a18d2235fcde1b75dfa72552 Author: Jeff Dike Date: Sat Jun 25 14:55:24 2005 -0700 [PATCH] uml: time initialization tidying user_time_init_skas and user_time_init_tt were essentially the same. So, this merges them, deleting the mode-specific functions and declarations. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 026549d28469f7d4ca7e5a4707f0d2dc4f2c164c Author: Jeff Dike Date: Sat Jun 25 14:55:23 2005 -0700 [PATCH] uml: always disable kmalloc during shutdown kmalloc wasn't being disabled during panic. This patch ensures that, no matter how UML is exiting, it is disabled. This matters because part of the cleanup is to remove the umid file, which involves readdir, which calls malloc. This must map to libc malloc, rather than kmalloc or vmalloc. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6f4e3cf75538a75ee4fab620e3c8466f2154458 Author: Jeff Dike Date: Sat Jun 25 14:55:22 2005 -0700 [PATCH] uml: fix timer initialization In skas mode, the call to uml_idle_timer permanently shut off the virtual timer, resulting in no timer ticks to anything but the idle thread. This is likely the cause of the soft lockups that are seen sporadically in recent UMLs. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0877f07e85a46e4fde32bd84f08551d360839fe Author: Jeff Dike Date: Sat Jun 25 14:55:21 2005 -0700 [PATCH] uml: fork cleanup Fix the do_fork calling convention: normal arch pass the regs and the new sp value to do_fork instead of NULL. Currently the arch-independent code ignores these values, while the UML code (actually it's copy_thread) gets the right values by itself. With this patch, things are fixed up. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41f2148a67f28803d64bf5ff538591af90a5ab57 Author: Jesper Juhl Date: Sat Jun 25 14:55:20 2005 -0700 [PATCH] uml: kfree cleanup Here's a small patch to remove a few unnessesary NULL pointer checks before kfree() in arch/um/drivers/daemon_user.c Signed-off-by: Jesper Juhl Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 350d5bd84ecda038bb482ab5f2596bdca68109d9 Author: Andrew Morton Date: Sat Jun 25 14:55:19 2005 -0700 [PATCH] uml: fix sizeof usage Size of pointer doesn't seem right, but maybe my solution isn't either (sig_size maybe?). Signed-off-by: Domen Puncer Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a96206559a8c3a18478a6288ac426d716bbd99c Author: Pavel Machek Date: Sat Jun 25 14:55:18 2005 -0700 [PATCH] Update video-after-suspend documentation Update video-after-suspend documentation; few more machines are added. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19c324397a55edf122822f829779b46b9cb385dd Author: Pavel Machek Date: Sat Jun 25 14:55:17 2005 -0700 [PATCH] swsusp: only allow it when it makes sense Show swsuspend only on .config where it can compile. I got this on PPC32 && SMP: kernel/power/smp.c:24: error: storage size of `ctxt' isn't known Also mark swsusp as no longer experimental. Signed-off-by: Olaf Hering Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21d6b7e18f70c847c867aafb3109405b48424388 Author: pavel@ucw.cz Date: Sat Jun 25 14:55:16 2005 -0700 [PATCH] suspend: PCI power managment reference implementation Added reference implementation of suspend and resume routines. From: Shaohua Li build fix Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac25575203c11145066ea5cb583354cb5f0a8ade Author: Shaohua Li Date: Sat Jun 25 14:55:15 2005 -0700 [PATCH] CPU hotplug printk fix In the cpu hotplug case, per-cpu data possibly isn't initialized even the system state is 'running'. As the comments say in the original code, some console drivers assume per-cpu resources have been allocated. radeon fb is one such driver, which uses kmalloc. After a CPU is down, the per-cpu data of slab is freed, so the system crashed when printing some info. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d783b3e02002bce8cf9d4e4a82922ee7e59b1e5 Author: Pavel Machek Date: Sat Jun 25 14:55:14 2005 -0700 [PATCH] swsusp: clean assembly parts This patch fixes register saving so that each register is only saved once, and adds missing saving of %cr8 on x86-64. Some reordering so that save/restore is more logical/safer (segment registers should be restored after gdt). Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c61978b30322c83a94d7e4857fa5b9996b7d7931 Author: Pavel Machek Date: Sat Jun 25 14:55:14 2005 -0700 [PATCH] swsusp: fix nr_copy_pages The following patch moves the recalculation of nr_copy_pages so that the right number is used in the calculation of the size of memory and swap needed. It prevents swsusp from attempting to suspend if there is not enough memory and/or swap (which is unlikely anyway). Signed-off-by: Rafael J. Wysocki Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e4d5822dc71f01bf515b8f6f4e41ae12ee785b8 Author: Pavel Machek Date: Sat Jun 25 14:55:12 2005 -0700 [PATCH] swsusp: cleanup whitespace The following patch cleans up whitespace in swsusp.c (a bit): - removes any trailing whitespace - adds spaces after if, for, for_each_pbe, for_each_zone etc., wherever necessary. Signed-off-by: Rafael J. Wysocki Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f9bdf15c059c5d84db9c395705bf79b30762420 Author: Pavel Machek Date: Sat Jun 25 14:55:12 2005 -0700 [PATCH] swsusp: kill unneccessary does_collide_order The following patch removes the unnecessary function does_collide_order(). This function is no longer necessary, as currently there are only 0-order allocations in swsusp, and the use of it is confusing. Signed-off-by: Rafael J. Wysocki Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 620b03276488c3cf103caf1e326bd21f00d3df84 Author: Pavel Machek Date: Sat Jun 25 14:55:11 2005 -0700 [PATCH] properly stop devices before poweroff Without this patch, Linux provokes emergency disk shutdowns and similar nastiness. It was in SuSE kernels for some time, IIRC. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ce47e59c9688d8480ae41100117d8188c191401 Author: Pavel Machek Date: Sat Jun 25 14:55:10 2005 -0700 [PATCH] acpi: fix video docs This fixes typos/formatting in video_extension.txt. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 343c3f642898cb2cb5c3e4f948e3e0a1bbc0351b Author: Pavel Machek Date: Sat Jun 25 14:55:09 2005 -0700 [PATCH] s-t-RAM: load gdt the right way Sleep code uses wrong version of lgdt, that does the wrong thing when gdt is beyond 16MB or so. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 648be3188135add682349e86d46d07cc11c8eb57 Author: Pavel Machek Date: Sat Jun 25 14:55:09 2005 -0700 [PATCH] swsusp: kill config_pm_disk CONFIG_PM_DISK is long gone, but it still managed to survived at few places. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc5fb2c609c6acef15a8b062063e9135fb08b4d2 Author: Pavel Machek Date: Sat Jun 25 14:55:07 2005 -0700 [PATCH] swsusp: documentation updates This updates documentation and fixes pointers in MAINTAINERS file. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a72e04df5470df0ec646029d31e5528167ab1a7 Author: Li Shaohua Date: Sat Jun 25 14:55:06 2005 -0700 [PATCH] suspend/resume SMP support Using CPU hotplug to support suspend/resume SMP. Both S3 and S4 use disable/enable_nonboot_cpus API. The S4 part is based on Pavel's original S4 SMP patch. Signed-off-by: Li Shaohua Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb69c3907ead36b9e9f41ea6f0d0e0ae10a38a47 Author: Nathan Lynch Date: Sat Jun 25 14:55:05 2005 -0700 [PATCH] generate hotplug events for cpu online We already do kobject_hotplug for cpu offline; this adds a kobject_hotplug call for the online case. This is being requested by developers of an application which wants to be notified about both kinds of events. Signed-off-by: Nathan Lynch Cc: Rusty Russell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9fa06c26f7b7914c8cdf4d309b74df3151cc227 Author: Shaohua Li Date: Sat Jun 25 14:55:05 2005 -0700 [PATCH] set cpu_state for CPU hotplug (ia64) Dead CPU notifies online CPU that it's dead using cpu_state variable. After switching to physical cpu hotplug, we forgot setting the variable. This patch fixes it. Currently only __cpu_die uses it. We changed other locations for consistency in case others use it. Signed-off-by: Shaohua Li Acked-by: Ashok Raj Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a02c4cb67e4ccd5ce7a13c7f04c2fedb06c35431 Author: Ashok Raj Date: Sat Jun 25 14:55:03 2005 -0700 [PATCH] x86_64: Provide ability to choose using shortcuts for IPI in flat mode. This patch provides an option to switch broadcast or use mask version for sending IPI's. If CONFIG_HOTPLUG_CPU is defined, we choose not to use broadcast shortcuts by default, otherwise we choose broadcast mode as default. both cases, one can change this via startup cmd line option, to choose no-broadcast mode. no_ipi_broadcast=1 This is provided on request from Andi Kleen, since he doesnt agree with replacing IPI shortcuts as a solution for CPU hotplug. Without removing broadcast IPI's, it would mean lots of new code for __cpu_up() path, which would acheive the same results. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Acked-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 884d9e40b4089014f40c49e86ac6505842db2b53 Author: Ashok Raj Date: Sat Jun 25 14:55:02 2005 -0700 [PATCH] x86_64: Dont use broadcast shortcut to make it cpu hotplug safe. Broadcast IPI's provide un-expected behaviour for cpu hotplug. CPU's in offline state also end up receiving the IPI. Once the cpus become online they receive these stale IPI's which are bad and introduce unexpected behaviour. This is easily avoided by not sending a broadcast and addressing just the CPU's in online map. Doing prelim cycle counts it appears there is no big overhead and numbers seem around 0x3000-0x3900 on an average on x86 and x86_64 systems with CPUS running 3G, both for broadcast and mask version of the API's. The shortcuts are useful only for flat mode (where the perf shows no degradation), and in cluster mode, its unicast anyway. Its simpler to just not use broadcast anymore. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Acked-by: Zwane Mwaikambo Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb0cd8d49a9b81aff7a02e2ed826b5cfdfe9a172 Author: Ashok Raj Date: Sat Jun 25 14:55:01 2005 -0700 [PATCH] x86_64: CPU hotplug sibling map cleanup This patch is a minor cleanup to the cpu sibling/core map. It is required that this setup happens on a per-cpu bringup time. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Acked-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76e4f660d9f4c6d1bb473f72be2988c35eaca948 Author: Ashok Raj Date: Sat Jun 25 14:55:00 2005 -0700 [PATCH] x86_64: CPU hotplug support Experimental CPU hotplug patch for x86_64 ----------------------------------------- This supports logical CPU online and offline. - Test with maxcpus=1, and then kick other cpu's off to test if init code is all cleaned up. CONFIG_SCHED_SMT works as well. - idle threads are forked on demand from keventd threads for clean startup TBD: 1. Not tested on a real NUMA machine (tested with numa=fake=2) 2. Handle ACPI pieces for physical hotplug support. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Acked-by: Zwane Mwaikambo Signed-off-by: Shaohua.li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6982c671c560da4a0bc5c908cbcbec12bd5991d Author: Ashok Raj Date: Sat Jun 25 14:54:58 2005 -0700 [PATCH] x86_64: Change init sections for CPU hotplug support This patch adds __cpuinit and __cpuinitdata sections that need to exist past boot to support cpu hotplug. Caveat: This is done *only* for EM64T CPU Hotplug support, on request from Andi Kleen. Much of the generic hotplug code in kernel, and none of the other archs that support CPU hotplug today, i386, ia64, ppc64, s390 and parisc dont mark sections with __cpuinit, but only mark them as __devinit, and __devinitdata. If someone is motivated to change generic code, we need to make sure all existing hotplug code does not break, on other arch's that dont use __cpuinit, and __cpudevinit. Signed-off-by: Ashok Raj Acked-by: Andi Kleen Acked-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52a119feaad92d44a0e97d01b22afbcbaf3fc079 Author: Ashok Raj Date: Sat Jun 25 14:54:57 2005 -0700 [PATCH] make smp_prepare_cpu to a weak function I really wish smp_prepare_cpu() would disappear eventually. In the interim this is ideally a weak function, so we dont end up changing several places to define this dummy in headers. Today since the dummy declaration is done only in drivers/base/cpu.c but the function is called in kernel/power/smp.c i get undefined reference in my cpu hotplug code for x86_64 under development. Signed-off-by: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1367daf3eed5cd619ee88c9907e1e6ddaa58406 Author: Li Shaohua Date: Sat Jun 25 14:54:56 2005 -0700 [PATCH] cpu state clean after hot remove Clean CPU states in order to reuse smp boot code for CPU hotplug. Signed-off-by: Li Shaohua Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bb3184df537002a742bafddf3f4fb482b7fe610 Author: Li Shaohua Date: Sat Jun 25 14:54:55 2005 -0700 [PATCH] init call cleanup Trival patch for CPU hotplug. In CPU identify part, only did cleaup for intel CPUs. Need do for other CPUs if they support S3 SMP. Signed-off-by: Li Shaohua Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d720803a9365d360b3e5ea02033f0c11b5b1226a Author: Li Shaohua Date: Sat Jun 25 14:54:54 2005 -0700 [PATCH] sibling map initializing rework Make sibling map init per-cpu. Hotplug CPU may change the map at runtime. Signed-off-by: Li Shaohua Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fe940d6c300886de4ff1454d8ffd363172af433 Author: Li Shaohua Date: Sat Jun 25 14:54:53 2005 -0700 [PATCH] sep initializing rework Make SEP init per-cpu, so it is hotplug safe. Signed-off-by: Li Shaohua Signed-off-by: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67664c8f7e74def5adf66298a1245d82af72db2c Author: Ashok Raj Date: Sat Jun 25 14:54:52 2005 -0700 [PATCH] i386: Dont use IPI broadcast when using cpu hotplug. This patch introduces a startup parameter no_broadcast. When we enable CONFIG_HOTPLUG_CPU, we dont want to use broadcast shortcut as it has ill effects on a offline cpu. If we issue broadcast, the IPI is also delivered to offline cpus, or partially up cpu causing stale IPI's to be handled, which is a problem and can cause undesirable effects. Introduces a new startup cmdline option no_ipi_broadcast, that can be switched at cmdline if necessary. Signed-off-by: Ashok Raj Acked-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f370513640492641b4046bfd9a6e4714f6ae530d Author: Zwane Mwaikambo Date: Sat Jun 25 14:54:50 2005 -0700 [PATCH] i386 CPU hotplug (The i386 CPU hotplug patch provides infrastructure for some work which Pavel is doing as well as for ACPI S3 (suspend-to-RAM) work which Li Shaohua is doing) The following provides i386 architecture support for safely unregistering and registering processors during runtime, updated for the current -mm tree. In order to avoid dumping cpu hotplug code into kernel/irq/* i dropped the cpu_online check in do_IRQ() by modifying fixup_irqs(). The difference being that on cpu offline, fixup_irqs() is called before we clear the cpu from cpu_online_map and a long delay in order to ensure that we never have any queued external interrupts on the APICs. There are additional changes to s390 and ppc64 to account for this change. 1) Add CONFIG_HOTPLUG_CPU 2) disable local APIC timer on dead cpus. 3) Disable preempt around irq balancing to prevent CPUs going down. 4) Print irq stats for all possible cpus. 5) Debugging check for interrupts on offline cpus. 6) Hacky fixup_irqs() to redirect irqs when cpus go off/online. 7) play_dead() for offline cpus to spin inside. 8) Handle offline cpus set in flush_tlb_others(). 9) Grab lock earlier in smp_call_function() to prevent CPUs going down. 10) Implement __cpu_disable() and __cpu_die(). 11) Enable local interrupts in cpu_enable() after fixup_irqs() 12) Don't fiddle with NMI on dead cpu, but leave intact on other cpus. 13) Program IRQ affinity whilst cpu is still in cpu_online_map on offline. Signed-off-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d92de65cab5980c16d4a1c326c1ef9a591892883 Author: Shaohua Li Date: Sat Jun 25 14:54:49 2005 -0700 [PATCH] variable overflow after hundreds round of hotplug CPU I'm doing the cpu hotplug stress test and found a variable ('ready') is overflow after several hundreds rounds of cpu hotplug. Here is a fix. Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a13db56624c2a9d6c0dae0a693b25b0e58de9ea3 Author: Shaohua Li Date: Sat Jun 25 14:54:48 2005 -0700 [PATCH] CPU hotplug: fix hpet sectioning With hpet enabled, cpu hotplug uses some routines marked with __init. Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1249c5138f573890eae0c01f13d627094edcd55c Author: Andrey Panin Date: Sat Jun 25 14:54:47 2005 -0700 [PATCH] dmi: spring cleanup Whitespace and CodingStyle cleanup. No functionality changes. Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b625883f24d018c989173aeb727f6de954fb154d Author: Andrey Panin Date: Sat Jun 25 14:54:46 2005 -0700 [PATCH] dmi: remove central blacklist Since last dmi quirk looks useless (it just prints 404 compliant url) we can finally remove central dmi blacklist. Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f8133a8db81ff824a4abbe5bb0f15bf034d31c3 Author: Andrey Panin Date: Sat Jun 25 14:54:45 2005 -0700 [PATCH] dmi: move ACPI sleep quirk This patch moves ACPI sleep quirk out of dmi_scan.c Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aea00143a8db8c0b31dca85bff3c325444d93f0f Author: Andrey Panin Date: Sat Jun 25 14:54:42 2005 -0700 [PATCH] dmi: move ACPI boot quirk This patch moves ACPI boot quirks out of dmi_scan.c Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 856509d5da74aefeabe92a8df039cc472f4f7c5f Author: Michael Ellerman Date: Sat Jun 25 14:54:42 2005 -0700 [PATCH] ppc64: Fix compile warnings in arch/ppc64/kernel/lparcfg.c Stephen's patch to remove LparData.h missed an include in lparcfg.c This fixes a few compile warnings. Signed-off-by: Michael Ellerman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ec19faf617e61d56fb8da78ccb3ef895c00fae7 Author: Kumar Gala Date: Sat Jun 25 14:54:41 2005 -0700 [PATCH] ppc32: remove some unnecessary includes of bootmem.h Continue the Good Fight: Limit bootmem.h include creep. Signed-off-by: Jon Loeliger Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 912eaa7198827df3cae7d0c9768fd08e84a09675 Author: Kumar Gala Date: Sat Jun 25 14:54:39 2005 -0700 [PATCH] I2C-MPC: Remove OCP device model support All consumers of the driver MPC10x, MPC52xx, MPC824x, MPC83xx, and MPC85xx are all using platform devices. We can get ride of the dead code to support using this driver with the old OCP based model Signed-off-by: Kumar Gala Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d9077afea4927e488282da7189de9159db20c17 Author: Kumar Gala Date: Sat Jun 25 14:54:39 2005 -0700 [PATCH] ppc32: Remove FSL OCP support Support for the OCP device model on Freescale (FSL) PPC's is no longer used. All FSL PPC's that were using OCP have be converted to using the platform device model. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33d9e9b56d5ccd7776fdfe3ecce4a2793dee6fd3 Author: Kumar Gala Date: Sat Jun 25 14:54:37 2005 -0700 [PATCH] ppc32: Add support for Freescale e200 (Book-E) core The e200 core is a Book-E core (similar to e500) that has a unified L1 cache and is not cache coherent on the bus. The e200 core also adds a separate exception level for debug exceptions. Part of this patch helps to cleanup a few cases that are true for all Freescale Book-E parts, not just e500. Signed-off-by: Kim Phillips Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62aa751d16399637325852bc0a1fcf13c2476dd7 Author: Kumar Gala Date: Sat Jun 25 14:54:36 2005 -0700 [PATCH] ppc32: Check return of ppc_sys_get_pdata before accessing pointer Ensure that the returned pointer from ppc_sys_get_pdata is not NULL before we start using it. This handles any cases where we have variants of processors on the same board with different functionality. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09ffd94fb15d85fbf9eebb8180f50264b264d6fe Author: Lorenzo Hernández García-Hierro Date: Sat Jun 25 14:54:35 2005 -0700 [PATCH] selinux: add executable heap check This patch,based on sample code by Roland McGrath, adds an execheap permission check that controls the ability to make the heap executable so that this can be prevented in almost all cases (the X server is presently an exception, but this will hopefully be resolved in the future) so that even programs with execmem permission will need to have the anonymous memory mapped in order to make it executable. The only reason that we use a permission check for such restriction (vs. making it unconditional) is that the X module loader presently needs it; it could possibly be made unconditional in the future when X is changed. The policy patch for the execheap permission is available at: http://pearls.tuxedo-es.org/patches/selinux/policy-execheap.patch Signed-off-by: Lorenzo Hernandez Garcia-Hierro Acked-by: James Morris Acked-by: Stephen Smalley Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b9921976f0861e04828b3aff66696c1f3fd900d Author: Lorenzo Hernandez García-Hierro Date: Sat Jun 25 14:54:34 2005 -0700 [PATCH] selinux: add executable stack check This patch adds an execstack permission check that controls the ability to make the main process stack executable so that attempts to make the stack executable can still be prevented even if the process is allowed the existing execmem permission in order to e.g. perform runtime code generation. Note that this does not yet address thread stacks. Note also that unlike the execmem check, the execstack check is only applied on mprotect calls, not mmap calls, as the current security_file_mmap hook is not passed the necessary information presently. The original author of the code that makes the distinction of the stack region, is Ingo Molnar, who wrote it within his patch for /proc//maps markers. (http://marc.theaimsgroup.com/?l=linux-kernel&m=110719881508591&w=2) The patches also can be found at: http://pearls.tuxedo-es.org/patches/selinux/policy-execstack.patch http://pearls.tuxedo-es.org/patches/selinux/kernel-execstack.patch policy-execstack.patch is the patch that needs to be applied to the policy in order to support the execstack permission and exclude it from general_domain_access within macros/core_macros.te. kernel-execstack.patch adds such permission to the SELinux code within the kernel and adds the proper permission check to the selinux_file_mprotect() hook. Signed-off-by: Lorenzo Hernandez Garcia-Hierro Acked-by: James Morris Acked-by: Stephen Smalley Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d15cab85b85a56cc886037cab43cc292923ff22 Author: Hugh Dickins Date: Sat Jun 25 14:54:33 2005 -0700 [PATCH] mm: fix remap_pte_range BUG Out-of-tree user of remap_pfn_range hit kernel BUG at mm/memory.c:1112! It passes an unrounded size to remap_pfn_range, which was okay before 2.6.12, but misses remap_pte_range's new end condition. An audit of all the other ptwalks confirms that this is the only one so exposed. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e8a81c5a37907bc082025d3468718116dca1eeb Author: Hifumi Hisashi Date: Sat Jun 25 14:54:32 2005 -0700 [PATCH] Fix the error handling in direct I/O Fix a bug on error handling in the direct I/O function. Currently, if a file is opened with the O_DIRECT|O_SYNC flag, the write() syscall cannot receive the EIO error after an I/O error (SCSI cable is disconnected etc.). Return values of other points that call generic_osync_inode() are treated appropriately. Signed-off-by: Hisashi Hifumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4819b593740a6d11db07b52e0fe35975b29a185 Author: Yoichi Yuasa Date: Sat Jun 25 14:54:31 2005 -0700 [PATCH] mips: add MIPS-specific support for flatmem/discontigmem 2.6.12-git6 doesn't boot on some MIPS machines. They need the support of flat memory and discontig memory. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7919a693bd735ed0aa93fc359ae09a588cfeb3bc Author: Russell King Date: Sat Jun 25 14:54:30 2005 -0700 [PATCH] Serial: remove unnecessary register_serial/unregister_serial A couple of drivers declare register_serial/unregister_serial prototypes but don't use them. FRV contains a commented out call to register_serial. Since these are deprecated, remove these unnecessary references. Signed-off-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 821fe94727e72d63e1abd1bc0b044c72dfad9fb6 Author: Dave Jones Date: Sat Jun 25 14:54:29 2005 -0700 [PATCH] gcc4 compile fix for recent ia64 xpc changes Gcc4 doesn't like volatile casts as lvalues. Make the structure members volatile instead. Signed-off-by: Dave Jones Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e0fa31dbf5968ce1e94f73c04a9402170432ecf Author: Dmitry Torokhov Date: Sat Jun 25 14:54:28 2005 -0700 [PATCH] I8K: add new BIOS signatures I8K: add BIOS signatures of a newer Dell laptops, also there can be more than one temperature sensor reported by BIOS. Lifted from driver 1.25 on Massimo Dal Zotto's site. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8378b92405dd606c6f3a0b1e303b67c8f8c9f743 Author: Dmitry Torokhov Date: Sat Jun 25 14:54:27 2005 -0700 [PATCH] I8K: initialization code cleanup; formatting I8K: use module_{init|exit} instead of old style #ifdef MODULE code, some formatting changes. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 352f8f8bfbfb401c8af4c685beaafeb95c27fdd1 Author: Dmitry Torokhov Date: Sat Jun 25 14:54:26 2005 -0700 [PATCH] I8K: convert to seqfile I8K: Change proc code to use seq_file. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e70c9d5e61c6cb2272c866fc1303e62975006752 Author: Dmitry Torokhov Date: Sat Jun 25 14:54:25 2005 -0700 [PATCH] I8K: use standard DMI interface I8K: Change to use stock dmi infrastructure instead of homegrown parsing code. The driver now requires box's DMI data to match list of supported models so driver can be safely compiled-in by default without fear of it poking into random SMM BIOS code. DMI checks can be ignored with i8k.ignore_dmi option. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dec63ec32ea486ab915138e8790084c22a3f7bf6 Author: Dmitry Torokhov Date: Sat Jun 25 14:54:23 2005 -0700 [PATCH] I8K: pass through lindent I8K: pass through Lindent to change 4 spaces identation to TABs Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f5f7e2eeb539da95157d7fa8c94fb2f3284b9cc Author: Dmitry Torokhov Date: Sat Jun 25 14:54:22 2005 -0700 [PATCH] Toshiba driver cleanup Toshiba legacy driver cleanup: - use module_init/module_exit for initialization instead of using #ifdef MODULE and calling tosh_init manually from drivers/char/misc.c - do not explicitly initialize static variables - some whitespace and formatting cleanups Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cdb7b48d0d5963e40bb6621bfa7b2d5fddc4562 Author: Mauro Carvalho Chehab Date: Sat Jun 25 14:54:22 2005 -0700 [PATCH] cx88 build fix static declaration of cx88_pci_irqs follows non-static. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b659980014a7f45bfd6a1da9039a0498a28b7a63 Author: Uwe Bugla Date: Sat Jun 25 14:54:21 2005 -0700 [PATCH] dvb-bt8xx.txt fixes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4208ff04a2dea2f55111a6cdc7e21f6ec3aef29f Merge: 43df5eac00734436e2bc5a5c11488b1a7accecc7 8749af68216e1ebf6460992fce548f400ecf63a4 Author: Linus Torvalds Date: Sat Jun 25 16:03:08 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 8749af68216e1ebf6460992fce548f400ecf63a4 Author: Russell King Date: Sat Jun 25 19:39:45 2005 +0100 [PATCH] ARM: Generic Dynamic Tick Timer support for ARM, take 4 This patch adds support for Dynamic Tick Timer for ARM. Dynamic Tick is also known as VST (Variable Scheduling Timeouts). Dynamic Tick has been in use in the OMAP tree since last October. The patch is not intrusive, and does not do anything unless CONFIG_NO_IDLE_HZ is defined. This patch has the following fixed based on comments from RMK: - Time is updated before calling interrupt handlers. - Added new interrupt flag SA_TIMER to avoid duplicate timer interrupts - Moved struct dyn_tick_timer to time.h until we at some point probably have an arch independent dyn-tick.h - Cleaned up testing for DYN_TICK_ENABLED in irq.c I've cleaned up this patch to fix some remaining issues: - Call the timer tick handler with irqs disabled, as it would be from a normal interrupt - if we have a dyn_tick, we better implement all methods. - generic timer_dyn_reprogram() call, to be called before sleeping - added command line option - "dyntick=" to allow boot-time control of this feature -- rmk Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 321ab6a5fab812658626aee6bce2617f8cfb3a55 Author: Lennert Buytenhek Date: Sat Jun 25 19:30:04 2005 +0100 [PATCH] ARM: 2752/1: disable ixp2000 PCI I/O software workaround on chips that don't need it Patch from Lennert Buytenhek The later ixp2000 models don't need the PCI I/O workaround that we currently perform. Add a config option to disable the workaround, and panic on boot if a kernel without the workaround is booted on a buggy chip. As only pre-production ixp2000s need the workaround, the default is for it not to be configured in. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 3cd9e19ebc91593c9f076410d6f979be188f01a0 Author: Russell King Date: Sat Jun 25 19:29:34 2005 +0100 [PATCH] ARM: Fix discontigmem The merge of sparsemem broke ARM discontigmem. Fix it. Signed-off-by: Russell King commit 43df5eac00734436e2bc5a5c11488b1a7accecc7 Merge: 7be426c6e3a8ad7dcc8791589cea8af7aaafdf6f e55c57e0b51c68d78845549505057169c6c3cba6 Author: Linus Torvalds Date: Sat Jun 25 10:25:13 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 7be426c6e3a8ad7dcc8791589cea8af7aaafdf6f Author: Linus Torvalds Date: Sat Jun 25 10:01:36 2005 -0700 ACPI: Make sure we call acpi_register_gsi() even for default PCI interrupt assignment That's the part that keeps track of the ELCR register, and we want to make sure that the PCI interrupts are properly marked level/low. commit 8144f56bd1e49015f94b8da99b24c4d04643b66d Author: Lennert Buytenhek Date: Sat Jun 25 16:58:22 2005 +0100 [PATCH] ARM: 2751/1: ixp2000 gpio cleanup broke ixdp2800 build Patch from Lennert Buytenhek The ixp2000 gpio cleanup broke the ixdp2800 build as it moved some gpio-related functions from arch/platform.h to arch/gpio.h and the ixdp2x00 support code used those functions but didn't include the latter header file. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit ea23d1ac7e380aefc00d691c7c9a3e747bc2531f Author: Lennert Buytenhek Date: Sat Jun 25 16:58:21 2005 +0100 [PATCH] ARM: 2750/1: add i2c platform device for enp2611 on-board i2c bus Patch from Lennert Buytenhek On the enp2611, GPIO 7 and 6 are connected to an on-board i2c bus that attaches to the SODIMM module slot (for SPD) and an LM84 temperature sensor. Add a platform device for this i2c bus. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 456b6b863a6a1a80e369e42568817747a427b072 Author: Lennert Buytenhek Date: Sat Jun 25 16:58:21 2005 +0100 [PATCH] ARM: 2749/1: update ixp2000 defconfigs to 2.6.12-git6 Patch from Lennert Buytenhek Update the defconfigs for the ixp2000 platforms to 2.6.12-git6. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 5f70eaa0d5768775a7492f3e3841fcca94bb0d13 Author: David S. Miller Date: Fri Jun 24 20:21:01 2005 -0700 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller commit bbe832c09233738c100145fd535b6b8fc97640f6 Author: Michael Chan Date: Fri Jun 24 20:20:04 2005 -0700 [TG3]: Refinements to new locking strategy. 1. Move tp->irq_sync = 0 to before the interrupt mailbox IO in tg3_enable_ints() so that the interrupt handler will always see irq_sync == 0 when interrupts are enabled. 2. Remove the tg3_enable_ints() call in tg3_reset_hw(). Interrupts are always enabled explicitly or through tg3_netif_start(). This is to prevent interrupts being enabled while poll is disabled. 3. Update trans_start with jiffies in tg3_netif_stop() to prevent false NETDEV WATCHDOG. 4. Pass in the proper irq_sync parameter to tg3_full_lock() depending on netif_running() in some of the ethtool set calls. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f47c11eeccc8820010992eb32dbe7370a08f8bd3 Author: David S. Miller Date: Fri Jun 24 20:18:35 2005 -0700 [TG3]: Eliminate all hw IRQ handler spinlocks. Move all driver spinlocks to be taken at sw IRQ context only. This fixes the skb_copy() we were doing with hw IRQs disabled (which is illegal and triggers a BUG() with HIGHMEM enabled). It also simplifies the locking all over the driver tremendously. We accomplish this feat by creating a special sequence to synchronize with the hw IRQ handler using a binary state and synchronize_irq(). This idea is from Herbert Xu. Thanks to Michael Chan for helping to track down all of the race conditions in initial versions of this code. Signed-off-by: David S. Miller commit cd024c8baf9756759c57f0a19be639da8d3d4f8c Author: David S. Miller Date: Fri Jun 24 20:17:10 2005 -0700 [TG3]: Fix missing memory barriers and SD_STATUS_UPDATED bit clearing. There must be a rmb() between reading the status block tag and calling tg3_has_work(). This was missing in tg3_mis() and tg3_interrupt_tagged(). tg3_poll() got it right. Also, SD_STATUS_UPDATED must be cleared in the status block right before we call tg3_has_work(). Only tg3_poll() got this wrong. Based upon patches and commentary from Grant Grundler and Michael Chan. Signed-off-by: David S. Miller commit e55c57e0b51c68d78845549505057169c6c3cba6 Author: David S. Miller Date: Fri Jun 24 20:11:03 2005 -0700 [SPARC64]: Report any user access faults in termios accessors. Signed-off-by: David S. Miller commit 37616578539a47d9ace5e907ae73ea93a8cde740 Author: William Lee Irwin III Date: Fri Jun 24 20:06:18 2005 -0700 [SPARC]: sunzilog warning fixes From: William Lee Irwin III This small patch silences some iomem-related warnings in sunzilog.c by declaring mapped_addr as void __iomem * and inserting a cast in one case. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c54d7e03c3a21b38c587f671704c5a12aa3987fc Author: David S. Miller Date: Fri Jun 24 19:57:07 2005 -0700 [SUNRPC]: Fix {s,}size_t printf format strings in xprt.c Signed-off-by: David S. Miller commit a6484045fdd4154f8c8ee8c1dda4e32854c047e0 Author: David S. Miller Date: Fri Jun 24 18:07:51 2005 -0700 [TCP]: Do not present confusing congestion control options by default. Create TCP_CONG_ADVANCED option, akin to IP_ADVANCED_ROUTER, which when disabled will bypass all of the congestion control Kconfig options and leave the user with a safe default. That safe default is currently BIC-TCP with new Reno as a fallback. Signed-off-by: David S. Miller commit bb298ca3ce92574d57c4e49b329421425ea7d279 Author: David S. Miller Date: Fri Jun 24 17:50:53 2005 -0700 [IPV4]: Move FIB lookup algorithm choice under IP_ADVANCED_ROUTING Most users need not be concerned with a complex choice of what FIB lookup algorithm to use. So give them the safe default of IP_FIB_HASH if IP_ADVANCED_ROUTING is disabled. Signed-off-by: David S. Miller commit f7704347a74fceaf79c89f8b8dbdd0111013e4d6 Author: David S. Miller Date: Fri Jun 24 17:39:03 2005 -0700 [PKT_SCHED]: Make TEXTSEARCH* options only selected. Do not present these confusing new options to the user unless he picked some facility that makes use of it, such as NET_EMATCH_TEXT. Signed-off-by: David S. Miller commit b3e112bcc19abd8e9657dca34a87316786e096f3 Merge: f647a27417d2adc43d8c96d3d6f837422fbc076e 0a8b80c52f44a6e84206618a8a450ba13a5809dc Author: Linus Torvalds Date: Fri Jun 24 15:33:30 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit f647a27417d2adc43d8c96d3d6f837422fbc076e Merge: 75043cb5b386e5a01fd03b88f647dd992de02f97 2966207c7e5945947c4db3a48aa4fa819807c5be Author: Linus Torvalds Date: Fri Jun 24 15:32:01 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 2966207c7e5945947c4db3a48aa4fa819807c5be Author: Lennert Buytenhek Date: Fri Jun 24 23:11:31 2005 +0100 [PATCH] ARM: 2748/1: ixp2000 implementation of the iomap api Patch from Lennert Buytenhek A number of ixp2000 models have a bug where the byte lanes for PCI I/O transactions are swapped. We already work around this in our versions of {in,out}{b,w,l}, but we also need to perform these workarounds in a custom implementation of the new iomap API, provided in this patch. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 7533fca8e866ee7355ca53f1216e3fa4c718f991 Author: Lennert Buytenhek Date: Fri Jun 24 23:11:31 2005 +0100 [PATCH] ARM: 2747/1: allow platforms to provide their own iomap implementation Patch from Lennert Buytenhek This patch conditionalises the io{read,write}{8,16,32} defines and the prototypes for ioport_map/ioport_unmap in asm-arm/io.h on ioread8 not already having been defined. This is done so that platforms can provide their own implementation of the iomap API, ixp2000 for example needs this. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 75043cb5b386e5a01fd03b88f647dd992de02f97 Author: Alexey Dobriyan Date: Fri Jun 24 20:52:52 2005 +0000 [PATCH] fs/qnx4/*: fix sparse warnings This patch fixes sparse warnings in the qnx4fs (and might even make qnx4fs work on big-endian boxes) Signed-off-by: Alexey Dobriyan Signed-off-by: Domen Puncer Signed-off-by: Anders Larsen Signed-off-by: Linus Torvalds commit 79042f087b5ac7bba819de03dc3e7462bab8aad9 Author: Catalin Marinas Date: Fri Jun 24 21:27:39 2005 +0100 [PATCH] ARM: 2698/1: Enable kernel r/w access to user pages on ARMv6 Patch from Catalin Marinas cpu_v6_set_pte() sets the kernel access rights to r/o for user pages (L_PTE_USER) when neither L_PTE_WRITE nor L_PTE_DIRTY are set. This causes a kernel data abort when writing the TLS value in the 0xffff0000 page. This patch enables the kernel r/w access. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 5932ae3f5d610fd8d047ef4693bab9f084e5c56d Author: Deepak Saxena Date: Fri Jun 24 20:54:35 2005 +0100 [PATCH] ARM: 2745/1: Fix IXP4xx debug macros Patch from Deepak Saxena Current IXP4xx debug macros do not work in the small window between the MMU being enabled and the call to map_io() b/c the standard peripheral mapping is not properly setup for use with the low-level debug code. This patch creates a new section-aligned mapping for the UART specifically for use with the debug macros. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit c4982887cacf2122bc256e901598b58caf4a34be Author: Lennert Buytenhek Date: Fri Jun 24 20:54:35 2005 +0100 [PATCH] ARM: 2744/1: ixp2000 gpio irq support Patch from Lennert Buytenhek This patch cleans up the ixp2000 gpio irq code and implements the set_irq_type method for gpio irqs so that users can select for which events (falling edge/rising edge/level low/level high) on the gpio pin they want the corresponding gpio irq to be triggered. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit c6b56949de86694d837750a0a89c766b9871e81c Author: Lennert Buytenhek Date: Fri Jun 24 20:54:34 2005 +0100 [PATCH] ARM: 2740/1: ixp2000 align{b,w} need to parenthesize their arguments Patch from Lennert Buytenhek Two macros that are used on the ixp2000 to fixup byte lane enables for I/O space accesses, align{b,w}, use their arguments without parenthesizing them. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 0a8b80c52f44a6e84206618a8a450ba13a5809dc Author: Russell King Date: Fri Jun 24 19:48:22 2005 +0100 [PATCH] Serial: Eliminate magic numbers Use the existing macros instead. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 793ae77469121227cd910c4b99f24be1de34bcca Author: Linus Torvalds Date: Fri Jun 24 10:39:17 2005 -0700 Add "memory" clobbers to the x86 inline asm of strncmp and friends They don't actually clobber memory, but gcc doesn't even know they _read_ memory, so can apparently re-order memory accesses around them. Which obviously does the wrong thing if the memory access happens to change the memory that the compare function is accessing.. Verified to fix a strange boot problem by Jens Axboe. commit 59a49e38711a146dc0bef4837c825b5422335460 Merge: 52c1da39534fb382c061de58b65f678ad74b59f5 f2d368fa3ef90f2159d9e542303901ebf68144dd Author: Linus Torvalds Date: Fri Jun 24 00:31:46 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 52c1da39534fb382c061de58b65f678ad74b59f5 Author: Adrian Bunk Date: Thu Jun 23 22:05:33 2005 -0700 [PATCH] make various thing static Another rollup of patches which give various symbols static scope Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d763b7a4736e219528f77bf6bc75dd78b1d75c03 Author: Carsten Otte Date: Thu Jun 23 22:05:31 2005 -0700 [PATCH] xip: description Signed-off-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe77ba6f4f97690baa4c756611a07f3cc033f6ae Author: Carsten Otte Date: Thu Jun 23 22:05:29 2005 -0700 [PATCH] xip: madvice/fadvice: execute in place Make sys_madvice/fadvice return sane with xip. Signed-off-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb6fe0c388e43b02e261f0fdee60e42f6298d7f7 Author: Carsten Otte Date: Thu Jun 23 22:05:28 2005 -0700 [PATCH] xip: reduce code duplication This patch reworks filemap_xip.c with the goal to reduce code duplication from mm/filemap.c. It applies agains 2.6.12-rc6-mm1. Instead of implementing the aio functions, this one implements the synchronous read/write functions only. For readv and writev, the generic fallback is used. For aio, we rely on the application doing the fallback. Since our "synchronous" function does memcpy immediately anyway, there is no performance difference between using the fallbacks or implementing each operation. Signed-off-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d79125bba55ee82701f1c7d4ebbc1aa20ecbe4e Author: Carsten Otte Date: Thu Jun 23 22:05:26 2005 -0700 [PATCH] xip: ext2: execute in place These are the ext2 related parts. Ext2 now uses the xip_* file operations along with the get_xip_page aop when mounted with -o xip. Signed-off-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ceffc078528befc008c6f2c2c4decda79eabd534 Author: Carsten Otte Date: Thu Jun 23 22:05:25 2005 -0700 [PATCH] xip: fs/mm: execute in place - generic_file* file operations do no longer have a xip/non-xip split - filemap_xip.c implements a new set of fops that require get_xip_page aop to work proper. all new fops are exported GPL-only (don't like to see whatever code use those except GPL modules) - __xip_unmap now uses page_check_address, which is no longer static in rmap.c, and defined in linux/rmap.h - mm/filemap.h is now much more clean, plainly having just Linus' inline funcs moved here from filemap.c - fix includes in filemap_xip to make it build cleanly on i386 Signed-off-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 420edbcc09008342c7b2665453f6b370739aadb0 Author: Carsten Otte Date: Thu Jun 23 22:05:23 2005 -0700 [PATCH] xip: bdev: execute in place This is the block device related part. The block device operation direct_access now has a struct block_device as first parameter. Signed-off-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d41088fa327782b14b5659dbcfff62ec704c23c Author: Martin Waitz Date: Thu Jun 23 22:05:21 2005 -0700 [PATCH] DocBook: update comments This patch updates some comments to match code changes. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 363412b4f70a2ba19c76a01da7580472399312d4 Author: Martin Waitz Date: Thu Jun 23 22:05:20 2005 -0700 [PATCH] DocBook: only use tabular style for long synopsis There was a complaint that function declarations are shown tabular in the documentation since switching to xmlto. This patch disables tabular mode when the function fits in one line. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 597f6eea75ff3d089e6a627c07e1bf28923b8e7e Author: Jiri Slaby Date: Thu Jun 23 22:05:18 2005 -0700 [PATCH] docbook build fix Fix documentation build with `make O=' Cc: Martin Waitz Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c988d2b2845495373f666a381d354a7f80981d62 Author: Matt Domsch Date: Thu Jun 23 22:05:15 2005 -0700 [PATCH] modules: add version and srcversion to sysfs This patch adds version and srcversion files to /sys/module/${modulename} containing the version and srcversion fields of the module's modinfo section (if present). /sys/module/e1000 |-- srcversion `-- version This patch differs slightly from the version posted in January, as it now uses the new kstrdup() call in -mm. Why put this in sysfs? a) Tools like DKMS, which deal with changing out individual kernel modules without replacing the whole kernel, can behave smarter if they can tell the version of a given module. The autoinstaller feature, for example, which determines if your system has a "good" version of a driver (i.e. if the one provided by DKMS has a newer verson than that provided by the kernel package installed), and to automatically compile and install a newer version if DKMS has it but your kernel doesn't yet have that version. b) Because sysadmins manually, or with tools like DKMS, can switch out modules on the file system, you can't count on 'modinfo foo.ko', which looks at /lib/modules/${kernelver}/... actually matching what is loaded into the kernel already. Hence asking sysfs for this. c) as the unbind-driver-from-device work takes shape, it will be possible to rebind a driver that's built-in (no .ko to modinfo for the version) to a newly loaded module. sysfs will have the currently-built-in version info, for comparison. d) tech support scripts can then easily grab the version info for what's running presently - a question I get often. There has been renewed interest in this patch on linux-scsi by driver authors. As the idea originated from GregKH, I leave his Signed-off-by: intact, though the implementation is nearly completely new. Compiled and run on x86 and x86_64. From: Matthew Dobson build fix From: Thierry Vignaud build fix From: Matthew Dobson warning fix Signed-off-by: Greg Kroah-Hartman Signed-off-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5bec39639d386e1893dc440dd536761136ab36b Author: Mauro Carvalho Chehab Date: Thu Jun 23 22:05:13 2005 -0700 [PATCH] v4l: fix I2C detect after normal_i2c_range() This patch is necessary to correct I2C detect after normal_i2c_range removal in gregkh-i2c-i2c-address_range_removal.patch. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac19ecc6fa57b0ea320f01831175ff163f47d6a2 Author: Mauro Carvalho Chehab Date: Thu Jun 23 22:05:09 2005 -0700 [PATCH] v4l: update for SAA7134 cards This patch adds support for various SAA7134 cards and brings some fixes. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Fabrice Aeschbacher Signed-off-by: Hermann Pitton . Signed-off-by: Nickolay V Shmyrev Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56fc08ca375491b965cb76fad65bfb98973e80d8 Author: Mauro Carvalho Chehab Date: Thu Jun 23 22:05:07 2005 -0700 [PATCH] v4l: update for tuner cards and some V4L chips Tuner improvements and additions. TEA5767 FM tuner added. Several small fixes. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Nickolay V Shmyrev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b45009b0288a96a3458f4f8e93cb776678d41875 Author: Mauro Carvalho Chehab Date: Thu Jun 23 22:05:03 2005 -0700 [PATCH] v4l: CX88 cards update This patch adds support for various CX88 cards and allows specifying card addresses. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Michael Krufky Signed-off-by: cybercide@f2s.com Signed-off-by: Catalin Climov Signed-off-by: Nickolay V Shmyrev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d03e289ea4b13d78ce55f1ea0b0d45b8f1b34c3 Author: Mauro Carvalho Chehab Date: Thu Jun 23 22:04:58 2005 -0700 [PATCH] bttv update This patch synchronizes current bttv support on V4L with linux kernel and adds support to Adlink RTV24 card. It is asked that *every* patch to V4L stuff to be first submitted to video4linux-list@redhat.com. From: "J.A. Magallon" struct bttv defined after usage. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Peter Skipworth Signed-off-by: Nickolay V Shmyrev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c1d0185db6a44b6304c404f4da1a1a98746ca46 Author: Michael Krufky Date: Thu Jun 23 22:04:56 2005 -0700 [PATCH] v4l: support tuner for Thomson DDT 7611 (ATSC/NTSC) Add support for tuner#60: Thomson DDT 7611 (ATSC/NTSC) Change tuner in card#28 (DViCO FusionHDTV3 Gold-T) from tuner=52 (Tuner Thomson DDT 7610) to tuner=60 (Tuner Thomson DDT 7611) Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80d34362f391840dcb10c0ec261f765871a586f7 Author: Michael Krufky Date: Thu Jun 23 22:04:55 2005 -0700 [PATCH] DViCO FusionHDTV3 Gold-T documentation fix Even though it says DViCO FusionHDTV3 Gold-Q on the box, Gold-T is printed on the card. This fix corrects the error in all places, and corrects the tuner name Thomson DDT 7611 (ATSC/NTSC) in the documentation. This applies against 2.6.12-rc5-mm2 after applying Manueal Capinha's patch "Add support for PixelView Ultra Pro in v4l" (because of the change from card=27 to card=28) Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 239df2e2b0e1f4f69fdf76fb67e865824029e8ab Author: Manuel Capinha Date: Thu Jun 23 22:04:53 2005 -0700 [PATCH] v4l: add support for PixelView Ultra Pro The following patch adds support for the PixelView Ultra Pro video capture card in v4l. - It removes the remote control key definitions from ir-kbd-gpio.c and moves them to ir-common.c so that they can be shared between bt878 and cx88 based cards. - The patch also moves the FUSIONHDTV_3_GOLD_Q card from number 27 to 28 to regain compatibility with the V4L cvs. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d81ef559daf2a8afa9292035d58b00e7cb23dd1a Author: Mauro Carvalho Chehab Date: Thu Jun 23 22:04:51 2005 -0700 [PATCH] Video for Linux Documentation This patch synchronizes documentation from V4L CVS with current kernel release. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59dcd9480d93aebdf41e29c46e6a8b4ceeaca75d Author: Mauro Carvalho Chehab Date: Thu Jun 23 22:04:50 2005 -0700 [PATCH] v4l: PAL-M support fix for CX88 chipsets This patch fixes PAL-M chroma subcarrier frequency (FSC) to its correct value of 3.5756115 MHz and adjusts horizontal total samples for PAL-M, according with formula Line Draw Time / (4*FSC). Signed-off-by: Mauro Carvalho Chehab Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f246a8172a9e403b78c34568f766990f1506a0ab Author: Michael Schimek Date: Thu Jun 23 22:04:47 2005 -0700 [PATCH] v4l: saa7134 ntsc vbi fix This patch fixes NTSC VBI capturing in the saa7134 driver. Signed-off-by: Michael H. Schimek Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93b43f13b5bfeac09ef5743edf39eeeee3f4eeae Author: Peter Skipworth Date: Thu Jun 23 22:04:45 2005 -0700 [PATCH] BTTV support for Adlink RTV24 capture card The bttv module currently lacks support for the Adlink RTV24 capture card. The following patch adds support for the Adlink RTV24 video capture card to the bttv module. Cc: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 097b750e6c0209b4b951996826ca0bd6707e357a Author: Michael Krufky Date: Thu Jun 23 22:04:43 2005 -0700 [PATCH] Fix for cx88-cards.c for DVICO-FusionHDTV 3 GOLD Q This patch allows full analog functionality for the DViCO FusionHDTV3 Gold-Q, 18ac:d820 which has a Conexant cx23882, Thompson7611, and LG 3202. It does NOT yet support digital decoding or digital audio without the internal analog audio jack connected to the sound board, but it works perfectly in analog mode. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6988588e13616587aa879c2e0bd7cd811705e5d Author: Adrian Bunk Date: Thu Jun 23 22:04:41 2005 -0700 [PATCH] VIDEO_CX88_DVB must select DVB_CX22702 VIDEO_CX88_DVB must select DVB_CX22702 (due to its cx22702_attach usage). This patch fixes kernel Bugzilla #4594 (http://bugzilla.kernel.org/show_bug.cgi?id=4594). Signed-off-by: Adrian Bunk Acked-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9c12b790e1dad2e6c2a9b2e62e97297aa8dd93a Author: Alexey Dobriyan Date: Thu Jun 23 22:04:37 2005 -0700 [PATCH] saa7134: mark little endian ptr > - *ptr = sg_dma_address(list) - list->offset; > + *ptr = cpu_to_le32(sg_dma_address(list) - list->offset); Clearly mark pointers to little-endian things. Signed-off-by: Alexey Dobriyan Acked-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a20758fa3238134ec9ac0a7e02446d9861dfe943 Author: Gerd Knorr Date: Thu Jun 23 22:04:34 2005 -0700 [PATCH] v4l: saa7134 byteorder fix Fix byteorder bug in the saa7134 driver. With that ObviouslyCorrect[tm] patch applied the driver reportly works on powerpc. Signed-off-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0964a3d3f1aa96468091924f6b0c391a46dc6d0b Author: NeilBrown Date: Thu Jun 23 22:04:32 2005 -0700 [PATCH] knfsd: nfsd4 reboot dirname fix Set the recovery directory via /proc/fs/nfsd/nfs4recoverydir. It may be changed any time, but is used only on startup. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7b9a45927e74c81d6562153f7fde9d32da00159 Author: NeilBrown Date: Thu Jun 23 22:04:30 2005 -0700 [PATCH] knfsd: nfsd4: reboot recovery This patch adds the code to create and remove client subdirectories from the recovery directory, as described in the previous patch comment. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 190e4fbf96037e5e526ba3210f2bcc2a3b6fe964 Author: NeilBrown Date: Thu Jun 23 22:04:25 2005 -0700 [PATCH] knfsd: nfsd4: initialize recovery directory NFSv4 clients are required to know what state they have on the server so that they can reclaim it on server reboot. However, it is possible for pathalogical combinations of server reboots and network partitions to leave a client in a state where it cannot know whether it has lost its state on the server. For this reason, rfc3530 requires that we store some information about clients to stable storage. So we maintain a directory /var/lib/nfs/v4recovery with a subdirectory for each client with active state. We leave open the possibility of including files underneath each such subdirectory with information about the client, but for now the subdirectories are empty. We create a client subdirectory whenever a client makes its first non-reclaim open_confirm. We remove a client subdirectory whenever either a) its lease expires, or b) the grace period ends without it reclaiming anything. When handling reclaims, we allow the reclaim if and only if the client doing the reclaim has a subdirectory. This patch adds just the code to scan the recovery directory on nfsd startup. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb36d6345752fa24827044c68e15f6708a40d9f6 Author: NeilBrown Date: Thu Jun 23 22:04:23 2005 -0700 [PATCH] knfsd: nfsd4: remove cb_parsed The cb_parsed field is only used by probe_callback, to determine whether the callback information has been filled in by setclientid. But there is no way that probe_callback() can be called without that having already happened, so that check is superfluous, as is cb_parsed. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e9e3dbe0fe36c824ce2c5d7b05997c87a64bbdc Author: NeilBrown Date: Thu Jun 23 22:04:20 2005 -0700 [PATCH] knfsd: nfsd4: allow multiple lockowners >From the language of rfc3530 section 8.1.3 (e.g., the suggestion that a "process id" might be a reasonable lockowner value) it's conceivable that a client might want to use the same lockowner string on multiple files, so we may as well allow that. We expect each use of open_to_lockowner to create a distinct seqid stream, though. For now we're also allowing multiple uses of open_to_lockowner with the same open, though it seems unlikely clients would actually do that. Also add a comment reminding myself of some very non-scalable data structures. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea1da636e956ad1591a74904f23d98bbc26a644b Author: NeilBrown Date: Thu Jun 23 22:04:17 2005 -0700 [PATCH] knfsd: nfsd4: rename state list fields Trivial renaming patch: I can never remember, while looking at various lists relating the nfsd4 state structures, which are the "heads" and which are items on other lists, or which structures are actually on the various lists. The following convention helps me: given structures foo and bar, with foo containing the head of a list of bars, use "bars" for the name of the head of the list contained in the struct foo, and use "per_foo" for the entries in the struct bars. Already done for struct nfs4_file; go ahead and do it for the other nfsd4 state structures. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21ab45a480ec7705d177e959ebf452d62340c004 Author: NeilBrown Date: Thu Jun 23 22:04:14 2005 -0700 [PATCH] knfsd: nfsd4: miscellaneous setclientid_confirm cleanup Minor cleanup, remove some unnecessary printk's. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c79f7377cd4f2a50d51475f4c7966a3e60596a7 Author: NeilBrown Date: Thu Jun 23 22:04:13 2005 -0700 [PATCH] knfsd: nfsd4: setclientid_confirm comments Trivial whitespace and comment fixes. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08e8987c37cd04d2df211c1e019d8f165d44266e Author: NeilBrown Date: Thu Jun 23 22:04:11 2005 -0700 [PATCH] knfsd: nfsd4: setclientid_confirm gotoectomy Change from "goto" to "else if" format in setclientid_confirm. From: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22de4d837439071a0bec897485d3911383b6ffad Author: NeilBrown Date: Thu Jun 23 22:04:09 2005 -0700 [PATCH] knfsd: nfsd4: fix setclientid_confirm error return NFS4_INVAL is not a valid error for setclientid_confirm, and INUSE is the more logical error here anyway. From: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a69c179a28a9bb9f4d086927b192d5cffe88e50 Author: NeilBrown Date: Thu Jun 23 22:04:08 2005 -0700 [PATCH] knfsd: nfsd4: fix setclientid_confirm cases Setclientid_confirm code confused states 1 and 3 (numbering from the IMPLEMENTATION section of rfc3530, section 14.2.33). Fix this. State 1 allows the client to change the callback channel on the fly. We don't implement this currently, so just turn off the callback channel in this case. From: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31f4a6c127f619886bf97f643e546f7788248f3f Author: NeilBrown Date: Thu Jun 23 22:04:06 2005 -0700 [PATCH] knfsd: nfsd4: fix uncomfirmed list Setclientid code assumes there is only one match in unconfirmed list. Make sure that assumption holds. From: Fred Isaman Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd39ca9a808c6026989bc2188868a0574eb37108 Author: NeilBrown Date: Thu Jun 23 22:04:03 2005 -0700 [PATCH] knfsd: nfsd4: make needlessly global code static This patch contains the following possible cleanups: - make needlessly global code static Signed-off-by: Adrian Bunk Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a76b4319ca85b5e3a8098470c623a272d40271cd Author: NeilBrown Date: Thu Jun 23 22:04:01 2005 -0700 [PATCH] knfsd: nfsd4: grace period end For the purposes of reboot recovery, we want to do some work during the transition period at the end of the grace period. Some of that work must be guaranteed to have a certain relationship with the end of the grace period, so we want to control the transition there. Our approach is to modify the in_grace() checks to consult a global variable instead of checking the time directly, to schedule the first run of the laundromat thread at the end of the grace period, and to set the global end-of-grace-period there. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28ce6054f1de89834e5e9522f9e451cd88a35f85 Author: NeilBrown Date: Thu Jun 23 22:03:56 2005 -0700 [PATCH] knfsd: nfsd4: add find_{un}conf_by_str functions to simplify setclientid Minor setclientid cleanup Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a55370a3c0106106a975c5a09cee800611d0cf50 Author: NeilBrown Date: Thu Jun 23 22:03:52 2005 -0700 [PATCH] knfsd: nfsd4: reboot hash For the purposes of reboot recovery we keep a directory with subdirectories each having a name that is the ascii hex representation of the md5 sum of a client identifier for an active client. This adds the code to calculate that name. We also use it for the purposes of comparing clients, so if someone ever manages to find two client names that are md5 collisions, then we'll return clid_inuse to the second. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dea9d280c96f90382ec5d5709433e66a0993ec9 Author: NeilBrown Date: Thu Jun 23 22:03:42 2005 -0700 [PATCH] knfsd: nfsd4: setclientid simplification We can be a little more concise here. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd0b1e954e3ba3e5d2cab941458cf98206471bd2 Author: NeilBrown Date: Thu Jun 23 22:03:35 2005 -0700 [PATCH] knfsd: nfsd4: idmap initialization Adopt standard kernel style by defining a no-op function instead of putting ifdef's in the code where the function is called. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 707d4ab7b3aa6d1f7a7d2cd123fb83ba9a528205 Author: NeilBrown Date: Thu Jun 23 22:03:32 2005 -0700 [PATCH] knfsd: nfsd4: remove nfs4_reclaim_init nfs4_reclaim_init is no longer performing any useful function. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac4d8ff2a57179de3ef7834c6ab3fac430b0a05d Author: NeilBrown Date: Thu Jun 23 22:03:30 2005 -0700 [PATCH] knfsd: nfsd4: clean up state initialization Separate out stuff that needs initialization on startup from stuff that only needs initialization on module init from static data. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76a3550ec50ed86885a10a767ebaebb7c9104721 Author: NeilBrown Date: Thu Jun 23 22:03:26 2005 -0700 [PATCH] knfsd: nfsd4: rename nfs4_state_init Somewhat gratuitous rename to simplify following patch. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b190fecfa33d72bcf74c9473134c2ad14ae9545 Author: NeilBrown Date: Thu Jun 23 22:03:23 2005 -0700 [PATCH] knfsd: nfsd4: delegation recovery Allow recovery of delegations after reboot. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d99a05adf8490cc171b7709554936b8f3ac9e362 Author: NeilBrown Date: Thu Jun 23 22:03:21 2005 -0700 [PATCH] knfsd: nfsd4: simplify lease changing The only way the protocol gives to change the lease time on the fly is to simulate a reboot. We don't have that completely right in the current code; among other things, we should probably put lockd in grace too while we do this. For now, let's just keep this simple, and wait till the next time nfsd starts to register any changes in lease time. If the administrator really wants to change the lease time *now*, they can go ahead and bring nfsd down and then back up again after changing the lease time. Also remove the "if (reclaim_str_hashtbl_size == 0)" case, a shortcut which skips the grace period if we know of no clients in need of recovery. This isn't going to work well with nlm. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58da282b733cff4caef805c6555c7a3b90772946 Author: NeilBrown Date: Thu Jun 23 22:03:19 2005 -0700 [PATCH] knfsd: nfsd4: create separate laundromat workqueue We're running the laundromat work on the default kevent worker thread. But the laundromat takes the nfsv4 state semaphore, which is used for way too much stuff, and the potential for deadlocks is high. Better to have this on a separate workqueue. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfc8356570b6fcb4035c7d916ade5bbbe6c3b50a Author: NeilBrown Date: Thu Jun 23 22:03:16 2005 -0700 [PATCH] knfsd: nfsd4: nfs4_check_open_reclaim cleanup Minor cleanup. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ba266d6323e957588712f6a7d31252cd6b797bb Author: NeilBrown Date: Thu Jun 23 22:03:15 2005 -0700 [PATCH] knfsd: nfsd4: fix probe_callback rpc_create_client was modified recently to do its own (synchronous) NULL ping of the server. We'd rather do that on our own, asynchronously, so that we don't have to block the nfsd thread doing the probe, and so that setclientid handling (hence, client mounts) can proceed normally whether the callback is succesful or not. (We can still function fine without the callback channel--we just won't be able to give out delegations till it's verified to work.) Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e06b7f9e9537cb826f3cff95816fc4384b67806 Author: NeilBrown Date: Thu Jun 23 22:03:13 2005 -0700 [PATCH] knfsd: nfs4: hold filp while reading or writing We're trying to read and write from a struct file that we may not hold a reference to any more (since a close could be processed as soon as we drop the state lock). Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46be925fa6f4796e732e16a020fa0ef9d48ea7c8 Author: NeilBrown Date: Thu Jun 23 22:03:11 2005 -0700 [PATCH] knfsd: lockd: flush signals on shutdown Silence another annoying "failed to contact portmap (errno -512)" on shutdown. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13cd21845d6a9729ca95e36ae6e8c669623fbfd4 Author: NeilBrown Date: Thu Jun 23 22:03:10 2005 -0700 [PATCH] nfsd4: reference count struct nfs4_file Add a struct kref to each nfs4_file and take a reference to it from each stateid and delegation that refers to it. The atomicity guarantees are overkill given that all this stuff is done under the single nfsd4 state lock, but a) we'd like finer-grained locking some day, and b) this simplifies the cleanup of the structures a bit, something that has previously been a bit complicated and bug-prone. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8beefa249371f55432394ac96864c83b0b309c28 Author: NeilBrown Date: Thu Jun 23 22:03:08 2005 -0700 [PATCH] nfsd4: rename nfs4_file fields Trivial renaming patch: I can never remember, while looking at various lists relating the nfsd4 state structures, which are the "heads" and which are items on other lists, or which structures are actually on the various lists. The following convention helps me: given structures foo and bar, with foo containing the head of a list of bars, use "bars" for the name of the head of the list contained in the struct foo, and use "per_foo" for the entries in the struct bars. Go ahead and do this for struct nfs4_file. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fa305ded4cc859deb4727ad9b25df0bbc064e99 Author: NeilBrown Date: Thu Jun 23 22:03:06 2005 -0700 [PATCH] nfsd4: remove debugging counters These remaining debugging counters haven't proved that useful. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b2d21c1965859acc881dd862b6ebbfae67cdc14 Author: NeilBrown Date: Thu Jun 23 22:03:04 2005 -0700 [PATCH] nfsd4: slabify delegations Allocate delegations from a slab cache. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ac049ac66416bbe84923f7c2384f23f6ee4aa88 Author: NeilBrown Date: Thu Jun 23 22:03:03 2005 -0700 [PATCH] nfsd4: slabify stateids Allocate stateid's from a slab cache. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e60d4398a7c20fbe9c4a6cc39d7188ef9f65d2f1 Author: NeilBrown Date: Thu Jun 23 22:03:01 2005 -0700 [PATCH] nfsd4: slabify nfs4_files The structures the server uses to keep track of various pieces of nfsv4 state (open files, outstanding delegations, etc.) are likely to be allocated and deallocated frequently and seem reasonable candidates for slab caches. While we're at it, the slab code keeps statistics that help catch leaks and such, so we may as well take this chance to eliminate some debugging counters that we've been keeping ourselves. Start with the struct nfs4_file. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c815afc73eeef089922449857ca4ed4d2e8950cb Author: NeilBrown Date: Thu Jun 23 22:03:00 2005 -0700 [PATCH] nfsd4: block metadata ops during grace period We currently return err_grace if a user attempts a non-reclaim open during the grace period. But we also need to prevent renames and removes, at least, to ensure clients have the chance to recover state on files before they are moved or deleted. Of course, local users could also do renames and removes during the lease period, and there's not much we can do about that. This at least will help with remote users. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 496400014f22c4dbdbc1e89249a2feba46939708 Author: NeilBrown Date: Thu Jun 23 22:02:58 2005 -0700 [PATCH] nfsd4: fix fh_expire_type We're returning NFS4_FH_NOEXPIRE_WITH_OPEN | NFS4_FH_VOL_RENAME for the fh_expire_type attribute. This is incorrect: 1. The spec actually only allows NOEXPIRE_WITH_OPEN when VOLATILE_ANY is also set. 2. Filehandles for open files can expire, if the file is removed and there is a reboot. 3. Filehandles are only volatile on rename in the nosubtree check case. Unfortunately, there's no way to indicate that we only expire on remove. So our only choice is FH4_VOLATILE_ANY. Although it's redundant, we also set FH4_VOL_RENAME in the subtree check case, since subtreecheck does actually cause problems in practice and it seems possibly useful to give clients some way to distinguish that case. Fix a mispelled #define while we're at it. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dd3c19212961453817f219cd6200981c38564bc Author: NeilBrown Date: Thu Jun 23 22:02:56 2005 -0700 [PATCH] nfsd4: support CLAIM_DELEGATE_CUR Add OPEN claim type NFS4_OPEN_CLAIM_DELEGATE_CUR to nfsd4_open(). A delegation stateid and a name are provided. OPEN with O_CREAT is not legal with this claim type; otherwise, use the NFS4_OPEN_CLAIM_NULL code path to lookup the filename to be opened. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c44c5eeb2c022ddac98a8543c08dc8ff820561dc Author: NeilBrown Date: Thu Jun 23 22:02:54 2005 -0700 [PATCH] nfsd4: add open state code for CLAIM_DELEGATE_CUR State logic for OPEN with claim type CLAIM_DELEGATE_CUR, which the NFSv4 client uses to report local OPENs on a delegated file back to the NFSv4 server. nfs4_check_deleg() performs input delegation stateid lookup and sanity check. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 567d98292e81033182e3da4c33b41ada9c113447 Author: NeilBrown Date: Thu Jun 23 22:02:53 2005 -0700 [PATCH] nfsd4: don't reopen for delegated client We don't really need to be doing a separate open for every stateid. And in the case of an open from a client that already has a delegation on a file, it unnecessarily results in a delegation recall. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a6e43e6d4e43723699879f421d321e39eab5e41 Author: NeilBrown Date: Thu Jun 23 22:02:50 2005 -0700 [PATCH] nfsd4: nfs4_check_delegmode Additional minor code reshuffling to prepare for claim_deleg_cur support. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52f4fb43063c182f3ef7e257ab336a8be8066bb0 Author: NeilBrown Date: Thu Jun 23 22:02:49 2005 -0700 [PATCH] nfsd4: find_delegation_file() Factor out a bit of common code that will be useful elsewhere. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c0a400d1debb172c596b24ab82efab4975990a9 Author: John Levon Date: Thu Jun 23 22:02:47 2005 -0700 [PATCH] oprofile: report anonymous region samples The below patch passes samples from anonymous regions to userspace instead of just dropping them. This provides the support needed for reporting anonymous-region code samples (today: basic accumulated results; later: Java and other dynamically compiled code). As this changes the format, an upgrade to the just-released 0.9 release of the userspace tools is required. This patch is based upon an earlier one by Will Cohen Signed-off-by: John Levon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 391cd727eac2e10be7685efd739a3ea9de87393c Author: Mauro Carvalho Chehab Date: Thu Jun 23 22:02:43 2005 -0700 [PATCH] tuner-core.c improvments and Ymec Tvision TVF8533MF support tuner-core.c, tuner.h: - tuner-core changed to support multiple I2C devices used on some adapters; - Kconfig now has an option (CONFIG_TUNER_MULTI_I2C) to enable this new behavor; - By default, even enabling CONFIG_TUNER_MULTI_I2C, tuner-core emulates the old behavor, using first I2C device for both FM and TV; - There is a new i2c command (TUNER_SET_ADDR) to allow tuner clients to select I2C address for FM or TV tuner; - Tuner I2C dettach now generates a warning on syslog if failed. tuner-simple.c: - TVision TVF-8531MF and TVF-5533 MF tuner included. It uses, by default, I2C on 0xC2 address for TV and on 0xC0 for Radio. Both TV and FM Radio mode are working. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55f51efdb696ff6e9d2056377d05268a97f3d4e4 Author: Johannes Stezenbach Date: Thu Jun 23 22:02:41 2005 -0700 [PATCH] dvb: flexcop: add BCM3510 ATSC frontend support for Air2PC card Added support for the Broadcom BCM3510 ATSC (8VSB/16VSB & ITU J83 AnnexB FEC QAM64/256) demodulator used in the first generation of Air2PC ATSC PCI-cards/USB-boxes made by B2C2. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc89c229d9d7ec63cd33e960c20e75b77bc987d0 Author: Johannes Stezenbach Date: Thu Jun 23 22:02:39 2005 -0700 [PATCH] dvb: dvb_frontend: use time_after() Use time_after() macro. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Domen Puncer Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f756ead1366092b73467fe3b1fb23f61034e94f9 Author: Johannes Stezenbach Date: Thu Jun 23 22:02:38 2005 -0700 [PATCH] dvb-usb: fix init error checking Fix error checking during initialization. Thanks to Gerolf Wendland for discovering. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 776338e121b9db3156bfb4e21622a0219bbab9d4 Author: Johannes Stezenbach Date: Thu Jun 23 22:02:35 2005 -0700 [PATCH] dvb: Add generalized dvb-usb driver Add generalized dvb-usb driver which supports a wide variety of devices. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6a235b1186dda0800c8bedc2526830a4a36b44e Author: Johannes Stezenbach Date: Thu Jun 23 22:02:29 2005 -0700 [PATCH] dvb: drop obsolete dibusb driver Remove the dibusb driver which has been obsoleted by the generalized dvb-usb driver. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e05d2b8d3dd34b0237f489e991ed081cb0bf007 Author: Yani Ioannou Date: Thu Jun 23 22:02:28 2005 -0700 [PATCH] tpm: device attribute fixes This patch updates all the device attribute callbacks that weren't updated with the new parameter, I guess because they weren't in Greg's tree (including drivers/pcmcia/ds.c). Without the patch these callbacks are probably broken (and generate a warning along the lines of "assignment from incompatible pointer type"). Please see http://lkml.org/lkml/2005/5/19/40 for the scripts I used to update the attributes automatically. Signed-off-by: Yani Ioannou Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f52bdbe9fcf2453d402376e22de1eca6dfc96890 Author: Andrew Morton Date: Thu Jun 23 22:02:26 2005 -0700 [PATCH] i2o build fix LD .tmp_vmlinux1 drivers/built-in.o: In function `i2o_cfg_parms': config-osm.c:(.text+0x12764a): undefined reference to `i2o_parm_issue' Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718c31831aa134a97f6fef215c208cea80a8b480 Author: Markus Lidel Date: Thu Jun 23 22:02:24 2005 -0700 [PATCH] I2O: Limit max sector workaround for Promise controllers Set max sectors to 256 for Promise controllers. Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f33213ecf49c98da4e85121b592c3bea8057c2e6 Author: Markus Lidel Date: Thu Jun 23 22:02:23 2005 -0700 [PATCH] I2O: Lindent run and replacement of printk through osm printing functions Lindent run and replaced printk() through the corresponding osm_*() function Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e87545f06930c1d294423a8091d1077e7444a47 Author: Markus Lidel Date: Thu Jun 23 22:02:21 2005 -0700 [PATCH] I2O: second code cleanup of sparse warnings and unneeded syncronization Changes: - Added header "core.h" for i2o_core.ko internal definitions - More sparse fixes - Changed display of TID's in sysfs attributes from XXX to 0xXXX - Use the right functions for accessing I/O and normal memory - Removed error handling of SCSI device errors and let the SCSI layer take care of it - Added new device / removed device handling to SCSI-OSM - Make status access volatile - Cleaned up activation of I2O controller - Removed unnecessary wmb() and rmb() calls - Use own struct i2o_io for I/O memory instead of struct i2o_dma Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2aaee33fbb354a2f08121aa1c1be55841102761 Author: Markus Lidel Date: Thu Jun 23 22:02:19 2005 -0700 [PATCH] I2O: Adaptec specific SG_IO access, firmware access through sysfs and 2400A workaround Changes: - Provide SG_IO access to BLOCK and EXECUTIVE class on Adaptec controllers - Use PRIVATE messages in SCSI-OSM because on some controllers normal SCSI class commands like READ or READ CAPACITY cause errors - Use new DMA and SG list creation function - Added workaround to limit sectors per request for Adaptec 2400A controllers Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f10378fff658f61307496e0ae00095041725cf07 Author: Markus Lidel Date: Thu Jun 23 22:02:16 2005 -0700 [PATCH] I2O: new sysfs attributes and Adaptec specific block device access and 64-bit DMA support Changes: - Added Bus-OSM which could be used by user space programs to reset a channel on the controller - Make ioctl's in Config-OSM obsolete in prefer for sysfs attributes and move those to its own file - Added sysfs attribute for firmware read and write access for I2O controllers - Added special handling of firmware read and write access for Adaptec controllers - Added vendor id and product id as sysfs-attribute to Executive classes - Added automatic notification of LCT change handling to Exec-OSM - Added flushing function to Block-OSM for later barrier implementation - Use PRIVATE messages for Block access on Adaptec controllers, which are faster then BLOCK class access - Cleaned up support for Promise controller - New messages are now detected using the IRQ status register as suggested by the I2O spec - Added i2o_dma_high() and i2o_dma_low() functions - Added facility for SG tablesize calculation when using 32-bit and 64-bit DMA addresses - Added i2o_dma_map_single() and i2o_dma_map_sg() which could build the SG list for 32-bit as well as 64-bit DMA addresses Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f88e119c4b824a5017456fa094950d0f4092d96c Author: Markus Lidel Date: Thu Jun 23 22:02:14 2005 -0700 [PATCH] I2O: first code cleanup of spare warnings and unused functions Changes: - Removed unnecessary checking of NULL before calling kfree() - Make some functions static - Changed pr_debug() into osm_debug() - Use i2o_msg_in_to_virt() for getting a pointer to the message frame - Cleaned up some comments - Changed some le32_to_cpu() into readl() where necessary - Make error messages of OSM's look the same - Cleaned up error handling in i2o_block_end_request() - Removed unused error handling of failed messages in Block-OSM, which are not allowed by the I2O spec - Corrected the blocksize detection in i2o_block - Added hrt and lct sysfs-attribute to controller - Call done() function in SCSI-OSM after freeing DMA buffers - Removed unneeded variable for message size calculation in i2o_scsi_queuecommand() - Make some changes to remove sparse warnings - Reordered some functions - Cleaned up controller initialization - Replaced some magic numbers by defines - Removed unnecessary dma_sync_single_for_cpu() call on coherent DMA - Removed some unused fields in i2o_controller and removed some unused functions Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61fbfa8129c1771061a0e9f47747854293081c5b Author: Markus Lidel Date: Thu Jun 23 22:02:11 2005 -0700 [PATCH] I2O: bugfixes and compability enhancements Changes: - Fixed sysfs bug where user and parent links where added to the I2O device itself - Fixed bug when calculating TID for the event handler and cleaned up the workflow of i2o_driver_dispatch() - Fixed oops when no I2O device could be found for an event delivered to Exec-OSM - Fixed initialization of spinlock in Exec-OSM - Fixed memory leak in i2o_cfg_passthru() and i2o_cfg_passthru() - Removed MTRR support - Added PCI ID of Promise SX6000 with firmware >= 1.20.x.x - Turn of caching for ioremapped memory of in_queue - Added initialization sequence for Promise controllers - Moved definition of u8 / u16 / u32 for raidutils before first use Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34d6e07570ef74b965131452a862b13dfa779188 Author: Kylene Jo Hall Date: Thu Jun 23 22:02:10 2005 -0700 [PATCH] tpm: improve output in sysfs files when the TPM fails Since after reconsideration this is more debug output than an error (the TPM is operating correctly given the current state) I have changed the statements to dbg rather than err. Also this patch corrects a memory leak if the error path is taken in the tpm_show_pubek function. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e234bc970451edc4021637fe2979b887da873f9a Author: Kylene Hall Date: Thu Jun 23 22:02:08 2005 -0700 [PATCH] tpm: add debugging output Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1a23c6671f2bfd6e5e112848f01334ca39ea2b1 Author: Kylene Hall Date: Thu Jun 23 22:02:06 2005 -0700 [PATCH] tpm: replace odd LPC init function Realized the tpm_lpc_init function isn't really necessary. Replaced it with vendor specific logic to find out the address the BIOS mapped the TPM to. This patch removes the tpm_lpc_init function, enums associated with it and calls to it. The patch also implements the replacement functionality. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6df7da8f7ee99e6fd1995fad852bacb978a6447 Author: Kylene Hall Date: Thu Jun 23 22:02:04 2005 -0700 [PATCH] tpm: TPMs on additional LPC bus Add support for TPMs on additional LPC buses. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e976d5557d3dd1e835b8be52e6201556dcfa052 Author: Kylene Hall Date: Thu Jun 23 22:02:03 2005 -0700 [PATCH] tpm: locking fixes Add a missing lock in the register hardware and fix a misplaced lock release release. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9e5b6bf9cf19e6e9f2825228136ea17bc9a051a Author: Kylene Hall Date: Thu Jun 23 22:02:02 2005 -0700 [PATCH] tpm: add cancel function This patch provides the logic to check if an operation has been canceled while waiting for the response to arrive. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6659ca2ab6730c3bbb9fa495f2327b95b955decd Author: Kylene Hall Date: Thu Jun 23 22:02:00 2005 -0700 [PATCH] tpm: sysfs owernship changes In the current driver all sysfs files end up owned by the base driver module rather than the module that actually owns the device this is a problem if the module is unloaded and the file is open. This patch fixes all that and lumps the files into an attribute_group. Signed-off-by: Kylene Hall Signed-off-by: Yani Ioannou Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81179bb6a54c2c626b4cbcc084ca974bb2d7f2a3 Author: Kylene Hall Date: Thu Jun 23 22:01:59 2005 -0700 [PATCH] tpm: remove unnecessary __force Remove the unnecessary use of __force. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2fe90666a84e6a11c541424dfa9eec20cfe5fc1 Author: Kylene Hall Date: Thu Jun 23 22:01:57 2005 -0700 [PATCH] tpm: use to_pci_dev Changes the container_of calls to 'to_pci_dev' as suggested previously. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe3fd48384af79e7619d3c6b0a020f801ef63c3b Author: Kylene Hall Date: Thu Jun 23 22:01:56 2005 -0700 [PATCH] tpm: fix timer initialization Fix the timer to be inited and modified properly. This work depends on the fixing of the msleep stuff which in patch 1 of this set. Signed-of-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2df7111fc6b0e050b06123379821ece2f8dd5bbc Author: Kylene Hall Date: Thu Jun 23 22:01:54 2005 -0700 [PATCH] tpm: large stack objects Remove some large objects be declared on the the stack. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b44bd58063f7839f42a4047843e93e1fbf73cda Author: Kylene Hall Date: Thu Jun 23 22:01:53 2005 -0700 [PATCH] tpm: read return code issue Replace an erroneous return code for the read function when no data is available. Signed-of-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f87ea32ae2a986acc5258ad736ab0b55937c9489 Author: Kylene Hall Date: Thu Jun 23 22:01:51 2005 -0700 [PATCH] tpm: remove unnecessary module stuff Description: Remove unnecessary (empty) module definitions. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dff37e4b0ad7bca3616f829c84bcf4ddd385d2c4 Author: Kylene Hall Date: Thu Jun 23 22:01:50 2005 -0700 [PATCH] tpm: address missing const defs Add "const" to several static arrays that were missing it in their definitions. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3122a88a242454efe72930e56a3e4d56ee534f3c Author: Kylene Hall Date: Thu Jun 23 22:01:48 2005 -0700 [PATCH] tpm: Fix concerns with TPM driver -- use enums Convert #defines to named enums where that preference has been indicated by other kernel developers. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 700d8bdcd0fa815b08638b1e4d43b66d60cc6a8d Author: Nishanth Aravamudan Date: Thu Jun 23 22:01:47 2005 -0700 [PATCH] char/tpm: use msleep(), clean-up timers, The TPM driver unnecessarily uses timers when it simply needs to maintain a maximum delay via time_before(). msleep() is used instead of schedule_timeout() to guarantee the task delays as expected. While compile-testing, I found a typo in the driver, using tpm_chp instead of tpm_chip. Remove the now unused timer callback function and change TPM_TIMEOUT's units to milliseconds. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan Acked-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a94f9209762a6eb286f668e1346ad87985cc765 Author: Andrew Morton Date: Thu Jun 23 22:01:45 2005 -0700 [PATCH] ipmi: add 32-bit ioctl translations for 64-bit platforms ) From: Corey Minyard This contains the patch for supporting 32-bit compatible ioctls on x86_64 systems. The current x86_64 driver will not work with 32-bit applications. Signed-off-by: Jordan Hargave Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77cf3973f22c7e7158f5e2c3c3d6809125b77e4b Author: Corey Minyard Date: Thu Jun 23 22:01:44 2005 -0700 [PATCH] ipmi: use completions, not semaphores, in powerdown code Don't use semaphores for IPC in the poweroff code, use completions instead. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b6259432dee81f928c22c48c080d5f6325ed92e Author: Corey Minyard Date: Thu Jun 23 22:01:42 2005 -0700 [PATCH] ipmi: add power cycle capability This patch to adds "power cycle" functionality to the IPMI power off module ipmi_poweroff. It also contains changes to support procfs control of the feature. The power cycle action is considered an optional chassis control in the IPMI specification. However, it is definitely useful when the hardware supports it. A power cycle is usually required in order to reset a firmware in a bad state. This action is critical to allow remote management of servers. The implementation adds power cycle as optional to the ipmi_poweroff module. It can be modified dynamically through the proc entry mentioned above. During a power down and enabled, the power cycle command is sent to the BMC firmware. If it fails either due to non-support or some error, it will retry to send the command as power off. Signed-off-by: Christopher A. Poblete Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f43f84f13a49fe5f0f7d1595082b6d7ec6daa85 Author: Corey Minyard Date: Thu Jun 23 22:01:40 2005 -0700 [PATCH] ipmi: timer shutdown cleanup Clean up the timer shutdown handling in the IPMI driver. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 845e78a15726f238fe1398b8c07754726cd726a7 Author: Corey Minyard Date: Thu Jun 23 22:01:39 2005 -0700 [PATCH] ipmi: doc updates This cleans up the IPMI documentation to fix some problems and make it more accurate for the current drivers. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdd5b29c6bc835dab71148afd5952f9cd278eef1 Author: Jan Kara Date: Thu Jun 23 22:01:37 2005 -0700 [PATCH] Make reiserfs BUG on too big transaction Make reiserfs BUG() when somebody tries to start a larger transaction than it's allowed (currently the code just silently deadlocks). Signed-off-by: Jan Kara Acked-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7282bee78798294bb1f0211a842cdb9f4872db3d Author: Chris Zankel Date: Thu Jun 23 22:01:33 2005 -0700 [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 8 The attached patches provides part 8 of an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e344b63eeec7850b5e900e10c8a6c61d083fd3a4 Author: Chris Zankel Date: Thu Jun 23 22:01:30 2005 -0700 [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 7 The attached patches provides part 7 of an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a8fd5589902153a134111ed7a40f9cca1f83254 Author: Chris Zankel Date: Thu Jun 23 22:01:26 2005 -0700 [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 6 The attached patches provides part 6 of an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f65ce4d141e435e54c20ed2379d983d362a2cb5 Author: Chris Zankel Date: Thu Jun 23 22:01:24 2005 -0700 [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 5 The attached patches provides part 5 of an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 249ac17e96811acc3c6402317dd5d5c89d2cbf68 Author: Chris Zankel Date: Thu Jun 23 22:01:20 2005 -0700 [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 4 The attached patches provides part 4 of an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a0015d62668e64c8b6e02e360fbbea121bfd5e6 Author: Chris Zankel Date: Thu Jun 23 22:01:16 2005 -0700 [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 3 The attached patches provides part 3 of an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bedea94545165364618d403d03b61d797acba0b Author: Chris Zankel Date: Thu Jun 23 22:01:12 2005 -0700 [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 2 The attached patches provides part 2 of an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e1a6dd2fddcc73c9e933758361e3d9c076c688a Author: Chris Zankel Date: Thu Jun 23 22:01:10 2005 -0700 [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 1 The attached patches provides part 1 of an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48b415ca13bac91f83db3b9d362fd5ae0ce275cb Author: Chris Zankel Date: Thu Jun 23 22:01:07 2005 -0700 [PATCH] xtensa: Tensilica Xtensa CPU arch maintainer record Start of a patch series which adds support for the xtensa architecture to Linux. The Xtensa architecture is highly configurable and usually buried inside an SOC device. So, if you buy a new printer, digital camera, or cell phone, there is a chance that there is an Xtensa inside even though you don't know it (sometimes as a small audio-engine or as a control CPU). Linux hasn't been adopted widely with Xtensa yet, but with Linux growing in the embedded space, I am sure it will become much more important. The attached patch supplies the maintainer record for an architecture implementation for the Tensilica Xtensa CPU series. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 556a2a45bce1740f035befaa7201e4ad836c7257 Author: Jan Kara Date: Thu Jun 23 22:01:06 2005 -0700 [PATCH] quota: reiserfs: improve quota credit estimates Use improved credits estimates for quota operations. Also reserve space for a quota operation in a transaction only if filesystem was mounted with some quota option. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f54587bea84a35125c95e19b98c2f464c50871b Author: Jan Kara Date: Thu Jun 23 22:01:04 2005 -0700 [PATCH] quota: ext3: Improve quota credit estimates Use improved credits estimates for quota operations. Also reserve a space for a quota operation in a transaction only if filesystem was mounted with some quota options. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e5117ba0af4582b6ec9164874f719d7f3f1eb2b Author: Jan Kara Date: Thu Jun 23 22:01:03 2005 -0700 [PATCH] quota: improve credits estimates Improve estimates on the number of needed credits for quota transaction. Now we distinguish blocks that might need to be allocated and blocks that only need to be rewritten. Also we distinguish deleting of a quota structure and creating of a new one. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd6a1f16fffdfe010fdc2979fd01f12357816762 Author: Jan Kara Date: Thu Jun 23 22:01:01 2005 -0700 [PATCH] reiserfs: add checking of journal_begin() return value Check return values of journal_begin() and journal_end() in the quota code for reiserfs. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92198f7eaa5df3479341dd8fa20c2c81aa3b1e25 Author: Christoph Hellwig Date: Thu Jun 23 22:00:59 2005 -0700 [PATCH] pass iocb to dio_iodone_t XFS will have to look at iocb->private to fix aio+dio. No other filesystem is using the blockdev_direct_IO* end_io callback. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16c29b67fb3bbacfc2a71f9e5f7d85728ef45efa Author: Michael Halcrow Date: Thu Jun 23 22:00:58 2005 -0700 [PATCH] eCryptfs: export user key type Export this symbol to GPL modules for eCryptfs: an out-of-tree GPL'ed filesystem. Signed off by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e30148c3d524a9c1c63ca28261bc24c457eb07a Author: David Howells Date: Thu Jun 23 22:00:56 2005 -0700 [PATCH] Keys: Make request-key create an authorisation key The attached patch makes the following changes: (1) There's a new special key type called ".request_key_auth". This is an authorisation key for when one process requests a key and another process is started to construct it. This type of key cannot be created by the user; nor can it be requested by kernel services. Authorisation keys hold two references: (a) Each refers to a key being constructed. When the key being constructed is instantiated the authorisation key is revoked, rendering it of no further use. (b) The "authorising process". This is either: (i) the process that called request_key(), or: (ii) if the process that called request_key() itself had an authorisation key in its session keyring, then the authorising process referred to by that authorisation key will also be referred to by the new authorisation key. This means that the process that initiated a chain of key requests will authorise the lot of them, and will, by default, wind up with the keys obtained from them in its keyrings. (2) request_key() creates an authorisation key which is then passed to /sbin/request-key in as part of a new session keyring. (3) When request_key() is searching for a k