summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] s390: show_cpuinfo fixHeiko Carstens2005-09-171-0/+2
| | | | | | | | | | Disable preemption in show_cpuinfo to avoid problems and the warning about smp_processor_id. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: crypto driver patch take 2Martin Schwidefsky2005-09-171-3/+0
| | | | | | | | | | | Got confused with the crypto update. The last patch added a call to destroy_workqueue() for a non-existent workqueue with the comment "Remove device workqueue on module unload". This is nonsense. Remove the offending hunk again. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: bl_dev array sizeHeiko Carstens2005-09-171-2/+2
| | | | | | | | | | Calculate correct size for bl_dev array. It should be 8KB instead of 512KB for 2^16 bits. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: default configurationMartin Schwidefsky2005-09-171-11/+25
| | | | | | | | Update default configuration of s390. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] MTD: Update SharpSL partition definitionsRichard Purdie2005-09-172-3/+9
| | | | | | | | | | Add partition definitions for the new Sharp Zaurus models Spitz (SL-C3000), Akita (SL-C1000) and Borzoi (SL-C3100) Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] SharpSL: Add missing hunk from backlight updateRichard Purdie2005-09-171-4/+5
| | | | | | | | | This hunk from the sharpsl/corgi backlight update appears to have got lost somewhere along the way. Its needed to match the other changes. Signed-Off-By: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] RAID6 Altivec fixH. Peter Anvin2005-09-174-10/+40
| | | | | | | | | This patch fixes a signedness bug with RAID6 for Altivec, and makes the Altivec code testable in userspace. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'release' of ↵Linus Torvalds2005-09-168-74/+292
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
| * [IA64] mca_drv cleanupHidetoshi Seto2005-09-163-70/+94
| | | | | | | | | | | | | | | | There were some trailing white spaces, long lines, brackets in weird style etc. This patch cleans them up. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * [IA64] Add Documentation/ia64/mca.txtKeith Owens2005-09-161-0/+194
| | | | | | | | | | | | | | | | Add Documentation/ia64/mca.txt, an ad-hoc collection of notes on IA64 MCA and INIT processing. Signed-off-by: Keith Owens <kaos@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * [IA64] Remove warnings for gcc 4.0 IA64 compilation.Peter Chubb2005-09-164-4/+4
| | | | | | | | | | | | | | | | This patch removes some compilation warnings, mostly trivially. acpi.c fix also noted by Kenji Kaneshige. Signed-off-by; Peter Chubb <peterc@gelato.unsw.edu.au> Signed-off-by: Tony Luck <tony.luck@intel.com>
* | [PATCH] cleanup whitespace in pci_ids.hKarsten Keil2005-09-161-1/+1
| | | | | | | | | | Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Add PCI IDs for Sitecom DC-105Karsten Keil2005-09-162-0/+4
| | | | | | | | | | | | | | Sitecom DC-105 PCI work with hfc_pci HiSax driver Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-09-1618-556/+612
|\ \
| * | [ARM] Tighten pfn_valid() test.Russell King2005-09-151-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thomas Gleixner reported that mmaping and unmapping each physical page in turn eventually caused the kernel to oops. It appears that pfn_valid() in the discontigmem case was too simplistic for proper operation. Tighten the logic so we also check if the PFN is within the range of the selected memory node. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 2914/1: PXA Poodle: Add MMC and UDC supportRichard Purdie2005-09-151-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie This patch adds MMC and UDC support to the PXA Poodle platform. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 2913/1: PXA Poodle: Cleanup some unneeded codeRichard Purdie2005-09-152-33/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie This patch cleans up the PXA Poodle platform code removing an unneeded static iomap. It also corrects errors in the platform header file and adds a missing GPIO define. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 2912/1: PXA Corgi: Cleanup some unneeded codeRichard Purdie2005-09-151-39/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie This patch cleans up the PXA Corgi platform code removing an unneeded static iomap, an unneeded function and some debug messages. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 2915/1: SA1100 Collie: Correct scoop device callsRichard Purdie2005-09-151-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie This patch adds a missing parameter to the scoop calls made by collie.c Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 2905/1: enable the ixp2000 i2c bus driver in ixp2000 defconfigsLennert Buytenhek2005-09-155-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lennert Buytenhek It's silly to have I2C enabled in all ixp2000 defconfigs but not to have the ixp2000 bus driver enabled in any of them. This patch enables CONFIG_I2C_IXP2000 for all in-tree ixp2000 boards. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 2904/1: update ixp2000 defconfigs to 2.6.13Lennert Buytenhek2005-09-155-445/+455
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lennert Buytenhek Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 2909/1: remove IXP2000_PROD_IDLennert Buytenhek2005-09-152-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lennert Buytenhek The intel docs call it IXP2000_PRODUCT_ID, and we have a definition for IXP2000_PRODUCT_ID as well, so IXP2000_PROD_ID can go. It's only used in one place. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 2911/1: ixp2000_reg_{read,write} accessorsLennert Buytenhek2005-09-151-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lennert Buytenhek This patch: - changes the ixp2000_reg_write accessor to take a 'volatile void *' instead of a 'volatile unsigned long *', which then allows passing in a u32 * as first argument without being greeted with a warning; and - adds an ixp2000_reg_read accessor. We can then use these accessors in ixp2000 code to access on-chip peripherals, instead of directly dereferencing pointers. This is for use by the ixp2000 microengine driver which was recently announced on netdev. We can't use readl/writel on the ixp2000 since it is usually run in big-endian mode, and on big-endian platforms, readl/writel perform byteswapping. A future patch will remove the readback from ixp2000_reg_write, since it's not needed to prevent erratum #66, and add manual readbacks to the places that need them (writes are not synchronous since we map in device space using XCB=101 nowadays), such as interrupt disabling and GPIO manipulation. See also: http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2005-February/027084.html Patch has been ACKed by Jeff Garzik. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Remove PFN_TO_NID for !DISCONTIGMEMRussell King2005-09-156-19/+0
| | | | | | | | | | | | | | | | | | | | | Platform classes need not define PFN_TO_NID when DISCONTIGMEM is not selected. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [PATCH] epca iomem annotations + several missing readw()Al Viro2005-09-162-46/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [originally sent to Alan, he had no problems with it] - iomem pointers marked as such - several direct dereferencings of such pointers replaced with read[bw](). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge branch 'upstream-fixes' of ↵Linus Torvalds2005-09-161-14/+23
|\ \ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * | | [libata] fix PIO completion raceJeff Garzik2005-09-161-14/+23
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we that completion is the final action we take; prior to this change, another CPU may have changed ap->pio_task_state before we tested it a final time. Spotted by, and original patch by Albert Lee @ IBM. Also includes a minor optimization: eliminate a ton of unnecessary queue_work() calls, simply by jumping to the beginning of the FSM function ata_pio_task().
* | | [PATCH] net: fix spider_net media detectionJens Osterkamp2005-09-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the driver work with any BladeCenter network switch, it used to work only with certain models. Please apply. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] 8139cp: allocate statistics space only when neededStephen Hemminger2005-09-161-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | Don't crash if ethtool statistics are requested and device is down. Fix is to allocate pci space for statistics only when needed. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] bonding: plug reference count leakJay Vosburgh2005-09-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bonding leaks route structures when the ARP monitor is configured to send probes over VLANs. Originally reported by Ian Abel <ian.abel@mxtelecom.com>; his original fix was modified by Jay Vosburgh to correct coding style and to close a leak it missed. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | Merge /spare/repo/linux-2.6/ Jeff Garzik2005-09-1680-605/+311
|\| |
| * | [PATCH] vc: Use correct size on buffer copy in vc_resizeAntonino A. Daplas2005-09-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the unlikely case of the new screen width much wider then the old, use (old_row_size * new_rows) instead of new_screen_size to prevent a buffer overrun during the copy. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] vgacon: Fix sanity checking in vgacon_resizeAntonino A. Daplas2005-09-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by: walt <wa1ter@myrealbox.com> "I routinely switch the console font during bootup to 8x8 so I can get 50 lines per screen. Until 09 Sept, just changing to the small font automatically gave me all 50 lines -- but now I'm only getting 25 lines even with the small font. The bottom half of the screen displays the text that already scrolled off the top." This bug is due to an erroneous check in the recently added hook, vgacon_resize(). It checks the new height against the original number of rows of the console. Because the original number of rows depends on both the scanline and the font height, check it instead against the scanline/fontheight. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] savagefb: Fix load failure of the Twister chipsetAntonino A. Daplas2005-09-153-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | - The Twister chipsets are actually prosavages. Reclassify them as such and remove the S3_SAVAGE_TWISTER id. - Fix i2c code if fb_firmware_edid() returns NULL Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] ppc64: Fix recent regressionJimi Xenidis2005-09-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noted by Olof Johansson <olof@lixom.net>: "A recent patch changed the way the LPAR bit is checked during early boot. This resulted in a polarity change in a conditional branch without changing the branch, causing at least some legacy machines to not boot." This fixes it. Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-09-1527-396/+42
| |\ \
| | * | [LIB]: Consolidate _atomic_dec_and_lock()David S. Miller2005-09-1526-396/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several implementations were essentialy a common piece of C code using the cmpxchg() macro. Put the implementation in one spot that everyone can share, and convert sparc64 over to using this. Alpha is the lone arch-specific implementation, which codes up a special fast path for the common case in order to avoid GP reloading which a pure C version would require. Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [COMPAT]: Fixup compat_do_execve()David S. Miller2005-09-151-0/+4
| | |/ | | | | | | | | | | | | | | | | | | Missing acct_update_integrals() and update_mem_hiwater() calls compared to it's native counterpart. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPV6]: Fix per-socket multicast filtering in sk_reuse caseDavid L Stevens2005-09-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per-socket multicast filters were not being applied to all sockets in the case of an exact-match bound address, due to an over-exuberant "return" in the look-up code. Fix below. IPv4 does not have this problem. Thanks to Hoerdt Mickael for reporting the bug. Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPVS]: ip_vs_ftp breaks connections using persistenceJulian Anastasov2005-09-154-17/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ip_vs_ftp when loaded can create NAT connections with unknown client port for passive FTP. For such expectations we lookup with cport=0 on incoming packet but it matches the format of the persistence templates causing packets to other persistent virtual servers to be forwarded to real server without creating connection. Later the reply packets are treated as foreign and not SNAT-ed. This patch changes the connection lookup for packets from clients: * introduce IP_VS_CONN_F_TEMPLATE connection flag to mark the connection as template * create new connection lookup function just for templates - ip_vs_ct_in_get * make sure ip_vs_conn_in_get hits only connections with IP_VS_CONN_F_NO_CPORT flag set when s_port is 0. By this way we avoid returning template when looking for cport=0 (ftp) Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPVS]: Really invalidate persistent templatesJulian Anastasov2005-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Agostino di Salle noticed that persistent templates are not invalidated due to buggy optimization. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BRIDGE-NF]: Fix iptables redirect on bridge interfaceBart De Schuymer2005-09-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Here's a slightly altered patch, originally from Mark Glines who diagnosed and fixed the problem. Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [MCAST]: Fix MCAST_EXCLUDE line dupesDenis Lukianov2005-09-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes line dupes at /ipv4/igmp.c and /ipv6/mcast.c in the 2.6 kernel, where MCAST_EXCLUDE is mistakenly used instead of MCAST_INCLUDE. Signed-off-by: Denis Lukianov <denis@voxelsoft.com> Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NETLINK]: Reserve a slot for NETLINK_GENERIC.David S. Miller2005-09-151-0/+1
| | | | | | | | | | | | | | | | | | As requested by Jamal. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TCP]: Compute in_sacked properly when we split up a TSO frame.Herbert Xu2005-09-152-7/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the SACK fragmenting code may incorrectly call tcp_fragment() with a length larger than the skb->len. This happens when the skb on the transmit queue completely falls to the LHS of the SACK. And add a BUG() check to tcp_fragment() so we can spot this kind of error more quickly in the future. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * Partially revert "Fix time going twice as fast problem on ATI Xpress chipsets"Linus Torvalds2005-09-152-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 66759a01adbfe8828dd063e32cf5ed3f46696181 introduced the fix for time ticking too fast on some boards by disabling one of the doubly connected timer pins on ATI boards. However, it ends up being _much_ too broad a brush, and that just makes some other ATI boards not work at all since they now have no timer source. So disable the automatic ATI southbridge detection, and just rely on people who see this problem disabling it by hand with the option "disable_timer_pin_1" on the kernel command line. Maybe somebody can figure out the proper tests at a later date. Acked-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge branch 'release' of ↵Linus Torvalds2005-09-154-11/+11
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
| | * Pull fix-offsets-h into release branchTony Luck2005-09-144-11/+11
| | |\
| | | * [IA64] fix circular dependency on generation of asm-offsets.hTony Luck2005-09-134-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Fix? One ugly hack is replaced by a different ugly hack. Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | | Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp Linus Torvalds2005-09-152-0/+18
| |\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 06:25:12 +0100