ChangeSet@1.2150, 2004-11-17 16:29:01-08:00, davem@nuts.davemloft.net [IPV6]: Set sk_prot early enough in inet6_create() It needs to be before the sk_set_owner() call else we OOPS. Signed-off-by: David S. Miller ChangeSet@1.2149, 2004-11-17 15:56:57-08:00, davem@nuts.davemloft.net Merge bk://kernel.bkbits.net/acme/sock-2.6 into nuts.davemloft.net:/disk1/BK/net-2.6 ChangeSet@1.2147.9.1, 2004-11-17 15:53:10-08:00, herbert@gondor.apana.org.au [IPV4/IPV6]: Remove frag_list check from output path. I've removed the frag_list check before fragmenting and we'll rely on dev_queue_xmit to fix things up if necessary. Any functions in between should do the right thing since they need to handle non-linear skb's anyway. Well that's the theory :) Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.2147.8.1, 2004-11-17 14:58:17-08:00, linux-dev@morknet.de [PATCH] fix dss1_divert fixes As noted by Bartlomiej, this makes the spinlock be a proper lock rather than just a local lock to each user. Signed-off-by: Steffen A. Mork Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.127, 2004-11-17 23:53:36+01:00, bzolnier@trik.(none) [ide] fix /proc/ide/hd?/settings to not spam logs On Thu, 11 Nov 2004 17:10:21 +0100, Jens Axboe wrote: > On Thu, Nov 11 2004, Alan Cox wrote: > > > + printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is " > > > + "obsolete, and will be removed soon!\n"); > > > + > > > > The above should be rate limited or on the write case moved to after > > the capable() check. A program polling these settings now makes a nasty > > noise and wipes the logs. A user can also do it intentionally. > > Or just print it once... Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2147.1.126, 2004-11-17 23:41:42+01:00, bzolnier@trik.(none) [ide] small IDE cleanups The patch below does the following small cleanups in the IDE code: - make some needlessly global code static - remove two unused functions from pdc202xx_new.c Signed-off-by: Adrian Bunk Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2147.1.125, 2004-11-17 23:18:40+01:00, bzolnier@trik.(none) [ide] remove RICOH CD-R/RW MP7083A from DMA blacklist From: Srihari Vijayaraghavan I have tested my RICOH CD-R/RW with this patch (on CD reading/writing), and it works just fine with DMA enabled. Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2147.1.124, 2004-11-17 23:14:55+01:00, bzolnier@trik.(none) [ide] "ide=nodma" printout fix From: Magnus Damm This simple patch changes the output from this: .. ide_setup: ide=nodmaIDE: Prevented DMA .. to this: .. ide_setup: ide=nodma : Prevented DMA .. Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2147.1.123, 2004-11-17 23:10:19+01:00, bzolnier@trik.(none) [ide] update documentation for ide params From: Magnus Damm This patch removes ide parameters marked as obsolete in the source and adds documentation for "ide=". I think I got it right, the important part for me is "ide=nodma". Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2147.1.122, 2004-11-17 23:06:35+01:00, bzolnier@trik.(none) [ide] no need to alloc sg_table in CRISv10 IDE driver Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2147.1.121, 2004-11-17 23:01:29+01:00, bzolnier@trik.(none) [ide] update CRISv10 IDE driver Signed-off-by: Mikael Starvik Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2147.1.120, 2004-11-17 08:14:52-08:00, linux-dev@morknet.de [PATCH] Make dss1_divert ISDN module work on SMP again When I switched my installation from kernel 2.4 to 2.6 I recognized that the ISDN module dss1_divert was marked incompilable (config option CONFIG_CLEAN_COMPILE must be turned off). The compile problem was the obsolete using of kernel 2.4 critical sections. I replaced the cli() stuff with spinlocks as explained in the Documentation/spinlocks.txt file. After that the module compiles and runs as expected. Signed-off-by: Steffen A. Mork Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.119, 2004-11-17 08:12:37-08:00, ak@suse.de [PATCH] x86-64: fix boot crash on VIA systems quirk_via_irqpic cannot be __devinit because it runs at pci_enable_device() time now. This fixes a boot time crash on a VIA x86-64 machine. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds ChangeSet@1.2147.7.5, 2004-11-16 22:11:48-08:00, davem@nuts.davemloft.net [SPARC64]: Update defconfig. Signed-off-by: David S. Miller ChangeSet@1.2147.7.4, 2004-11-16 22:11:16-08:00, davem@nuts.davemloft.net [SPARC64]: Do not set VM_LOCKED on I/O mapped areas. Use VM_RESERVED instead. Signed-off-by: David S. Miller ChangeSet@1.2147.7.3, 2004-11-16 22:10:02-08:00, davem@nuts.davemloft.net [SPARC64]: Two io_remap_page_range() fixes. 1) BUG on presence of existing mappings just as remap_pfn_range does 2) Perform TLB flush while holding page_table_lock Signed-off-by: David S. Miller ChangeSet@1.2147.7.2, 2004-11-16 22:08:03-08:00, davem@nuts.davemloft.net [SPARC64]: Couple of do_sparc64_fault fixes. 1) Use in_atomic() for atomicity check. 2) Add mmap_sem deadlock on bad kernel access prevention just as on i386 3) Use VM_FAULT_* macros instead of magic constants. Signed-off-by: David S. Miller ChangeSet@1.2147.5.23, 2004-11-16 17:39:02-08:00, chrisw@osdl.org [PATCH] a.out: error check on set_brk It's possible for do_brk() to fail during set_brk() when exec'ing and a.out. This was noted with Florian's a.out binary and overcommit set to 0. Capture this error and terminate properly. Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds ChangeSet@1.2147.5.22, 2004-11-16 17:38:48-08:00, chrisw@osdl.org [PATCH] setup_arg_pages can insert overlapping vma Florian Heinz built an a.out binary that could map bss from 0x0 to 0xc0000000, and setup_arg_pages() would be unhappt in insert_vma_struct because the arg pages overlapped. This just checks before inserting, and bails out if it would overlap. Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds ChangeSet@1.2147.5.21, 2004-11-16 17:38:30-08:00, chrisw@osdl.org [PATCH] binfmt_elf: handle p_filesz == 0 on PT_INTERP section Jakub Jelinek points out that current fix has an underflow problem if elf_ppnt->p_filesz == 0. Fix that up, and also stop overwriting interpreter buffer, simply check that it's NULL-terminated. From: Jakub Jelinek Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds ChangeSet@1.2147.6.3, 2004-11-16 17:29:15-08:00, dhowells@redhat.com [PATCH] Fork fix fix The attached patch fixes the fork fix to avoid the divide-by-zero error I'd previously fixed, but without using any sort of conditional. Signed-off-by: David Howells Signed-off-by: Linus Torvalds ChangeSet@1.2147.6.2, 2004-11-16 16:04:07-08:00, axboe@suse.de [PATCH] io context leak on queue drain If the drain flag is set on the queue, get_request() needs to drop the acquired iocontext to avoid leaks. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.116, 2004-11-16 23:19:52+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2251/1: S3C2410 - system timer rename [cosmetic] Patch from Ben Dooks Correct the name used when registering the system tick interrupt from S32410 to S3C2410. Signed-off-by: Dimitry Andric Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2147.5.19, 2004-11-16 18:41:58+00:00, dwmw2@shinybook.infradead.org MTD: Fix memory leak in FTL translation layer. Signed-off-by: David Woodhouse ChangeSet@1.2147.5.18, 2004-11-16 18:36:59+00:00, dwmw2@shinybook.infradead.org MTD: some cleanups The patch below makes the following cleanups for code under drivers/mtd/ : - make some needlessly global code static Signed-off-by: Adrian Bunk Signed-off-by: David Woodhouse ChangeSet@1.2147.6.1, 2004-11-16 10:22:33-08:00, Andries.Brouwer@cwi.nl [PATCH] net: scheduling policing fix Missing goto. Acked by Thomas Graf ChangeSet@1.2147.5.17, 2004-11-16 18:00:01+00:00, dwmw2@shinybook.infradead.org JFFS2: fix printk argument type warning fs/jffs2/gc.c:832: warning: signed size_t format, different type arg (arg 3) Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse ChangeSet@1.2147.5.16, 2004-11-16 17:45:47+00:00, dwmw2@shinybook.infradead.org JFFS2: jffs2_fs_i.h needs ... and should include it directly rather than hoping it's been done. Signed-off-by: David Woodhouse ChangeSet@1.2147.5.15, 2004-11-16 17:42:53+00:00, dwmw2@shinybook.infradead.org JFFS2: make sync() actually work by providing ->sync_fs method. Signed-off-by: David Woodhouse ChangeSet@1.2147.5.14, 2004-11-16 17:40:57+00:00, dwmw2@shinybook.infradead.org JFFS2: Remove redundant 'ino' arg from jffs2_get_inode_nodes() We had it already in the inocache structure we were being passed Signed-off-by: Artem Bityuckiy Signed-off-by: David Woodhouse ChangeSet@1.2147.5.13, 2004-11-16 17:37:54+00:00, dwmw2@shinybook.infradead.org JFFS2: locking fixes We weren't correctly holding a lock when adding raw nodes to the per-inode list. Signed-off-by: Artem Bityuckiy Signed-off-by: David Woodhouse ChangeSet@1.2147.5.12, 2004-11-16 17:28:13+00:00, dwmw2@shinybook.infradead.org MTD: Fix detection of hardware partitions in Intel flash chips Determine it from the CFI query data instead of hard-coding it. Signed-off-by: Nicolas Pitre Signed-off-by: David Woodhouse ChangeSet@1.2147.5.11, 2004-11-16 17:22:19+00:00, dwmw2@shinybook.infradead.org MTD: Avoid false positives in CFI probe due to floating data bus Signed-off-by: Russell King Signed-off-by: David Woodhouse ChangeSet@1.2147.5.10, 2004-11-16 17:19:38+00:00, dwmw2@shinybook.infradead.org MTD: Compile fix for the typo fix in ixp2000 map driver. Signed-off-by: Deepak Saxena Signed-off-by: David Woodhouse ChangeSet@1.2147.5.9, 2004-11-16 17:17:31+00:00, dwmw2@shinybook.infradead.org MTD: Fix Pb1550 board NAND driver to not read write-only registers Signed-off-by: Pete Popov Signed-off-by: David Woodhouse ChangeSet@1.2147.5.8, 2004-11-16 16:51:03+00:00, dwmw2@shinybook.infradead.org MTD: Fix oops after erase in NFTL/INFTL (DiskOnChip translation layers) Fix kernel NULL pointer dereference at mtd_erase_callback+6 when trying to insmod INFTL or NFTL modules. Signed-off-by: Kalev Lember Signed-off-by: David Woodhouse ChangeSet@1.2147.5.7, 2004-11-16 16:23:55+00:00, dwmw2@shinybook.infradead.org MTD: DiskOnChip driver fixes: MODULE_PARAM and __iomem, and fix RS init Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse ChangeSet@1.2147.5.6, 2004-11-16 16:00:48+00:00, dwmw2@shinybook.infradead.org MTD NAND drivers: cleanup MODULE_PARAM and bogus __iomem casts. Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse ChangeSet@1.2147.5.5, 2004-11-16 15:35:33+00:00, dwmw2@shinybook.infradead.org MTD: Fix suspend/resume on Intel flash chip driver We weren't correctly resetting our idea of the chip's state on suspend in all circumstances. Fix that. Signed-off-by: David Woodhouse ChangeSet@1.2147.5.4, 2004-11-16 15:20:56+00:00, dwmw2@shinybook.infradead.org MTD map/device driver cleanups -- remove bogus __iomem casts Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse ChangeSet@1.2147.5.3, 2004-11-16 15:04:25+00:00, dwmw2@shinybook.infradead.org MTD: DiskOnChip drivers should no longer require old docecc code. Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse ChangeSet@1.2147.5.2, 2004-11-16 14:42:51+00:00, dwmw2@shinybook.infradead.org MTD: Intel flash chip driver locking fixes. Cleanups and fixes in preparation for XIP support -- fix unbalanced use of get_chip() and put_chip(), and clean up the code a little in preparation for what's to come. Signed-off-by: Nicolas Pitre Signed-off-by: David Woodhouse ChangeSet@1.2147.5.1, 2004-11-16 13:48:09+00:00, dwmw2@shinybook.infradead.org RS library spelling fixes. Originally from Joe Perches Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse ChangeSet@1.2147.1.115, 2004-11-16 09:44:16+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2248/1: S3C2410 - missing serial config in arch/arm/mach-s3c2410/Kconfig Patch from Ben Dooks Add patch that should have been in 2247/1, defining CONFIG_S3C2410_LOWLEVEL_UART_PORT Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2147.1.114, 2004-11-15 20:12:51-08:00, miles@gnu.org [PATCH] Remove duplicate safe_for_read(READ_BUFFER) entry in scsi_ioctl.c Signed-off-by: Miles Bader Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.113, 2004-11-15 20:12:38-08:00, Markus.Lidel@shadowconnect.com [PATCH] i2o: converted SPIN_LOCK_UNLOCKED into spin_lock_init() - changed initialization of spin locks from SPIN_LOCK_UNLOCKED into spin_lock_init() Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.112, 2004-11-15 20:12:25-08:00, Markus.Lidel@shadowconnect.com [PATCH] i2o: changed old queueing code with wait_event API - removed old queueing code and replaced it with new wait_event API Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.111, 2004-11-15 20:12:13-08:00, Markus.Lidel@shadowconnect.com [PATCH] i2o: remove unused code and make needlessly global code static - remove unused code - make needlessly global code static Signed-off-by: Adrian Bunk Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.110, 2004-11-15 20:12:00-08:00, Markus.Lidel@shadowconnect.com [PATCH] i2o: changed code with BUG() to BUG_ON() - changed code with BUG() to use BUG_ON() which could be optimized by some platforms (original from Milton Miller) Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.109, 2004-11-15 20:11:47-08:00, adaplas@hotpop.com [PATCH] fbdev: Change the find_mode behavior let find_mode search for nearest refresh rate Signed-off-by: Alexander Kern Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.108, 2004-11-15 20:11:35-08:00, adaplas@hotpop.com [PATCH] fbdev: Fix typo in atyfb Fix typo, and decrease amount of output Signed-off-by: Alexander Kern Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.107, 2004-11-15 20:11:22-08:00, adaplas@hotpop.com [PATCH] fbdev: Fix cursor in doublescan mode in atyfb fix hw cursor in doublescan modes Signed-off-by: Alexander Kern Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.106, 2004-11-15 20:11:09-08:00, adaplas@hotpop.com [PATCH] fbdev: Allow mode change even if EDID block is not found - use symbol_get() to check for the presence of i2c - allow mode changing even if EDID block is not found (no I2C support) - fix crashes on chipsets that do not have i2c support - shorten string in info->fix.id - trivial chip name changes Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.105, 2004-11-15 20:10:56-08:00, adaplas@hotpop.com [PATCH] fbcon: Disable fbcon cursor if vt softcursor is enabled Problem reported by Gerd Knorr: (1) boot with vesafb (thats what I'm using, maybe it shows on other framebuffers and/or vgacon as well). (2) login into one terminal, then type "echo -ne '\033[?17;15;239c'". You should have a nice, yellow and *not* blinking cursor block. That is what I have in my .profile because I can't stand the blinking cursors. (3) Switch to another terminal. The cursor goes into blinking underscore mode now (i.e. the default cursor). (4) Switch back to the first terminal. Now you have a yellow block with the last two pixel lines (i.e. the underscore) blinking. This bug is caused by both fbcon_cursor and vt softcursor being active at the same time. Fix: - Disable fbcon_cursor if vt softcursor is active (vc->vc_cursor_type & 0x10) != 0. - Recheck/reload fbcon cursor for each vt switch Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.104, 2004-11-15 20:10:44-08:00, adaplas@hotpop.com [PATCH] fbdev: Support for bigger than 16x32 fonts in rivafb cursor - Add support for fonts bigger thatn 16x32 by dynamically allocating buffer based on font dimensions instead of statically allocating at 64 bytes. - use softcursor if cursor size exceeds 32x32. - fix rivafb_cursor if cursor width is not divisible by 2 Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.103, 2004-11-15 20:10:31-08:00, adaplas@hotpop.com [PATCH] fbdev: Support for bigger than 16x32 fonts in softcursor Fix crash if font font is bigger than 16x32 by dynamically allocating buffer based on font dimensions instead of statically allocating at 64 bytes. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.102, 2004-11-15 20:10:18-08:00, adaplas@hotpop.com [PATCH] fbdev: Fix for using >16 pixel wide font in fb console From: Jani Jaakkola : The first one was that fbcon_set_font() used one byte padding for fonts having width 16 <= width < 24, which was wrong since the pieces of code actually using the font did not use any padding. This is fixed in the included patch and also fbcon_set_font() is made a little cleaner. After the patch the following font is not garbled in fb console: http://www.cs.helsinki.fi/u/jjaakkol/psf/bitstream_vera_sans_mono_roman.16x30.psf The other bug is that fonts having height == 32 crash the kernel. I have no fix for this (at least not yet), but it can be reproduced with font: http://www.cs.helsinki.fi/u/jjaakkol/psf/bitstream_vera_sans_mono_roman.17x32.psf. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.101, 2004-11-15 20:10:05-08:00, sylvain.meyer@worldonline.fr [PATCH] fbdev: Add vram option to intelfb - add vram option to reserve more memory than stolen by BIOS if needed - fix intelfbhw_pan_display typo - add __initdata annotations Signed-off-by: Sylvain Meyer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.100, 2004-11-15 20:09:53-08:00, agk@redhat.com [PATCH] device-mapper: Allow referencing by device number Currently userspace code using the dm ioctls must refer to a mapped device by either its name or its uuid. But in some circumstances you know neither of those directly. This patch lets you reference devices by their major/minor numbers as an alternative. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.99, 2004-11-15 20:09:40-08:00, agk@redhat.com [PATCH] device-mapper: Add DM_TARGET_MSG Add DM_TARGET_MSG ioctl so data can be passed to a dm target after its table has been loaded. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.98, 2004-11-15 20:09:27-08:00, agk@redhat.com [PATCH] device-mapper: Fix some DMERR macro usage Fix some DMERR macro usage. It already adds : and \n. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.97, 2004-11-15 20:09:14-08:00, agk@redhat.com [PATCH] device-mapper: dm-crypt fix for zero-length key dm-crypt fix for zero-length key. Signed-Off-By: Christophe Saout Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.96, 2004-11-15 20:09:01-08:00, Andries.Brouwer@cwi.nl [PATCH] dm_init unresolved reference to _exits drivers/md/dm.c dm_int refers to _exits which is defined as __exitdata. With CONFIG_HOTPLUG=n, __exitdata is discarded. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.95, 2004-11-15 20:08:49-08:00, roland@topspin.com [PATCH] cdev_init: zero out cdev before kobject_init() Right now, cdev_init() works in a way that is not very intuitive. If a driver passes an uninitialized struct cdev to cdev_init(), then an uninitialized struct kobject will be passed to kobject_init(), which does kset_get() on kobj->kset, which probably points off into space and causes an oops. Drivers can work around this by zeroing out their struct cdev in advance (and indeed most if not all of the things passed to cdev_init() come from BSS) but I think it makes more sense for cdev_init() to live up to its name and actually work on an uninitialized cdev. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.94, 2004-11-15 20:08:36-08:00, paulus@samba.org [PATCH] Multilink fix for ppp_generic.c I released ppp-2.4.3 yesterday, with much improved support for multilink operation - when the first link is terminated, its pppd no longer exits immediately, but keeps running in order to keep the ppp interface up while there are other links still in the bundle. However, this shows up a bug in the kernel ppp driver, which is that there is no way for the pppd controlling the bundle to know when the last link in the bundle is terminated. This patch provides such a way: with this patch, pppd will get an EOF when reading from the /dev/ppp instance for the bundle when there are no channels connected. The change does not affect older versions of pppd or normal non-multilink operation (I have tested to make sure of that). Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.93, 2004-11-15 20:08:24-08:00, paulus@samba.org [PATCH] __iomem annotations for swim3.c This patch adds __iomem annotations to drivers/block/swim3.c. Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.92, 2004-11-15 20:08:11-08:00, paulus@samba.org [PATCH] power_state and __iomem for mediabay.c This patch does the power_state -> power.power_state conversion for drivers/macintosh/mediabay.c and makes it use void __iomem * for ioremap cookies. Once the IDE code is converted to not use unsigned long for MMIO register addresses, I will be able to remove a few casts from here. Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.91, 2004-11-15 20:07:58-08:00, paulus@samba.org [PATCH] Add __iomem annotations to drivers/scsi/mac53c94.c This patch adds __iomem annotations to drivers/scsi/mac53c94.c, and changes one use of st_le32 to writel. Signed-off-by: Paul Mackerras Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.90, 2004-11-15 20:07:45-08:00, paulus@samba.org [PATCH] Do power_state conversion for mesh.c This patch changes dev.power_state to dev.power.power_state in drivers/scsi/mesh.c, and fixes an uninitialized variable use in a printk. Signed-off-by: Paul Mackerras Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.89, 2004-11-15 20:07:33-08:00, paulus@samba.org [PATCH] Fix pmac_zilog.c so it compiles again It seems that pmac_zilog.c got missed in the dev.power_state to dev.power.power_state conversion. This patch makes that change, and also fixes a problem where it would not compile if CONFIG_MAGIC_SYSRQ was set but CONFIG_SERIAL_CORE_CONSOLE was not. Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.88, 2004-11-15 20:07:20-08:00, ysato@users.sourceforge.jp [PATCH] CONFIG_UNIX98_PTY=n warning fix ptmx_open() only exists if CONFIG_UNIX98_PTYS. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.87, 2004-11-15 20:07:07-08:00, akpm@osdl.org [PATCH] sound_alloc_dmap memory allocation warning suppression alloc_pages() failures are expected here. Manually prevent warnings. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.86, 2004-11-15 20:06:54-08:00, juerg@paldo.org [PATCH] Don't remove /sys in initramfs Using the "resume" kernel parameter together with an initramfs revealed a bug that causes removal of the /sys directory in the initramfs' tmpfs, making the system unbootable. The source of the problem is that the try_name() function removes the /sys directory unconditionally, instead of removing it only when it has been created by try_name(). The attached patch only removes /sys if it has been created before. Signed-off-by: Juerg Billeter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.85, 2004-11-15 20:06:42-08:00, bunk@stusta.de [PATCH] kill lockd_syms.c The patch below kills lockd_syms.c. Signed-off-by: Adrian Bunk Acked-by: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.84, 2004-11-15 20:06:29-08:00, neilb@cse.unsw.edu.au [PATCH] kNFSd: fix d_find_alias brokenness 10 weeks ago, http://linux.bkbits.com:8080/linux-2.5/cset@415b3380pxf4sB97gM8ujLqDxi6GfQ The patch was mostly right, and fixed a real problem, but missed a bit. It passed the job of checking if an inode had a current alias off to d_find_alias instead of open-coding it in d_alloc_anon. However there is one case where d_alloc_anon would not return the right dentry. That case being when the inode was for the root of the filesystem. The root is a special case because it is not hashed. All other dentries that are not hashed are quite un-interesting: There are "unlinked" but not yet closed. The root of a filesystem is unhashed, but is interesting. Allowing d_find_alias to return an unhashed alias for a directory solves this problem. It is safe because callers of d_find_alias on a directory inode either have a name for the inode already (so finding an unlinked directory by mistake is impossible) or will soon be looking for a name and will drop the dentry if a name is not found. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.83, 2004-11-15 20:06:16-08:00, shaggy@austin.ibm.com [PATCH] radix_tree_delete() fix I was looking through the radix tree code and came across what I think is a bug in radix_tree_delete. for (idx = 0; idx < RADIX_TREE_TAG_LONGS; idx++) { if (pathp[0].node->tags[tag][idx]) { tags[tag] = 1; nr_cleared_tags--; break; } } The above loop should only be executed if tags[tag] is zero. Otherwise, when walking up the tree, we can decrement nr_cleared_tags twice or more for the same value of tag, thus potentially exiting the outer loop too early. Ensure that nr_cleared_tags is only decremented once for each tag. Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.82, 2004-11-15 20:06:03-08:00, schwidefsky@de.ibm.com [PATCH] s390: zfcp act enhancements From: Andreas Herrmann From: Maxim Shchetynin zfcp host adapter changes: - Add access control enhancements. - Add event callbacks. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.81, 2004-11-15 20:05:50-08:00, schwidefsky@de.ibm.com [PATCH] s390: zfcp read-only lun sharing From: Volker Sameske zfcp host adapter: - Add read-only lun sharing feature. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.80, 2004-11-15 20:05:37-08:00, schwidefsky@de.ibm.com [PATCH] s390: zfcp host adapter From: Andreas Herrmann zfcp host adapter change: - Avoid usage of unregister debug feature. - Avoid race when unregistering debug feature. - Corrected some log messages for WKA ports. - Don't pass NULL pointer to debug_register_view and debug_set_level. - Some coding style cleanup. - Fix race between scsi_add_device and deregistration of the adapter. - Shorten & rename zfcp_els/zfcp_els_handler. - Remove unused code for unused ELS commands. - Evaluate response instead of request in adisc handler. - Allocate qdio queue structures below 2GB. - Remove ifdefs around ioctl32.h. - Use CONFIG_COMPAT instead of CONFIG_S390_SUPPORT. - Use semaphore in zfcp_ccw_shutdown. - Strip down debug_register/debug_unregister. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.79, 2004-11-15 20:05:25-08:00, schwidefsky@de.ibm.com [PATCH] s390: crypto driver From: Eric Rossman s390 crypto driver changes: - Small cleanup: misc -> crypto, header file defines, variable names and a printk message. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.78, 2004-11-15 20:05:12-08:00, schwidefsky@de.ibm.com [PATCH] s390: monreader docu From: Gerald Schaefer Docu for the z/VM monitor record read access feature. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.77, 2004-11-15 20:04:59-08:00, schwidefsky@de.ibm.com [PATCH] s390: 3270 console 3270 console driver changes: - Add error handling in 3270 device startup. - Do halt_io if startup has been interrupted. - Fix reference counting in tty timers. - Simplify set_timer functions. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.76, 2004-11-15 20:04:46-08:00, schwidefsky@de.ibm.com [PATCH] s390: dasd driver From: Stefan Weinhuber dasd driver changes: - Fix parameter parsing to allow sequences of devices, ranges and keywords. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.75, 2004-11-15 20:04:33-08:00, schwidefsky@de.ibm.com [PATCH] s390: common i/o layer From: Cornelia Huck From: Thomas Spatzier common i/o layer changes: - Prevent double unregister of ccw devices. - Move unregister out of the subchannel remove function, to avoid live-lock due to hotplug if the root device is currently indisposed. - Delete pending timer after a machine check. - Revert change to allocate qdio queues and SLIBS in DMA memory. - Decrement ccw_device_init_count only after ccw_device_register is done. - Remove unnecessary check in ccw_hotplug. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.74, 2004-11-15 20:04:20-08:00, schwidefsky@de.ibm.com [PATCH] s390: core changes From: Stefan Bader From: Martin Schwidefsky s390 core changes: - Store correct set of registers to core dumps. - Fix make install with separate obj directory. - Regenerate default configuration. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.73, 2004-11-15 20:04:08-08:00, jdike@addtoit.com [PATCH] uml: defconfig update Update defconfig. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.72, 2004-11-15 20:03:55-08:00, jdike@addtoit.com [PATCH] uml: remove some dead code Bodo pointed out that arch/um/kernel/skas/exec_user.c is dead code, so this removes it. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.71, 2004-11-15 20:03:42-08:00, jdike@addtoit.com [PATCH] uml: Remove unused declaration Remove an unused declaration of time_stamp(). Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.70, 2004-11-15 20:03:30-08:00, jdike@addtoit.com [PATCH] uml: LFS 64-bit cleanups Add ARCH_USER_CFLAGS so the arches can modify USER_CFLAGS. We now take __ARCH_WANT_OLD_STAT and __ARCH_WANT_STAT64 from the base arch so that the LFS-64 code gets included or excluded automatically. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.69, 2004-11-15 20:03:17-08:00, jdike@addtoit.com [PATCH] uml: fix definitions of pte_unmap_* Some definitions of pte_unmap_* macros were written for HIGHPTE, which UML doesn't support. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.68, 2004-11-15 20:03:04-08:00, jdike@addtoit.com [PATCH] uml: Don't delay segfaults From: Bodo Stroesser This one covers the fact, that the SIGSEGV signal, which is created by force_sigsegv() in case of an error in handle_signal(), is not delivered to the user immediately. In the worst case it even could be masked if a sigprocmask() systemcall follows immediately after return from kernel. The patch is relevant for other architectures, too. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.67, 2004-11-15 20:02:51-08:00, jdike@addtoit.com [PATCH] uml: fix signal mask on delivery error From: Bodo Stroesser If the user stack limit is reached or the signal stack assigned with sigaltstack() is invalid when a user signal handler with SA_ONSTACK has to be started, the signal mask of the interrupted user program is modified. This happens because the mask, that should be used with the handler only, is written to "current->blocked" even if the handler could not be started. But without a handler, no rewrite of the original mask at sys_sigreturn will be done. A slightly different case is sys_sigsuspend(), where the mask is already modified when kern_do_signal() is started. "*oldset" and "current->blocked" are not equal here and thus current->blocked has to be set to *oldset, if an error occurs in handle_signal(). For both cases I've written small tests, and with the patch the result is OK. This issue is relevant for other architectures too (e.g. i386, I've seen). Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.66, 2004-11-15 20:02:38-08:00, jdike@addtoit.com [PATCH] uml: make signal frame construction more resemble x86 From: Bodo Stroesser This makes the UML signal frame construction interface somewhat more similar to x86 than before. Also, some small code cleanup, and checking for errors before changing the signal mask in the SA_NODEFER case. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.65, 2004-11-15 20:02:26-08:00, jdike@addtoit.com [PATCH] uml: fix setting of interrupted syscall return value From: Bodo Stroesser handle_signal now checks whether it is being called from a system call invocation. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.64, 2004-11-15 20:02:13-08:00, jdike@addtoit.com [PATCH] uml: handle_signal simplification From: Bodo Stroesser Move the signal delivery code around to eliminate a couple of temporary variables. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.63, 2004-11-15 20:02:00-08:00, jdike@addtoit.com [PATCH] uml: redundant argument removal from handle_signal From: Bodo Stroesser Change the interface to handle_signal so that it doesn't take the system call return value as an argument and eliminate its return value. kern_do_signal also now doesn't return immediately after determining that there is no signal to deliver. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.62, 2004-11-15 20:01:50-08:00, jdike@addtoit.com [PATCH] uml: redundant code removal from signal delivery From: Bodo Stroesser Change the do_signal interface to eliminate its argument. Also, remove the calls from the system call handlers since they are redundant. In all cases, pending signals are checked for in the interrupt handler. Temporarily, do_signal passes the current error to kern_do_signal. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.61, 2004-11-15 20:01:37-08:00, jdike@addtoit.com [PATCH] uml: don't rule out syscall_nr == 0 From: Bodo Stroesser Change the valid system call numbers to reflect the possibility that we could have __NR_restart_syscall. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.60, 2004-11-15 20:01:24-08:00, jdike@addtoit.com [PATCH] uml: 64-bit type cleanups 64-bit cleanliness - Fix the number of bits of the time_t field in the COW header to be 32 and change an int to a longs. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.59, 2004-11-15 20:01:12-08:00, jdike@addtoit.com [PATCH] uml: 64-bit cleanups in the system calls 64-bit cleanup - this fixes the return values of the system calls to be longs. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.58, 2004-11-15 20:01:00-08:00, jdike@addtoit.com [PATCH] uml: signal bug fix This patch fixes a bug introduced in the last batch of signal fixes. The system call return value should only be reset if called diectly from a system call, i.e. sigsuspend. The fixes added earlier caused any interrupted non-zero system call return to be reset, confusing fork and vfork, among others. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.57, 2004-11-15 20:00:47-08:00, takata@linux-m32r.org [PATCH] m32r: update dot.gdbinit files This patch is for updating GDB initalization files (dot.gdbinit*) for all m32r target boards. Currently, part of dot.gdbinit* files are maintained by using a "gen_gdbinit" script. http://www.linux-m32r.org/eng/download.html#othertools Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.56, 2004-11-15 20:00:34-08:00, takata@linux-m32r.org [PATCH] m32r: update defconfig files Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.55, 2004-11-15 20:00:21-08:00, takata@linux-m32r.org [PATCH] m32r: CF boot support for Mappi2 - Update io_mappi2.c to access a CF device as an IDE disk device for Mappi2 eva board. - Please set CONFIG_M32R_CFC=n, when you use m32r-g00ff for CF boot. Signed-off-by: NIIBE Yutaka Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.54, 2004-11-15 20:00:08-08:00, takata@linux-m32r.org [PATCH] m32r: update for m32r-g00ff This patchset was originally from NIIBE Yutaka. These patch update the m32r kernel for a new bootloader "m32r-g00ff". The "m32r-g00ff" has been written and developed by NIIBE Yutaka, and released under the GPL from http://www.gniibe.org/. So far, it supports two types of booting operations, CF boot and Network boot (HTTP boot). * CF boot - boot from CompactFlash or Microdrive(TM) We can boot a kernel from CF device. To make use of m32r-g00ff, we just put a first stage IPL(initial program loader) into a flash memory, and a secondary bootloader into CF media device. Currently, LILO-21.4.4 can be used to write m32r-g00ff into the boot sector of CF device on a cross development environment. * HTTP boot - boot via network with HTTP protocol By using m32r-g00ff, we can download and boot a kernel image from a web-server. The m32r-g00ff downloads a kernel image from a given URL, resolving the webserver's IP address by DNS. As a preparation, we just place a secondary bootloader binary and a kernel image on the webserver. - Position-independent zImage support; this aims at removing constraints of zImage(vmlinuz)'s location. Signed-off-by: NIIBE Yutaka Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.53, 2004-11-15 19:59:56-08:00, ysato@users.sourceforge.jp [PATCH] H8/300: vmlinux.lds.S update - duplicate define section delete. - fix CONFIG_ROMKERNEL. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.52, 2004-11-15 19:59:43-08:00, ysato@users.sourceforge.jp [PATCH] H8/300: read{b,w,l} / write{b,w,l} error fix read{b,w,l} and write{b,w,l} compile error fix. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.51, 2004-11-15 19:59:30-08:00, ysato@users.sourceforge.jp [PATCH] H8/300: signal handling update Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.50, 2004-11-15 19:59:18-08:00, ysato@users.sourceforge.jp [PATCH] H8/300: /proc/cpuinfo typo fix Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.49, 2004-11-15 19:59:05-08:00, rddunlap@osdl.org [PATCH] x86_64 hpet: fix function warning put function prototype outside of #ifdef block, to fix: arch/x86_64/kernel/time.c:941: warning: implicit declaration of function `oem_force_hpet_timer' Signed-off-by: Randy Dunlap Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.48, 2004-11-15 19:58:52-08:00, macro@linux-mips.org [PATCH] i386: apic_printk() used before initialized Both detect_init_APIC() and init_apic_mappings() it's called from are invoked early, before the command line has been processed. Therefore its meaningless to call apic_printk() from them as that depends on apic_verbosity which is initialized from the command line. I could move apic_verbosity initialization to parse_cmdline_early(), but I think that would be an overkill, the point being we are initerested in feedback from detect_init_APIC() anyway. Without that it's hard to tell what's really going on as it's been the case with the recent report of the local APIC being non-functional despite the whole setup being apparently correct. So I converted these calls to ordinary printk() invocations. The init_apic_mappings() are less interesting, so I've made them output at the debug level. While at it I've made some obvious nearby formatting clean-up. Signed-off-by: Maciej W. Rozycki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.47, 2004-11-15 19:58:40-08:00, fenghua.yu@intel.com [PATCH] add cpu_relax() in spin loops & clean up barrier() The patch adds cpu_relax() in the body of some spin loops for 2.6.9. The patch also removes redundant barrier() code after cpu_relax() on ia32. In the PAUSE instruction section, IA32 SDM claims "it is recommended that a PASUE instruction be placed in all spin-wait loops". And x86_64 SDM says that PAUSE instruction is same as legacy mode in IA-32e mode operation. This patch is against 2.6.9 (kernel.org). It was tested on ia32 and x86_64. Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.46, 2004-11-15 19:58:27-08:00, sfr@canb.auug.org.au [PATCH] ppc64: add missing braces to rtc driver This patch fixes the PPC64 rtc driver where a pair of braces was missing. Not a big bug, but a bug none the less. Also, while I was there, use C99 initialisers. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.45, 2004-11-15 19:58:14-08:00, sfr@canb.auug.org.au [PATCH] ppc64 iSeries: don't share request queues in viocd This patch fixes the virtual cdrom driver to not share a single request queue. Sharing the queue causes an oops if you remove the module and more than one cdrom exists. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.44, 2004-11-15 19:58:02-08:00, paulus@samba.org [PATCH] PPC64 rtasd: window when error_log_cnt could get zeroed This patch is from Jake Moilanen . There appears to be a hole that if we get an log_error() call, that we could zero out our error log count in nvram. When rtasd() starts up, it turns on the logging via 'no_more_logging = 0'. If we get a log_error() call after that is set but before nvram_read_error_log has actually read nvram to set error_log_cnt, the log_error() call will write back to nvram a uninitialized error_log_cnt value, and wipe out our sequence number. To close the hole, simply move the 'no_more_logging = 0' till after nvram sets error_log_cnt but before pSeries_log_error is called. I also changed the 'no_more_logging' variable to be 'no_logging' since it's not only used when we stop logging now. I also removed the "volatile" part of no_more_logging, since it's unneeded. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.43, 2004-11-15 19:57:49-08:00, paulus@samba.org [PATCH] PPC64 call ibm,os-term only if its available This patch is from Olaf Hering. The rtas property 'ibm,os-term' is not available on JS20, a panic will print: unable to mount root filesystem on /dev/hda Kernel panic - not syncing: Attempted to kill init! <0>ibm,os-term call failed -1 Rebooting in 42 seconds.. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.42, 2004-11-15 19:57:36-08:00, anton@samba.org [PATCH] ppc64: cleanups hpte_init_native, kill warning for !PSERIES builds From: Christoph Hellwig This splits out a small helper that checks whether tlb batching should be enabled from hpte_init_native, thus cleaning up the ifdef hell and killing a warning for pmac builds. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.41, 2004-11-15 19:57:23-08:00, anton@samba.org [PATCH] ppc64: alloc_bootmem returns void * As Andrew points out, there is no need for casts since alloc_bootmem returns void*. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.40, 2004-11-15 19:57:11-08:00, anton@samba.org [PATCH] ppc64: get_phb_reg_prop only required on python PCI machines get_phb_reg_prop was only used for python PCI machines, so remove it from common code and call it from there. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.39, 2004-11-15 19:56:58-08:00, anton@samba.org [PATCH] ppc64: remove BUG()s in pcibios_fixup_bus BUG() on missing IO or memory resources in pcibios_fixup_bus is rude, remove it. Also use list_for_each_entry. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.38, 2004-11-15 19:56:46-08:00, anton@samba.org [PATCH] ppc64: OF overrides for pci_probe_only, pci_assign_all_buses Allow pci_probe_only and pci_assign_all_buses to be modified via OF properties. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.37, 2004-11-15 19:56:33-08:00, anton@samba.org [PATCH] ppc64: remove duplication in pci_alloc_* We duplicated the code in pci_alloc_pci_controller twice and had an ifdef for iseries as well, just to select between kmalloc and bootmem memory. Change this so we instead pass the allocation into a common function - pci_setup_pci_controller. Also use a spinlock around the host_list and global_phb_number code since we now can modify it at runtime via hotplug. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.36, 2004-11-15 19:56:20-08:00, anton@samba.org [PATCH] ppc64: make fixup_winbond_82c105 pseries specific The winbond irq fixup is pSeries specific. Move it into pSeries_pci.c and check for PLATFORM_PSERIES. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.35, 2004-11-15 19:56:10-08:00, anton@samba.org [PATCH] ppc64: remove phb_set_model phb_set_model does a lot of work just to set up a text string that almost nothing uses. Replace this all with an is_python() check. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.34, 2004-11-15 19:55:57-08:00, anton@samba.org [PATCH] ppc64: pci cleanup Cleanup ppc64 pci code. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.33, 2004-11-15 19:55:46-08:00, anton@samba.org [PATCH] ppc64: reduce ifdef clutter in arch/ppc64/kernel/sysfs.c From: Christoph Hellwig Reduce ifdef clutter in arch/ppc64/kernel/sysfs.c Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.32, 2004-11-15 19:55:34-08:00, anton@samba.org [PATCH] ppc64: avoid 32bit only syscalls in unistd.h Steve Munroe points out that ppc64 glibc builds stubs for a number of 32bit only syscalls. While none of them exist in the kernel syscall table, their existence in unistd.h means glibc still tries to use them then falls back onto the 64bit safe versions. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.31, 2004-11-15 19:55:21-08:00, anton@samba.org [PATCH] ppc64: Use pci_device_to_OF_node PCI_GET_DN() doesnt check to see if ->sysdata has been initialised correctly - we should instead use pci_device_to_OF_node. Leave PCI_GET_DN() in the one performance critical case (iommu table lookup in pci DMA functions). In this case ->sysdata is guaranteed to have been initialised by the iommu setup code. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.30, 2004-11-15 19:55:09-08:00, anton@samba.org [PATCH] ppc64: ratelimit some rtas errors Use printk_ratelimit() in rtc code to avoid flooding the kernel log buffer with errors. Also use rtas_get_error_log_max() instead of duplicating it in __fetch_rtas_last_error. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.29, 2004-11-15 19:54:56-08:00, david@gibson.dropbear.id.au [PATCH] ppc64: Kill unused KRANGE_{START,END} macros Remove KRANGE_{START,END} macros from ppc64 code. These were not used anywhere. Further KRANGE_END was misleading, since it implied a limit on the linear mapping range based on the pagetable structure, whereas in fact the linear mapping does not use a (Linux) pagetable at all. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.28, 2004-11-15 19:54:43-08:00, scheel@vnet.ibm.com [PATCH] ppc64: iSeries legacy model emulation of PURR Here's a patch to extend the current Linux on Power support for PURR to legacy IBM iSeries servers (pre-Power5 processor models). This patch enables the reporting of timebase metrics to reflect physical processor utilization in a system running multiple logical partitions which share the same physical processors. The patch simply uses existing user interfaces for Linux IBM Power5 based servers to report data already collected by the hypervisor. The values reported with each call are running values in units of the system timebase. The calculation of physical processor utilization results from two samples (purr1 and purr2) differing by a know interval (time) such that: physical utilization = (purr2 - purr1) / (time * number of procs * timebase) where the number of procs and timebase can be obtained from /proc/cpuinfo. Applications have been written to the interface already defined and these applications have value back on the legacy iSeries models. Signed-off by: Jeff Scheel (scheel at vnet.ibm.com) Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.27, 2004-11-15 19:54:31-08:00, trini@kernel.crashing.org [PATCH] ppc32: Fix Motorola Sandpoint builds Motorola Sandpoint builds broke recently, as part of the pci_find_device -> pci_get_device change. The following is the trivial fix. Signed-off-by: Tom Rini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.26, 2004-11-15 19:54:18-08:00, hugh@veritas.com [PATCH] tmpfs free_inodes leak When new_inode failed, shmem_get_inode forgot to restore free_inodes. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.25, 2004-11-15 19:54:05-08:00, hugh@veritas.com [PATCH] low discontig highmem_start_page In the case of i386 CONFIG_DISCONTIGMEM CONFIG_HIGHMEM without highmem, highmem_start_page was wrongly initialized (from a NULL zone_mem_map), causing __change_page_attr to BUG on boot. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.24, 2004-11-15 19:53:53-08:00, piggin@cyberone.com.au [PATCH] mm: tune the page allocator thresholds without patch: pages_min pages_low pages_high dma 4 8 12 normal 234 468 702 high 128 256 384 with patch: pages_min pages_low pages_high dma 17 21 25 normal 939 1173 1408 high 128 160 192 without patch: | GFP_KERNEL | GFP_ATOMIC allocate immediately | 9 dma, 469 norm | 9 dma, 469 norm allocate after waking kswapd | 5 dma, 234 norm | 3 dma, 88 norm allocate after synch reclaim | 5 dma, 234 norm | n/a with patch: | GFP_KERNEL | GFP_ATOMIC allocate immediately | 22 dma, 1174 norm | 22 dma, 1174 norm allocate after waking kswapd | 18 dma, 940 norm | 6 dma, 440 norm allocate after synch reclaim | 18 dma, 940 norm | n/a So the buffer between GFP_KERNEL and GFP_ATOMIC allocations is: 2.6.8 | 465 dma, 117 norm, 582 tot = 2328K 2.6.10-rc | 2 dma, 146 norm, 148 tot = 592K patch | 12 dma, 500 norm, 512 tot = 2048K Which is getting pretty good. kswap starts at: 2.6.8 477 dma, 496 norm, 973 total 2.6.10-rc 8 dma, 468 norm, 476 total patched 17 dma, 939 norm, 956 total So in terms of total pages, that's looking similar to 2.6.8. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.23, 2004-11-15 19:53:40-08:00, ak@suse.de [PATCH] x86-64: Fix get_user_pages access to vsyscall page The current kernel oopses on x86-64 when gdb steps into the vsyscall page. This patch fixes it. I also removed the bogus NULL checks of *_offset and replaced them with proper _none checks. I made them BUGs because vsyscall pages should be always mapped. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.4.10, 2004-11-15 18:53:03-08:00, herbert@gondor.apana.org.au [IPV6]: Fix xfrm6_tunnel_check_size mtu calc. OK, let's make it the same as IPv4. This is still broken as the calculation is wrong. However, to fix it properly we need to store the MTUs inside the dst's. I'll get around to that sooner or later. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.2147.4.9, 2004-11-15 15:53:41-08:00, davem@nuts.davemloft.net [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller ChangeSet@1.2147.4.8, 2004-11-15 15:41:51-08:00, mchan@broadcom.com [TG3]: 5753 support and a bug fix. Add support for 5753 chips which is mostly just adding in the appropriate PCI ids and recognizing that these chips do not use GPIO2 for Vaux switching. Also do not set DMA read water mark on PCI Express. In such configurations these bits are reserved. Signed-off-by: David S. Miller ChangeSet@1.2147.1.19, 2004-11-15 15:15:08-08:00, Andries.Brouwer@cwi.nl [PATCH] fix appletalk locking Just tried the new toy. It works. ChangeSet@1.2147.4.7, 2004-11-15 15:12:04-08:00, davem@nuts.davemloft.net Merge bk://212.42.230.204/nf-2.6 into nuts.davemloft.net:/disk1/BK/net-2.6 ChangeSet@1.2147.4.6, 2004-11-15 15:05:28-08:00, kaber@trash.net [SCTP]: Fix inetaddr notifier chain corruption Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.2147.4.5, 2004-11-15 15:01:05-08:00, rusty@rustcorp.com.au [NETFILTER]: Fix stack leakage in iptables Found running netfilter code under valgrind: we return some uninitialized stack to userspace (needs root). Almost certainly harmless, but this suppressed the valgrind complaint, and doesn't hurt. Signed-off-by: Rusty Russell Signed-off-by: David S. Miller ChangeSet@1.2147.4.4, 2004-11-15 14:59:52-08:00, rusty@rustcorp.com.au [NETFILTER]: Cleanup find_appropriate_src() Fix The fix to find_appropriate_src left a stupid test, which has no effect but is incoherent at best. It covers a corner case: if a previous connection from this source was mapped onto a different IP address (because it was explicitly told to), should the next one be mapped that was as well, if no explicit rule says to remap the src IP? I think the answer is yes: unless the user explicitly tells us to map into a particular range, we should follow the Kegel draft. Signed-off-by: Rusty Russell Signed-off-by: David S. Miller ChangeSet@1.2147.4.3, 2004-11-15 14:58:11-08:00, herbert@gondor.apana.org.au [NETLINK]: Fix mc_list operations While doing the 2.4 version of the netlink patch, I noticed a bug in my mc_list code. First of all it wasn't holding the table lock when adding nodes to the list. It also didn't take the node off the list when multicast is switched off. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.2147.4.2, 2004-11-15 14:09:05-08:00, davem@nuts.davemloft.net [IPV6]: Temp fix for ipv6 link-local address problem. Make sure loopback_dev, if up, has the ipv6 bits for it setup before the addrconf netdev notifier is registered. Signed-off-by: David S. Miller ChangeSet@1.2147.4.1, 2004-11-15 14:04:37-08:00, davem@nuts.davemloft.net [AF_UNIX]: Serialize dgram read using semaphore just like stream. Signed-off-by: David S. Miller ChangeSet@1.2086.3.9, 2004-11-15 22:03:23+01:00, kernel@linuxace.com [NETFILTER]: revert MASQUERADE optimization for mostly static IPs Signed-off-by: Phil Oester Signed-off-by: Patrick McHardy ChangeSet@1.2086.3.7, 2004-11-15 21:28:15+01:00, kaber@coreworks.de Merge coreworks.de:/home/kaber/src/nf/nf-2.6-ipq into coreworks.de:/home/kaber/src/nf/nf-2.6 ChangeSet@1.2147.1.17, 2004-11-15 12:01:43-08:00, bgerst@quark.didntduck.org [PATCH] Regparm for x86 machine check handlers The patch to change traps and interrupts to the fastcall convention missed the machine check handlers. Signed-off-by: Brian Gerst Signed-off-by: Linus Torvalds ChangeSet@1.2147.3.5, 2004-11-15 19:46:58+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2247/1: S3C2410 - serial low-level updates Patch from Ben Dooks Move the configuration for the UART to use for the low-level messages generated by the uncompressor out of the kernel debug section, which means the system builds properly without having kernel debug enabled. Also remove the use of including headers, and the default configuration updates Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2147.3.4, 2004-11-15 19:41:54+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2246/1: S3C2410 - rename i2c depending on 2410/2440 Patch from Ben Dooks Ensure the i2c platform device has the correct name if the system is an s3c2440. Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2147.3.3, 2004-11-15 19:36:46+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2243/1: BAST - move pm init to init_machine Patch from Ben Dooks Move the pm code to use the machine's init_machine code, instead of an late_initcall(). This change is as-per the documentation, and means we do not need to check for machine type in the init code. Thanks to Dimitry Andric for pointing this out Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2147.3.2, 2004-11-15 19:31:26+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2242/1: BAST - default configuration update Patch from Ben Dooks Updates for the Simtec BAST (EB2410ITX) default configuration to fix the following: - add mtd support for NAND and NOR - remove PC style parallel port (does not build) - use S3C2410 core RTC for time - remove non-bast S3C2410 machines Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2147.3.1, 2004-11-15 19:25:57+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2241/1: S3C2410 - default configuration update Patch from Ben Dooks updates to the default configuration to change the following: - use S3C2410 internal rtc instead of PC style rtc - add mtd support for nand - add mtd support for nor (and bast nor mapping) Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2147.2.2, 2004-11-15 19:20:42+00:00, rmk@flint.arm.linux.org.uk [SERIAL] s3c2410: remove duplicate include ChangeSet@1.2147.2.1, 2004-11-15 19:13:16+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2234/3: S3C2410 - new serial driver (1/4) Patch from Ben Dooks S3C2410/S3C2440 new serial driver this patch includes the following - clock selection using clock core - handling for both 2410 and 2440 uarts - uart suspend/resume support - Dimitry Andric's fix for un-initialised spinlocks - Herbert Poetzl's fixes for the following -> break character recognition -> Magic-SYSRQ handling -> Uart software flow control (IrDA console) Updated to include rmk's comments from Patch #2234/1 and fix a few checks for serial clocks, as well as merging fixes from rmk that had taken time to go through the biteepr to release. Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2147.1.16, 2004-11-14 18:57:08-08:00, jamie@shareable.org [PATCH] revert recent futex_wait fix The patch was wrong. Back it out, and add some commentary explaining why we need to run queue_me() prior to the get_user(). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147.1.15, 2004-11-14 18:56:53-08:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] sparse: add -m64 to CHECKFLAGS on alpha and sparc64 Get the sizes right, and thus avoid complaints about big constants etc. ChangeSet@1.2147.1.14, 2004-11-14 18:56:35-08:00, viro@parcelfarce.linux.theplanet.co.uk [PATCH] alpha sysrq compile fix missing extern declaration in -Werror land... Add the proper declaration to sysrq.h. ChangeSet@1.2147.1.13, 2004-11-15 01:00:18-08:00, torvalds@ppc970.osdl.org Linux 2.6.10-rc2 TAG: v2.6.10-rc2