ae29a18594c40a344ddd5bcd6abe575786a5d978 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 2008-11-02T14:17:19-08:00 2008-11-02T14:17:19-08:00 Linux v2.6.28-rc3 3b3d8f5696f75926524cd4bb36fd37c9ec818198 Linus Torvalds torvalds@linux-foundation.org 0bf82cccd1e17135f880c161bc7926f5b25df34c 52ebb438e952c674e5a5c131292589db9bcf169b Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/ae29a18594c40a344ddd5bcd6abe575786a5d978 ae29a18594c40a344ddd5bcd6abe575786a5d978 2008-11-02T13:32:26-08:00 2008-11-02T13:32:26-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide-gd: re-get capacity on revalidate tx4938ide: Avoid underflow on calculation of a wait cycle tx4938ide: Do not call devm_ioremap for whole 128KB tx4938ide: Check minimum cycle time and SHWT range (v2) ide: Switch to a common address ide-cd: fix DMA alignment regression 07e4e7e49ca0a891735e9da20929ddf61606c7ba Linus Torvalds torvalds@linux-foundation.org 7afa05350c42d8427f2d8f6112b64ab0812f3289 Borislav Petkov petkovbb@gmail.com http://github.com/github/linux-2.6/commit/52ebb438e952c674e5a5c131292589db9bcf169b 52ebb438e952c674e5a5c131292589db9bcf169b 2008-11-02T12:40:10-08:00 2008-11-02T12:40:10-08:00 ide-gd: re-get capacity on revalidate We need to re-get a removable media's capacity when revalidating the disk so that its partitions get rescanned by the block layer. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Cc: Tejun Heo <tj@kernel.org> Cc: axboe@kernel.dk Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> eba090be2781f18d7c6820f131d67c104b0cf548 Bartlomiej Zolnierkiewicz bzolnier@gmail.com 9d4eb0a33e620a85e36f66cf895d2bea6d556eac Atsushi Nemoto anemo@mba.ocn.ne.jp http://github.com/github/linux-2.6/commit/7afa05350c42d8427f2d8f6112b64ab0812f3289 7afa05350c42d8427f2d8f6112b64ab0812f3289 2008-11-02T12:40:10-08:00 2008-11-02T12:40:10-08:00 tx4938ide: Avoid underflow on calculation of a wait cycle Make 'wt' variable signed while it can be negative during calculation. Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Cc: sshtylyov@ru.mvista.com Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 07a972ee758fa975dc4f524df6e3f37628938255 Bartlomiej Zolnierkiewicz bzolnier@gmail.com 630a8b2500c8d04e87e597c4afa5e1fafff04591 Atsushi Nemoto anemo@mba.ocn.ne.jp http://github.com/github/linux-2.6/commit/9d4eb0a33e620a85e36f66cf895d2bea6d556eac 9d4eb0a33e620a85e36f66cf895d2bea6d556eac 2008-11-02T12:40:09-08:00 2008-11-02T12:40:09-08:00 tx4938ide: Do not call devm_ioremap for whole 128KB Call devm_ioremap() for CS0 and CS1 separetely. And some style cleanups. Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Cc: ralf@linux-mips.org Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 9eb73a85502085cd5bb0017a0bff28368e527774 Bartlomiej Zolnierkiewicz bzolnier@gmail.com ccd32e221c3e3797ac56305c554ad8b07c13c815 Atsushi Nemoto anemo@mba.ocn.ne.jp http://github.com/github/linux-2.6/commit/630a8b2500c8d04e87e597c4afa5e1fafff04591 630a8b2500c8d04e87e597c4afa5e1fafff04591 2008-11-02T12:40:09-08:00 2008-11-02T12:40:09-08:00 tx4938ide: Check minimum cycle time and SHWT range (v2) SHWT value is used as address valid to -CSx assertion and -CSx to -DIOx assertion setup time, and contrarywise, -DIOx to -CSx release and -CSx release to address invalid hold time, so it actualy applies 4 times and so constitutes -DIOx recovery time. Check requirement of the recovery time and cycle time. Also check SHWT maximum value. Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Cc: ralf@linux-mips.org Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 846c569c1f4f16bf6c1fdef1071850ce48f2c920 Bartlomiej Zolnierkiewicz bzolnier@gmail.com 9bd27cba1aeacb6b12d05f4e5ed6361072f08fe0 Alan Cox alan@lxorguk.ukuu.org.uk http://github.com/github/linux-2.6/commit/ccd32e221c3e3797ac56305c554ad8b07c13c815 ccd32e221c3e3797ac56305c554ad8b07c13c815 2008-11-02T12:40:08-08:00 2008-11-02T12:40:08-08:00 ide: Switch to a common address Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 268b210e3fe31b7de7f06ba1e88aaa681f4d9b6e Bartlomiej Zolnierkiewicz bzolnier@gmail.com 721d5dfe7e516954c501d5e9d0dfab379cf4241a Borislav Petkov petkovbb@gmail.com http://github.com/github/linux-2.6/commit/9bd27cba1aeacb6b12d05f4e5ed6361072f08fe0 9bd27cba1aeacb6b12d05f4e5ed6361072f08fe0 2008-11-02T12:40:07-08:00 2008-11-02T12:40:07-08:00 ide-cd: fix DMA alignment regression e5318b531b008c79d2a0c0df06a7b8628da38e2f ("ide: use the dma safe check for REQ_TYPE_ATA_PC") introduced a regression which caused some ATAPI drives to turn off DMA for REQ_TYPE_BLOCK_PC commands while burning and thus degrading performance and ultimately causing an excessive amount of underruns. The issue is documented also in: http://bugzilla.kernel.org/show_bug.cgi?id=11742. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Tested-by: Valerio Passini <valerio.passini@unicam.it> [bart: fixup patch description per comments from Sergei Shtylyov] Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 33917b6981e58ad553a86c44c91f07b1ecb13847 Bartlomiej Zolnierkiewicz bzolnier@gmail.com 391e572cd1a63aee9c8d4c2d5e3dada91d86bc43 5769907ade8dda7002b304c03ef9e4ee5c1e0821 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/0bf82cccd1e17135f880c161bc7926f5b25df34c 0bf82cccd1e17135f880c161bc7926f5b25df34c 2008-11-02T10:16:44-08:00 2008-11-02T10:16:44-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix PCI resource mapping on sparc64 sparc64: Kill annoying warning when building compat_binfmt_elf.o sparc32: kernel/trace/trace.c wants DIE_OOPS sparc64: Fix __copy_{to,from}_user_inatomic defines. 45935237f81b08d34f52c7bf5fe8d3d3c6a8b11b Linus Torvalds torvalds@linux-foundation.org 4ac96572f1f6abe44b5e02e80fdfb5a990129613 48dcc33e5e11de0f76b65b113988dbc930d17395 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/391e572cd1a63aee9c8d4c2d5e3dada91d86bc43 391e572cd1a63aee9c8d4c2d5e3dada91d86bc43 2008-11-02T10:15:52-08:00 2008-11-02T10:15:52-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits) af_unix: netns: fix problem of return value IRDA: remove double inclusion of module.h udp: multicast packets need to check namespace net: add documentation for skb recycling key: fix setkey(8) policy set breakage bpa10x: free sk_buff with kfree_skb xfrm: do not leak ESRCH to user space net: Really remove all of LOOPBACK_TSO code. netfilter: nf_conntrack_proto_gre: switch to register_pernet_gen_subsys() netns: add register_pernet_gen_subsys/unregister_pernet_gen_subsys net: delete excess kernel-doc notation pppoe: Fix socket leak. gianfar: Don't reset TBI<->SerDes link if it's already up gianfar: Fix race in TBI/SerDes configuration at91_ether: request/free GPIO for PHY interrupt amd8111e: fix dma_free_coherent context atl1: fix vlan tag regression SMC91x: delete unused local variable "lp" myri10ge: fix stop/go mmio ordering bonding: fix panic when taking bond interface down before removing module ... b89d924e644a7e66cd2b63d978607c6d0d3e7285 Linus Torvalds torvalds@linux-foundation.org c10555faca342820d861e80ca2e1edcf2114f751 Jeff Garzik jeff@garzik.org http://github.com/github/linux-2.6/commit/4ac96572f1f6abe44b5e02e80fdfb5a990129613 4ac96572f1f6abe44b5e02e80fdfb5a990129613 2008-11-02T10:15:07-08:00 2008-11-02T06:51:27-08:00 linux/string.h: fix comment typo s/user/used/ Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 4eb5698bb5b48435ccf5d919629fdbbcf235c561 Linus Torvalds torvalds@linux-foundation.org a1995a6599044076e2e13512ffbcecc49865e63e Max Dmitrichenko dmitrmax@gmail.com http://github.com/github/linux-2.6/commit/5769907ade8dda7002b304c03ef9e4ee5c1e0821 5769907ade8dda7002b304c03ef9e4ee5c1e0821 2008-11-02T00:34:10-07:00 2008-11-02T00:34:10-07:00 sparc64: Fix PCI resource mapping on sparc64 There is a problem discovered in recent versions of ATI Mach64 driver in X.org on sparc64 architecture. In short, the driver fails to mmap MMIO aperture (PCI resource #2). I've found that kernel's __pci_mmap_make_offset() returns EINVAL. It checks whether user attempts to mmap more than the resource length, which is 0x1000 bytes in our case. But PAGE_SIZE on SPARC64 is 0x2000 and this is what actually is being mmaped. So __pci_mmap_make_offset() failed for this PCI resource. Signed-off-by: Max Dmitrichenko <dmitrmax@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 620a1fd9938abb10abfb0dde236a6e29026ab4ab David S. Miller davem@davemloft.net e68f0aee89ebb93aaeedf064e0291d3c19520f7e David S. Miller davem@davemloft.net http://github.com/github/linux-2.6/commit/a1995a6599044076e2e13512ffbcecc49865e63e a1995a6599044076e2e13512ffbcecc49865e63e 2008-11-02T00:15:38-07:00 2008-11-02T00:15:38-07:00 sparc64: Kill annoying warning when building compat_binfmt_elf.o GCC warns because some tests against 32-bit values never evaluate to true due to how TASK_SIZE is defined. I always wanted to mimick powerpc's definition of TASK_SIZE, which is simply TASK_SIZE_OF(current) and that also fixes the warning. Signed-off-by: David S. Miller <davem@davemloft.net> 518787fbb30628f36c439b0377b8ce0c06459ab3 David S. Miller davem@davemloft.net 145e1c0023585e0e8f6df22316308ec61c5066b2 Al Viro viro@zeniv.linux.org.uk http://github.com/github/linux-2.6/commit/e68f0aee89ebb93aaeedf064e0291d3c19520f7e e68f0aee89ebb93aaeedf064e0291d3c19520f7e 2008-11-01T21:44:01-07:00 2008-11-01T21:44:01-07:00 sparc32: kernel/trace/trace.c wants DIE_OOPS Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 61b54f4fa0a0f46505cfb5c5b08e4f71e155fe4e David S. Miller davem@davemloft.net 770a424112cb2c3a3e39221299eaf5244b76479a Hugh Dickins hugh@veritas.com http://github.com/github/linux-2.6/commit/145e1c0023585e0e8f6df22316308ec61c5066b2 145e1c0023585e0e8f6df22316308ec61c5066b2 2008-11-01T21:41:40-07:00 2008-11-01T21:41:40-07:00 sparc64: Fix __copy_{to,from}_user_inatomic defines. Alexander Beregalov reports oops in __bzero() called from copy_from_user_fixup() called from iov_iter_copy_from_user_atomic(), when running dbench on tmpfs on sparc64: its __copy_from_user_inatomic and __copy_to_user_inatomic should be avoiding, not calling, the fixups. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: David S. Miller <davem@davemloft.net> c4070952481c43a020d7ee6630c3ba6bfb879b48 David S. Miller davem@davemloft.net abdd5a0301a6306d6465ceca9de8e732b2fedaa5 Jianjun Kong jianjun@zeuux.org http://github.com/github/linux-2.6/commit/48dcc33e5e11de0f76b65b113988dbc930d17395 48dcc33e5e11de0f76b65b113988dbc930d17395 2008-11-01T21:37:27-07:00 2008-11-01T21:37:27-07:00 af_unix: netns: fix problem of return value fix problem of return value net/unix/af_unix.c: unix_net_init() when error appears, it should return 'error', not always return 0. Signed-off-by: Jianjun Kong <jianjun@zeuux.org> Signed-off-by: David S. Miller <davem@davemloft.net> 5d541fc8c41d8bf9758f3ecec721f4a4b432d786 David S. Miller davem@davemloft.net 920a46115ca3fa88990276d98520abab85495b2d Alexander Beregalov a.beregalov@gmail.com http://github.com/github/linux-2.6/commit/abdd5a0301a6306d6465ceca9de8e732b2fedaa5 abdd5a0301a6306d6465ceca9de8e732b2fedaa5 2008-11-01T21:30:50-07:00 2008-11-01T21:30:50-07:00 IRDA: remove double inclusion of module.h Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 23542bd1a29de81d9a572f286249b85c66d35b19 David S. Miller davem@davemloft.net d1a203eac0ec13cd1c0ba610fe7a55c9bc40473b Eric Dumazet dada1@cosmosbay.com http://github.com/github/linux-2.6/commit/920a46115ca3fa88990276d98520abab85495b2d 920a46115ca3fa88990276d98520abab85495b2d 2008-11-01T21:22:23-07:00 2008-11-01T21:22:23-07:00 udp: multicast packets need to check namespace Current UDP multicast delivery is not namespace aware. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Acked-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> a0960e925f2426da9766acfed2dbee144f30299c David S. Miller davem@davemloft.net 920da6923cf03c8a78fbaffa408f8ab37f6abfc1 Stephen Hemminger shemminger@vyatta.com http://github.com/github/linux-2.6/commit/d1a203eac0ec13cd1c0ba610fe7a55c9bc40473b d1a203eac0ec13cd1c0ba610fe7a55c9bc40473b 2008-11-01T21:01:09-07:00 2008-11-01T21:01:09-07:00 net: add documentation for skb recycling Commit 04a4bb55bcf35b63d40fd2725e58599ff8310dd7 ("net: add skb_recycle_check() to enable netdriver skb recycling") added a method for network drivers to recycle skbuffs, but while use of this mechanism was documented in the commit message, it should really have been added as a docbook comment as well -- this patch does that. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net> 38fcd14da889f021d18346c5f3595591b5051f83 David S. Miller davem@davemloft.net 37b2a1791c8b8d630944afbe0745a08c8e8ae091 Al Viro viro@ftp.linux.org.uk http://github.com/github/linux-2.6/commit/c10555faca342820d861e80ca2e1edcf2114f751 c10555faca342820d861e80ca2e1edcf2114f751 2008-11-01T12:40:38-07:00 2008-11-01T11:20:29-07:00 sparc32: kernel/trace/trace.c wants DIE_OOPS Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 03d7379211140f818438d479468701dfb5c6fd7e Linus Torvalds torvalds@linux-foundation.org 9ca68233f2ec12efc950b4d15e9a761308da2b3e Al Viro viro@ftp.linux.org.uk http://github.com/github/linux-2.6/commit/37b2a1791c8b8d630944afbe0745a08c8e8ae091 37b2a1791c8b8d630944afbe0745a08c8e8ae091 2008-11-01T12:40:38-07:00 2008-11-01T11:20:19-07:00 el3_common_init() should be __devinit, not __init Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> c001e5ea571b35d1016fe000eddedcb36aa72093 Linus Torvalds torvalds@linux-foundation.org f5ee051e748ae007b972c7e1b6a0588b8ac9ba40 Al Viro viro@ftp.linux.org.uk http://github.com/github/linux-2.6/commit/9ca68233f2ec12efc950b4d15e9a761308da2b3e 9ca68233f2ec12efc950b4d15e9a761308da2b3e 2008-11-01T12:40:38-07:00 2008-11-01T11:19:59-07:00 missing dependencies on HAVE_CLK in drivers/mfd Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ff1017b5841f03c43f04661f29f8e44b08ab21c4 Linus Torvalds torvalds@linux-foundation.org 28959742c14918f153c1de641bb12b4ea44315a1 Al Viro viro@ftp.linux.org.uk http://github.com/github/linux-2.6/commit/f5ee051e748ae007b972c7e1b6a0588b8ac9ba40 f5ee051e748ae007b972c7e1b6a0588b8ac9ba40 2008-11-01T12:40:38-07:00 2008-11-01T11:20:39-07:00 section fixes for cirrusfb cirrusfb_zorro_unmap() may be called both from __devexit and (on cleanup path) from __devinit. So it needs to be a normal function, same as for cirrusfb_pci_unmap() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> f657987687d3794b3edc327240bcacd7b775fff8 Linus Torvalds torvalds@linux-foundation.org 4b30fbde910dd40b831528e916cb8a91823f618f Al Viro viro@ftp.linux.org.uk http://github.com/github/linux-2.6/commit/28959742c14918f153c1de641bb12b4ea44315a1 28959742c14918f153c1de641bb12b4ea44315a1 2008-11-01T12:40:38-07:00 2008-11-01T11:20:09-07:00 PM_TEST_SUSPEND should depend on RTC_CLASS, not RTC_LIB Insufficient dependency - we really want CONFIG_RTC_CLASS=y there. That will give us CONFIG_RTC_LIB=y, so the old dependency can be simply replaced. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> d58404ebbdd572a2b86d62bafd7af0697cd9624e Linus Torvalds torvalds@linux-foundation.org 67d112842586aa11506b7a8afec29391bf8f3cca Al Viro viro@ftp.linux.org.uk http://github.com/github/linux-2.6/commit/4b30fbde910dd40b831528e916cb8a91823f618f 4b30fbde910dd40b831528e916cb8a91823f618f 2008-11-01T12:40:38-07:00 2008-11-01T11:19:49-07:00 oss: fix O_NONBLOCK in dmasound_core We broke O_NONBLOCK handling in OSS dmasound_core in 2.3.11-pre3 - the original code copied f_flags to open_mode and then checked for O_NONBLOCK in there, but that got changed to copying f_mode and O_NONBLOCK has not reached that field in any kernel version. Since we do not care for any other bits, the fix is obvious... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 1956131fa83e0d68f72de442501ffa3be65d86b9 Linus Torvalds torvalds@linux-foundation.org d3f15800d5752ca4814270180798ab8323157d28 2576c9991758e431b73e374f6019d6e1e12a8d36 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/67d112842586aa11506b7a8afec29391bf8f3cca 67d112842586aa11506b7a8afec29391bf8f3cca 2008-11-01T10:36:30-07:00 2008-11-01T10:36:30-07:00 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix AMDC1E and XTOPOLOGY conflict in cpufeature x86: build fix dff25f229ea115c8281819d224fbb18f851dc2b2 Linus Torvalds torvalds@linux-foundation.org 1f98757776eafe31065be9118db6051afcf8643c Huang Weiyi weiyi.huang@gmail.com http://github.com/github/linux-2.6/commit/d3f15800d5752ca4814270180798ab8323157d28 d3f15800d5752ca4814270180798ab8323157d28 2008-11-01T10:35:51-07:00 2008-10-30T21:47:23-07:00 init/do_mounts_md.c: remove duplicated #include Removed duplicated #include <linux/delay.h> in init/do_mounts_md.c. The same compile error ("error: implicit declaration of function 'msleep'") got fixed twice: - f8b77d39397e1510b1a3bcfd385ebd1a45aae77f ("init/do_mounts_md.c: msleep compile fix") - 73b4a24f5ff09389ba6277c53a266b142f655ed2 ("init/do_mounts_md.c must #include <linux/delay.h>") by people adding the <linux/delay.h> include in two slightly different places. Andrew's quilt scripts happily ignore the fuzz, and will re-apply the patch even though they had conflicts. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 5db82711ede9dade338900bade4d1f33568006b7 Linus Torvalds torvalds@linux-foundation.org 42c0202363194007a1ac377d047a95aa39246eb0 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/1f98757776eafe31065be9118db6051afcf8643c 1f98757776eafe31065be9118db6051afcf8643c 2008-11-01T10:17:22-07:00 2008-11-01T10:17:22-07:00 x86: Clean up late e820 resource allocation This makes the late e820 resources use 'insert_resource_expand_to_fit()' instead of doing a 'reserve_region_with_split()', and also avoids marking them as IORESOURCE_BUSY. This results in us being perfectly happy to use pre-existing PCI resources even if they were marked as being in a reserved region, while still avoiding any _new_ allocations in the reserved regions. It also makes for a simpler and more accurate resource tree. Example resource allocation from Jonathan Corbet, who has firmware that has an e820 reserved entry that covered a big range (e0000000-fed003ff), and that had various PCI resources in it set up by firmware. With old kernels, the reserved range would force us to re-allocate all pre-existing PCI resources, and his reserved range would end up looking like this: e0000000-fed003ff : reserved fec00000-fec00fff : IOAPIC 0 fed00000-fed003ff : HPET 0 where only the pre-allocated special regions (IOAPIC and HPET) were kept around. With 2.6.28-rc2, which uses 'reserve_region_with_split()', Jonathan's resource tree looked like this: e0000000-fe7fffff : reserved fe800000-fe8fffff : PCI Bus 0000:01 fe800000-fe8fffff : reserved fe900000-fe9d9aff : reserved fe9d9b00-fe9d9bff : 0000:00:1f.3 fe9d9b00-fe9d9bff : reserved fe9d9c00-fe9d9fff : 0000:00:1a.7 fe9d9c00-fe9d9fff : reserved fe9da000-fe9dafff : 0000:00:03.3 fe9da000-fe9dafff : reserved fe9db000-fe9dbfff : 0000:00:19.0 fe9db000-fe9dbfff : reserved fe9dc000-fe9dffff : 0000:00:1b.0 fe9dc000-fe9dffff : reserved fe9e0000-fe9fffff : 0000:00:19.0 fe9e0000-fe9fffff : reserved fea00000-fea7ffff : 0000:00:02.0 fea00000-fea7ffff : reserved fea80000-feafffff : 0000:00:02.1 fea80000-feafffff : reserved feb00000-febfffff : 0000:00:02.0 feb00000-febfffff : reserved fec00000-fed003ff : reserved fec00000-fec00fff : IOAPIC 0 fed00000-fed003ff : HPET 0 and because the reserved entry had been split and moved into the individual resources, and because it used the IORESOURCE_BUSY flag, the drivers that actually wanted to _use_ those resources couldn't actually attach to them: e1000e 0000:00:19.0: BAR 0: can't reserve mem region [0xfe9e0000-0xfe9fffff] HDA Intel 0000:00:1b.0: BAR 0: can't reserve mem region [0xfe9dc000-0xfe9dffff] with this patch, the resource tree instead becomes e0000000-fed003ff : reserved fe800000-fe8fffff : PCI Bus 0000:01 fe9d9b00-fe9d9bff : 0000:00:1f.3 fe9d9c00-fe9d9fff : 0000:00:1a.7 fe9d9c00-fe9d9fff : ehci_hcd fe9da000-fe9dafff : 0000:00:03.3 fe9db000-fe9dbfff : 0000:00:19.0 fe9db000-fe9dbfff : e1000e fe9dc000-fe9dffff : 0000:00:1b.0 fe9dc000-fe9dffff : ICH HD audio fe9e0000-fe9fffff : 0000:00:19.0 fe9e0000-fe9fffff : e1000e fea00000-fea7ffff : 0000:00:02.0 fea80000-feafffff : 0000:00:02.1 feb00000-febfffff : 0000:00:02.0 fec00000-fec00fff : IOAPIC 0 fed00000-fed003ff : HPET 0 ie the one reserved region now ends up surrounding all the PCI resources that were allocated inside of it by firmware, and because it is not marked BUSY, drivers have no problem attaching to the pre-allocated resources. Reported-and-tested-by: Jonathan Corbet <corbet@lwn.net> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Robert Hancock <hancockr@shaw.ca> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> f2f6a60f966b4cd0fdc5c204b009958118b53321 Linus Torvalds torvalds@linux-foundation.org cdce1f0931831cebfbeb811a266a2f4adf5c8a35 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/42c0202363194007a1ac377d047a95aa39246eb0 42c0202363194007a1ac377d047a95aa39246eb0 2008-11-01T09:53:58-07:00 2008-11-01T09:53:58-07:00 reserve_region_with_split: Fix GFP_KERNEL usage under spinlock This one apparently doesn't generate any warnings, because the function is only used during system bootup, when the warnings are disabled. But it's still very wrong. The __reserve_region_with_split() function is called with the resource_lock held for writing, so it must only ever do GFP_ATOMIC allocations. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 305e145fe0ee60580a127a7b72ce0d7ad582258e Linus Torvalds torvalds@linux-foundation.org 0242909a6135e10a28822c64f9ad50fdad52757c c5ec6fb08d7806cf1a9e4fceed15f5d4a69f885e Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/cdce1f0931831cebfbeb811a266a2f4adf5c8a35 cdce1f0931831cebfbeb811a266a2f4adf5c8a35 2008-11-01T09:52:43-07:00 2008-11-01T09:52:43-07:00 Merge branch 'link_removal' of git://www.jni.nu/cris * 'link_removal' of git://www.jni.nu/cris: [CRIS] Remove links from CRIS build [CRIS] Merge asm-offsets.c for both arches into one file. 6d7e41800f767e34ea33eeedb6c4a9bb6dd7052c Linus Torvalds torvalds@linux-foundation.org