commit da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 tree c6f31816e5a5afc84e920c6c3f5702327dd990de parent f5154a98a1931641f0448f6512294a15279110d7 parent b1b510aa284af1908d5d369d52f7dae16aaabd71 author Linus Torvalds Tue, 11 Oct 2005 16:39:24 -0700 committer Linus Torvalds Tue, 11 Oct 2005 16:39:24 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit b1b510aa284af1908d5d369d52f7dae16aaabd71 tree dd79875667adf73552c4b9c4789aee2b4ada8368 parent 08eb8f124f990aa476589d1f7810f7ec7f259c08 author David S. Miller Tue, 11 Oct 2005 15:45:16 -0700 committer David S. Miller Tue, 11 Oct 2005 15:45:16 -0700 [SPARC64]: Fix net booting on Ultra5 We were not doing alignment properly when remapping the kernel image. What we want is a 4MB aligned physical address to map at KERNBASE. Mistakedly we were 4MB aligning the virtual address where the kernel initially sits, that's wrong. Instead, we should PAGE align the virtual address, then 4MB align the physical address result the prom gives to us. Signed-off-by: David S. Miller commit f5154a98a1931641f0448f6512294a15279110d7 tree fd5ea19514d07338f58b2df4b2f87922b9975a04 parent 9149ccfa3571eaa4a4b444777d67fc4ed3ebcf27 author Hugh Dickins Tue, 11 Oct 2005 19:16:26 +0100 committer Linus Torvalds Tue, 11 Oct 2005 12:03:47 -0700 [PATCH] Don't map the same page too much Refuse to install a page into a mapping if the mapping count is already ridiculously large. You probably cannot trigger this on 32-bit architectures, but on a 64-bit setup we should protect against it. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 9149ccfa3571eaa4a4b444777d67fc4ed3ebcf27 tree 92d07c8a2e76abf5b5805db6deb5a90d69406b76 parent d3089792f6ee38cdc9e254a7cb2f8c8d7f38c20d author Peter Bergner Tue, 11 Oct 2005 09:28:24 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] ppc64: Add R_PPC64_TOC16 module reloc Newer gcc's are generating this relocation, so the module loader needs to handle it. Signed-off-by: Peter Bergner Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3089792f6ee38cdc9e254a7cb2f8c8d7f38c20d tree f1a6e34bf02d5ebdfe5647e72286d74c2f45a720 parent 9de11aab1c8fd87da7e1fb435ce0ff26bacd7909 author Michael Krufky Tue, 11 Oct 2005 09:28:24 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] V4L: Enable s-video input on DViCO FusionHDTV5 Lite * bttv-cards.c: - Enable S-Video input on DViCO FusionHDTV5 Lite Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9de11aab1c8fd87da7e1fb435ce0ff26bacd7909 tree 3ab41df3d9ba382278e819ab8d84be163b6dab9c parent 6de505173e24e76bb33a2595312e0c2b44d49e58 author Hirokazu Takata Tue, 11 Oct 2005 08:29:09 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] m32r: trap handler code for illegal traps This patch prevents illegal traps from causing m32r kernel's infinite loop execution. Signed-off-by: Naoto Sugai Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6de505173e24e76bb33a2595312e0c2b44d49e58 tree 0d06e061a70b337627b7e83985d736c0b4f50f33 parent a0c111c631e7ab4abd68920debd44259160812ef author akpm@osdl.org Tue, 11 Oct 2005 08:29:08 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] binfmt_elf bss padding fix Nir Tzachar points out that if an ELF file specifies a zero-length bss at a whacky address, we cannot load that binary because padzero() tries to zero out the end of the page at the whacky address, and that may not be writeable. See also http://bugzilla.kernel.org/show_bug.cgi?id=5411 So teach load_elf_binary() to skip the bss settng altogether if the elf file has a zero-length bss segment. Cc: Roland McGrath Cc: Daniel Jacobowitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0c111c631e7ab4abd68920debd44259160812ef tree bfcafa019ba2fb2bf38e5a07f9f5958b7ecb697f parent 1bef40032992320dd25a266fc166bfb8fa3f2f59 author Paolo Galtieri Tue, 11 Oct 2005 08:29:07 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] ppc highmem fix I've noticed that the calculations for seg_size and nr_segs in __dma_sync_page_highmem() (arch/ppc/kernel/dma-mapping.c) are wrong. The incorrect calculations can result in either an oops or a panic when running fsck depending on the size of the partition. The problem with the seg_size calculation is that it can result in a negative number if size is offset > size. The problem with the nr_segs caculation is returns the wrong number of segments, e.g. it returns 1 when size is 200 and offset is 4095, when it should return 2 or more. Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bef40032992320dd25a266fc166bfb8fa3f2f59 tree e02d654b4db45b752e3201c3f6eec3f4c719b69f parent 22c1ea44f0d33eda532883858b6cdabc5f265b66 author Suzuki Tue, 11 Oct 2005 08:29:06 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] madvise: Avoid returning error code -EBADF for anonymous mappings Revert this recent correctness change: Douglas Crosher reported that it broke an existing application, and that madvise() works without error on anonymous mappings on Solaris. This means that madvise() will remain non-standards-compliant: we should return -EBADF for all requests against non-file-backed vma's, but Linux only does this for MADV_WILLNEED requests. Signed-off-by: Suzuki K P Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22c1ea44f0d33eda532883858b6cdabc5f265b66 tree 8af9c20a09e9ce9d497ec3db078d872b74a9c3ab parent 19cba8abd6ca09527c194864ae651db65cbacfe1 author Andreas Gruenbacher Tue, 11 Oct 2005 08:29:05 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] nfsacl: Solaris VxFS compatibility fix Here is a compatibility fix between Linux and Solaris when used with VxFS filesystems: Solaris usually accepts acl entries in any order, but with VxFS it replies with NFSERR_INVAL when it sees a four-entry acl that is not in canonical form. It may also fail with other non-canonical acls -- I can't tell, because that case never triggers: We only send non-canonical acls when we fake up an ACL_MASK entry. Instead of adding fake ACL_MASK entries at the end, inserting them in the correct position makes Solaris+VxFS happy. The Linux client and server sides don't care about entry order. The three-entry-acl special case in which we need a fake ACL_MASK entry was handled in xdr_nfsace_encode. The patch moves this into nfsacl_encode. Signed-off-by: Andreas Gruenbacher Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19cba8abd6ca09527c194864ae651db65cbacfe1 tree 3d59a1e147b2701d0957bef392e2fda441d5143f parent ad6ce87e5bd4440a6ce9aa9f8cda795b9e902eff author Latchesar Ionkov Tue, 11 Oct 2005 08:29:03 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:54 -0700 [PATCH] v9fs: remove additional buffer allocation from v9fs_file_read and v9fs_file_write v9fs_file_read and v9fs_file_write use kmalloc to allocate buffers as big as the data buffer received as parameter. kmalloc cannot be used to allocate buffers bigger than 128K, so reading/writing data in chunks bigger than 128k fails. This patch reorganizes v9fs_file_read and v9fs_file_write to allocate only buffers as big as the maximum data that can be sent in one 9P message. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad6ce87e5bd4440a6ce9aa9f8cda795b9e902eff tree d3ea460d562a06ccfd1edec6e2b6c4e37995438a parent e4314bf496bb7bb9acd754aeb319c30869bc8d76 author Abhay Salunke Tue, 11 Oct 2005 08:29:02 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:53 -0700 [PATCH] dell_rbu: changes in packet update mechanism In the current dell_rbu code ver 2.0 the packet update mechanism makes the user app dump every individual packet in to the driver. This adds in efficiency as every packet update makes the /sys/class/firmware/dell_rbu/loading and data files to disappear and reappear again. Thus the user app needs to wait for the files to reappear to dump another packet. This slows down the packet update tremendously in case of large number of packets. I am submitting a new patch for dell_rbu which will change the way we do packet updates; In the new method the user app will create a new single file which has already packetized the rbu image and all the packets are now staged in this file. This driver also creates a new entry in /sys/devices/platform/dell_rbu/packet_size ; the user needs to echo the packet size here before downloading the packet file. The user should do the following: create one single file which has all the packets stacked together. echo the packet size in to /sys/devices/platform/dell_rbu/packet_size. echo 1 > /sys/class/firmware/dell_rbu/loading cat the packetfile > /sys/class/firmware/dell_rbu/data echo 0 > /sys/class/firmware/dell_rbu/loading The driver takes the file which came through /sys/class/firmware/dell_rbu/data and takes chunks of paket_size data from it and place in contiguous memory. This makes packet update process very efficient and fast. As all the packet update happens in one single operation. The user can still read back the downloaded file from /sys/devices/platform/dell_rbu/data. Signed-off-by: Abhay Salunke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4314bf496bb7bb9acd754aeb319c30869bc8d76 tree ecec8fb728b2f872f970a7d666aa0147654e809f parent e5945b4f605d1479d5b44252a2c691168c5d38d6 author Anton Blanchard Tue, 11 Oct 2005 08:29:00 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:53 -0700 [PATCH] ppc64: Fix PCI hotplug pSeries_irq_bus_setup is marked __devinit but references s7a_workaround which is marked __initdata. Depending on who got the memory for s7a_workaround (and if the value was now positive), it was possible for PCI hotplugged devices to have 3 subtracted from their interrupt number. This would happen randomly and caused me much confusion :) Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5945b4f605d1479d5b44252a2c691168c5d38d6 tree 042f1163012843113aecce2ccbb997e0d2622025 parent 907a42617970a159361f17ef9a63f04d276995ab author Cornelia Huck Tue, 11 Oct 2005 08:28:59 -0700 committer Linus Torvalds Tue, 11 Oct 2005 09:46:53 -0700 [PATCH] s390: ccw device reconnect oops. Search for a disconnect ccw_device on the ccw bus rather than on the css bus (was a typo in patch I did for the klist conversion). A cast to an embedding ccw_device from an embedded device in a struct subchannel will lead us to oopses. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08eb8f124f990aa476589d1f7810f7ec7f259c08 tree 2c303b6c0bc4a2c41ed493af7713e3088ba0482c parent b8df110fea555d5088bba67f446c2435104405be author David S. Miller Mon, 10 Oct 2005 21:02:26 -0700 committer David S. Miller Mon, 10 Oct 2005 21:02:26 -0700 [SPARC32]: Revert IOMAP change eb98129eec7fa605f0407dfd92d40ee8ddf5cd9a Breakage noted by Al Viro. It breaks non-PCI builds, it's probably better to have a more direct implementation on sparc32, and which driver actually needs this is still questionable. We can resolve this in 2.6.15 Signed-off-by: David S. Miller commit b8df110fea555d5088bba67f446c2435104405be tree 1bb8dfc1a6eadcab3e6df99aff4ae6cde38e94b4 parent 907a42617970a159361f17ef9a63f04d276995ab author David S. Miller Mon, 10 Oct 2005 20:43:22 -0700 committer David S. Miller Mon, 10 Oct 2005 20:43:22 -0700 [SPARC64]: Fix oops on runlevel change with serial console. Incorrect uart_write_wakeup() calls cause reference to a NULL tty pointer in sunsab and sunzilog serial drivers. Signed-off-by: David S. Miller