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 t