commit c101f3136cc98a003d0d16be6fab7d0d950581a6 tree 738f3ea3ff68245fb0900aeeeb73f1accb2bf956 parent 359ea2f1352a77177540a213283bc7489f546ced parent e3e01d6005ab4b0877f1fb3efef7f5b745e743be author Linus Torvalds Wed, 06 Jul 2005 22:15:13 -0700 committer Linus Torvalds Wed, 06 Jul 2005 22:15:13 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 359ea2f1352a77177540a213283bc7489f546ced tree 95a313a9d920e432bafcdf68a9c7fb0812aa389b parent 960b8466548c9bc6f718b5f470c1a58000fab09d parent e1d5dea1dfbfe484358c40db7f233ed6b5605646 author Linus Torvalds Wed, 06 Jul 2005 17:04:06 -0700 committer Linus Torvalds Wed, 06 Jul 2005 17:04:06 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 960b8466548c9bc6f718b5f470c1a58000fab09d tree 9dfe507f4b1d5dcde83249754a66d76a9851294f parent 107177410b754b597028e430725bc3b316936b6b author Ivan Kokshaysky Thu, 07 Jul 2005 03:07:56 +0400 committer Linus Torvalds Wed, 06 Jul 2005 16:12:58 -0700 [PATCH] yet another fix for setup-bus.c/x86 merge There is a slight disagreement between setup-bus.c code and traditional x86 PCI setup wrt which recourses are invalid vs resources that are free for further allocations. In particular, in the setup-bus.c, if we failed to allocate some resource, we nullify "start" and "flags" fields, but *not* the "end" one. But x86 pcibios_enable_resources() does the following check: if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); return -EINVAL; which means that the device owning the offending resource cannot be enabled. In particular, this breaks cardbus behind the normal decode p2p bridge - the cardbus code from setup-bus.c requests rather large IO and MEM windows, and if it fails, the socket is completely unavailable. Which is wrong, as the yenta code is capable to allocate smaller windows. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit e3e01d6005ab4b0877f1fb3efef7f5b745e743be tree 0cb9fc0f68159edf52c08ee63b7891e0efba8942 parent 9d7495330be2fd88ab939fa5080d3ca9f64368c2 author Eddie C. Dost Wed, 06 Jul 2005 15:41:54 -0700 committer David S. Miller Wed, 06 Jul 2005 15:41:54 -0700 [SPARC64]: Fix enable_dma() in asm-sparc64/parport.h Call ebus_dma_enable() before calling ebus_dma_request(), otherwise ebus_dma_request() returns -EINVAL and enable_dma() calls BUG()... Signed-off-by: David S. Miller commit 9d7495330be2fd88ab939fa5080d3ca9f64368c2 tree f846a17f35704bfeb75a84aa4081c446406c5e32 parent 12cf649f417c68b6bdd2a3b4ed97113159c6029e author Eddie C. Dost Wed, 06 Jul 2005 15:41:17 -0700 committer David S. Miller Wed, 06 Jul 2005 15:41:17 -0700 [DVB]: Do not include from drivers. Signed-off-by: David S. Miller commit 12cf649f417c68b6bdd2a3b4ed97113159c6029e tree d04afa3cd1947245780376bb21be15fda5b1237a parent 90cdba648c5edf0ccabdadfc6e61f40c04e8bb00 author Eddie C. Dost Wed, 06 Jul 2005 15:40:21 -0700 committer David S. Miller Wed, 06 Jul 2005 15:40:21 -0700 [SPARC64]: Fix set_intr_affinity() Do not cat bucket->irq_info to struct irqaction * directly, but go through struct irq_desc *. Signed-off-by: David S. Miller commit 107177410b754b597028e430725bc3b316936b6b tree 146b9f2c0b032408d2e78ac69074e5d9bab2ffbd parent 07bbeaf12310263d808b1958f8413b95f98786ea parent 450008b5a62bb09445ae05c4d01d510386c9435d author Linus Torvalds Wed, 06 Jul 2005 15:39:15 -0700 committer Linus Torvalds Wed, 06 Jul 2005 15:39:15 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 90cdba648c5edf0ccabdadfc6e61f40c04e8bb00 tree 660824fb5f05a520b618078d1b8171120d08f4b9 parent 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 author Eddie C. Dost Wed, 06 Jul 2005 15:37:58 -0700 committer David S. Miller Wed, 06 Jul 2005 15:37:58 -0700 [SPARC]: Fix "Eddie C. Dost" e-mail address Signed-off-by: David S. Miller commit 7bc7fc50ce272d9a68f8e11707cfc2cc94f4e8f5 tree 891265ca82decd715c32c7029671502d0aa79d6f parent bcaafbe4a14e3c9b5275b3986c7599f7c6c278e4 author Todd Poynor Wed, 06 Jul 2005 23:06:05 +0100 committer Russell King Wed, 06 Jul 2005 23:06:05 +0100 [PATCH] ARM: 2791/1: Add CRCs for aliased ARM symbols Patch from Todd Poynor Fix module versioning for 3 ARM symbols that do not have CRCs added, avoid "disagrees about version of symbol struct_module" errors at module load time. From David Singleton. Signed-off-by: Todd Poynor Signed-off-by: Russell King commit 450008b5a62bb09445ae05c4d01d510386c9435d tree 894096c083c3b8fa1e8ae93e49aad72ca879cccc parent 7bc7fc50ce272d9a68f8e11707cfc2cc94f4e8f5 author Deepak Saxena Wed, 06 Jul 2005 23:06:05 +0100 committer Russell King Wed, 06 Jul 2005 23:06:05 +0100 [PATCH] ARM: 2792/1: IXP4xx iomap API implementation Patch from Deepak Saxena This patch implements the iomap API for Intel IXP4xx NPU systems. We need to implement our own version of the API functions b/c of the PCI hostbridge does not provide the capability to map PCI I/O space into the CPU's physical memory space. In addition, if a system has more than 64M of PCI memory mapped BARs, PCI memory must also be accessed indirectly. This patch changes the assignment of PCI I/O resources to fall into to 0x0000:0xffff range so that we can trap I/O areas in our ioread/iowrite macros. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit bcaafbe4a14e3c9b5275b3986c7599f7c6c278e4 tree 6aee01eb8a7f0a52c1dbd5f852b278d4596b457a parent d1d890edace65721e9a7582545c943f67f500709 author Stefan Sorensen Wed, 06 Jul 2005 23:06:04 +0100 committer Russell King Wed, 06 Jul 2005 23:06:04 +0100 [PATCH] ARM: 2790/1: Properly terminate plat_serial8250_port arrays on ixdp425 and coyote Patch from Stefan Sorensen On the ixdp425 and coyote platforms, the plat_serial8250_port arrays are missing the terminating entry required by serial8250_probe. Signed-off-by: Stefan Sorensen Signed-off-by: Russell King commit d1d890edace65721e9a7582545c943f67f500709 tree 0c0170ed290533e2d1cf3576090afd5277fed579 parent a18bcb7450840f07a772a45229de4811d930f461 author Catalin Marinas Wed, 06 Jul 2005 23:06:03 +0100 committer Russell King Wed, 06 Jul 2005 23:06:03 +0100 [PATCH] ARM: 2789/1: Enable access to both CP10 and CP11 on ARMv6 Patch from Catalin Marinas The VFP instructions trigger undefined exceptions because the access to CP11 is disabled (only CP10 is currently enabled by the kernel). The patch fixes this problem. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit e1d5dea1dfbfe484358c40db7f233ed6b5605646 tree 0bcea9bf2d5d12f1a400e01cffd001d2d22e4026 parent a9df3597fec5472d0840fbfdc2a3fac5268f7d08 author Dag Arne Osvik Wed, 06 Jul 2005 13:55:44 -0700 committer David S. Miller Wed, 06 Jul 2005 13:55:44 -0700 [CRYPTO] Add faster DES code from Dag Arne Osvik I've made a new implementation of DES to replace the old one in the kernel. It provides faster encryption on all tested processors apart from the original Pentium, and key setup is many times faster. Speed relative to old kernel implementation Processor des_setkey des_encrypt des3_ede_setkey des3_ede_encrypt Pentium 120Mhz 6.8 0.82 7.2 0.86 Pentium III 1.266Ghz 5.6 1.19 5.8 1.34 Pentium M 1.3Ghz 5.7 1.15 6.0 1.31 Pentium 4 2.266Ghz 5.8 1.24 6.0 1.40 Pentium 4E 3Ghz 5.4 1.27 5.5 1.48 StrongARM 1110 206Mhz 4.3 1.03 4.4 1.14 Athlon XP 2Ghz 7.8 1.44 8.1 1.61 Athlon 64 2Ghz 7.8 1.34 8.3 1.49 Signed-off-by: Dag Arne Osvik Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a9df3597fec5472d0840fbfdc2a3fac5268f7d08 tree 965197414a7a5670bedfe6ea4c914af62a5f8229 parent a2a892a236d03a6e985471a7e57d1c863de144c8 author Herbert Xu Wed, 06 Jul 2005 13:55:21 -0700 committer David S. Miller Wed, 06 Jul 2005 13:55:21 -0700 [CRYPTO] Remove unused iv field from context structure The iv field in des_ctx/des3_ede_ctx/serpent_ctx has never been used. This was noticed by Dag Arne Osvik. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a2a892a236d03a6e985471a7e57d1c863de144c8 tree 33b52c87bdecf0f24936b952a565a445ce03c616 parent a61cc44812ff94793987bf43b70a3d9bc64a6820 author Andreas Steinmetz Wed, 06 Jul 2005 13:55:00 -0700 committer David S. Miller Wed, 06 Jul 2005 13:55:00 -0700 [CRYPTO] Add x86_64 asm AES Implementation: =============== The encrypt/decrypt code is based on an x86 implementation I did a while ago which I never published. This unpublished implementation does include an assembler based key schedule and precomputed tables. For simplicity and best acceptance, however, I took Gladman's in-kernel code for table generation and key schedule for the kernel port of my assembler code and modified this code to produce the key schedule as required by my assembler implementation. File locations and Kconfig are kept similar to the i586 AES assembler implementation. It may seem a little bit strange to use 32 bit I/O and registers in the assembler implementation but this gives the best code size. My implementation takes one instruction more per round compared to Gladman's x86 assembler but it doesn't require any stack for local variables or saved registers and it is less serialized than Gladman's code. Note that all comparisons to Gladman's code were done after my code was implemented. I did only use FIPS PUB 197 for the implementation so my implementation is independent work. If anybody has a better assembler solution for x86_64 I'll be pleased to have my code replaced with the better solution. Testing: ======== The implementation passes the in-kernel crypto testing module and I'm running it without any problems on my laptop where it is mainly used for dm-crypt. Microbenchmark: =============== The microbenchmark was done in userspace with similar compile flags as used during kernel compile. Encrypt/decrypt is about 35% faster than the generic C implementation. As the generic C as well as my assembler implementation are both table I don't really expect that there is much room for further improvements though I'll be glad to be corrected here. The key schedule is about 5% slower than the generic C implementation. This is due to the fact that some more work has to be done in the key schedule routine to fit the schedule to the assembler implementation. Code Size: ========== Encrypt and decrypt are together about 2.1 Kbytes smaller than the generic C implementation which is important with regard to L1 cache usage. The key schedule routine is about 100 bytes larger than the generic C implementation. Data Size: ========== There's no difference in data size requirements between the assembler implementation and the generic C implementation. License: ======== Gladmans's code is dual BSD/GPL whereas my assembler code is GPLv2 only (I'm not going to change the license for my code). So I had to change the module license for the x86_64 aes module from 'Dual BSD/GPL' to 'GPL' to reflect the most restrictive license within the module. Signed-off-by: Andreas Steinmetz Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a61cc44812ff94793987bf43b70a3d9bc64a6820 tree 65cf93c2a89fb0072a69c2904202713a2e895098 parent 476df259cd577e20379b02a7f7ffd086ea925a83 author Jesper Juhl Wed, 06 Jul 2005 13:54:31 -0700 committer David S. Miller Wed, 06 Jul 2005 13:54:31 -0700 [CRYPTO] Add null short circuit to crypto_free_tfm As far as I'm aware there's a general concensus that functions that are responsible for freeing resources should be able to cope with being passed a NULL pointer. This makes sense as it removes the need for all callers to check for NULL, thus elliminating the bugs that happen when some forget (safer to just check centrally in the freeing function) and it also makes for smaller code all over due to the lack of all those NULL checks. This patch makes it safe to pass the crypto_free_tfm() function a NULL pointer. Once this patch is applied we can start removing the NULL checks from the callers. Signed-off-by: Jesper Juhl Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 476df259cd577e20379b02a7f7ffd086ea925a83 tree 85697704c53e0905d1b83a4ec3525cf20ca53455 parent 915e8561d559abba1b81934e31e54a3f850fa7bf author Herbert Xu Wed, 06 Jul 2005 13:54:09 -0700 committer David S. Miller Wed, 06 Jul 2005 13:54:09 -0700 [CRYPTO] Update IV correctly for Padlock CBC encryption When the Padlock does CBC encryption, the memory pointed to by EAX is not updated at all. Instead, it updates the value of EAX by pointing it to the last block in the output. Therefore to maintain the correct semantics we need to copy the IV. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 915e8561d559abba1b81934e31e54a3f850fa7bf tree 12c08e7ec182ca11125097e2f485eab7a48b03df parent fbdae9f3e7fb57c07cb0d973f113eb25da2e8ff2 author Herbert Xu Wed, 06 Jul 2005 13:53:47 -0700 committer David S. Miller Wed, 06 Jul 2005 13:53:47 -0700 [CRYPTO] Handle unaligned iv from encrypt_iv/decrypt_iv Even though cit_iv is now always aligned, the user can still supply an unaligned iv through crypto_cipher_encrypt_iv/crypto_cipher_decrypt_iv. This patch will check the alignment of the user-supplied iv and copy it if necessary. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit fbdae9f3e7fb57c07cb0d973f113eb25da2e8ff2 tree b20909c92c2d48ab449343967b1c365732d7e4ff parent 176c3652c544b6f8d4bb1984c58c10080f45dbf0 author Herbert Xu Wed, 06 Jul 2005 13:53:29 -0700 committer David S. Miller Wed, 06 Jul 2005 13:53:29 -0700 [CRYPTO] Ensure cit_iv is aligned correctly This patch ensures that cit_iv is aligned according to cra_alignmask by allocating it as part of the tfm structure. As a side effect the crypto layer will also guarantee that the tfm ctx area has enough space to be aligned by cra_alignmask. This allows us to remove the extra space reservation from the Padlock driver. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 176c3652c544b6f8d4bb1984c58c10080f45dbf0 tree a9b29e6e341484df8a0040de7506807f82be3e66 parent 28e8c3ad9464de54a632f00ab3df88fa5f4652d1 author Adrian Bunk Wed, 06 Jul 2005 13:53:09 -0700 committer David S. Miller Wed, 06 Jul 2005 13:53:09 -0700 [CRYPTO] Make crypto_alg_lookup static This patch makes a needlessly global function static. Signed-off-by: Adrian Bunk Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 28e8c3ad9464de54a632f00ab3df88fa5f4652d1 tree ba62694afc67bcd6dc817d137e8259cb526a51c6 parent 6789b2dc455b90efc9c88886c9366adc9abb7347 author Herbert Xu Wed, 06 Jul 2005 13:52:43 -0700 committer David S. Miller Wed, 06 Jul 2005 13:52:43 -0700 [PADLOCK] Implement multi-block operations By operating on multiple blocks at once, we expect to extract more performance out of the VIA Padlock. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6789b2dc455b90efc9c88886c9366adc9abb7347 tree a962565f31b2c8c0cb112b2ce482cceb3d16caef parent 95477377995aefa2ec1654a9a3777bd57ea99146 author Herbert Xu Wed, 06 Jul 2005 13:52:27 -0700 committer David S. Miller Wed, 06 Jul 2005 13:52:27 -0700 [PADLOCK] Move fast path work into aes_set_key and upper layer Most of the work done aes_padlock can be done in aes_set_key. This means that we only have to do it once when the key changes rather than every time we perform an encryption or decryption. This patch also sets cra_alignmask to let the upper layer ensure that the buffers fed to us are aligned correctly. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 95477377995aefa2ec1654a9a3777bd57ea99146 tree 7aa4d6173de13c81c2fa0e4d2f9e0de22e141b6a parent 40725181b74be6b0e3bdc8c05bd1e0b9873ec5cc author Herbert Xu Wed, 06 Jul 2005 13:52:09 -0700 committer David S. Miller Wed, 06 Jul 2005 13:52:09 -0700 [CRYPTO] Add alignmask for low-level cipher implementations The VIA Padlock device requires the input and output buffers to be aligned on 16-byte boundaries. This patch adds the alignmask attribute for low-level cipher implementations to indicate their alignment requirements. The mid-level crypt() function will copy the input/output buffers if they are not aligned correctly before they are passed to the low-level implementation. Strictly speaking, some of the software implementations require the buffers to be aligned on 4-byte boundaries as they do 32-bit loads. However, it is not clear whether it is better to copy the buffers or pay the penalty for unaligned loads/stores. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 40725181b74be6b0e3bdc8c05bd1e0b9873ec5cc tree abbc1057a5e0bd77385d17cfc6146617151e93bc parent c774e93e2152d0be2612739418689e6e6400f4eb author Herbert Xu Wed, 06 Jul 2005 13:51:52 -0700 committer David S. Miller Wed, 06 Jul 2005 13:51:52 -0700 [CRYPTO] Add support for low-level multi-block operations This patch adds hooks for cipher algorithms to implement multi-block ECB/CBC operations directly. This is expected to provide significant performance boots to the VIA Padlock. It could also be used for improving software implementations such as AES where operating on multiple blocks at a time may enable certain optimisations. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c774e93e2152d0be2612739418689e6e6400f4eb tree abe25ec0577bd95128adb3f38609a09f0a3e2469 parent 8279dd748f9704b811e528b31304e2fab026abc5 author Herbert Xu Wed, 06 Jul 2005 13:51:31 -0700 committer David S. Miller Wed, 06 Jul 2005 13:51:31 -0700 [CRYPTO] Add plumbing for multi-block operations The VIA Padlock device is able to perform much better when multiple blocks are fed to it at once. As this device offers an exceptional throughput rate it is worthwhile to optimise the infrastructure specifically for it. We shift the existing page-sized fast path down to the CBC/ECB functions. We can then replace the CBC/ECB functions with functions provided by the underlying algorithm that performs the multi-block operations. As a side-effect this improves the performance of large cipher operations for all existing algorithm implementations. I've measured the gain to be around 5% for 3DES and 15% for AES. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8279dd748f9704b811e528b31304e2fab026abc5 tree d824994f48492dc3910ec3bf82d147cd8f796f20 parent b4634484815e1879512a23e4f59eef648135c30a author Jesper Juhl Wed, 06 Jul 2005 13:51:00 -0700 committer David S. Miller Wed, 06 Jul 2005 13:51:00 -0700 [CRYPTO] Don't check for NULL before kfree() Checking a pointer for NULL before calling kfree() on it is redundant. This patch removes such checks from crypto/ Signed-off-by: Jesper Juhl Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 07bbeaf12310263d808b1958f8413b95f98786ea tree 5a739fb75f8e14b8c5f2274d8f1efa6fed145b34 parent 184f6eb8c46afc2a4aa6cb7c51ebc423c36d9c9d author Linus Torvalds Wed, 06 Jul 2005 13:05:50 -0700 committer Linus Torvalds Wed, 06 Jul 2005 13:05:50 -0700 ieee1394: fix broken signed char assumption. "ack_code" is assigned (and tested against) negative numbers, but was declared as "char". Which only works if "char" is signed - which it necessarily isn't. So make that signedness assumption specific. commit b5bf5b6786ccfc9e0c8801291f463d92c8e0b423 tree 2b398307b9d647f8f8902093f66ec20348727567 parent 5e6557722e69840506eb8bc5a1edcdb4e447a917 author Jeff Mahoney Wed, 06 Jul 2005 15:26:27 -0400 committer Linus Torvalds Wed, 06 Jul 2005 12:55:20 -0700 [PATCH] openfirmware: add sysfs nodes for open firmware devices This adds sysfs nodes that the hotplug userspace can use to load the appropriate modules. In order for hotplug to work with macio devices, patches to module-init-tools and hotplug must be applied. Those patches are available at: ftp://ftp.suse.com/pub/people/jeffm/linux/macio-hotplug/ Changes: The previous versions were built on 2.6.12. 2.6.13-rcX introduced a device_attribute parameter to the show functions. Since that parameter was treated as the output buffer, memory corruption would result, causing Oopsen very quickly. Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit 5e6557722e69840506eb8bc5a1edcdb4e447a917 tree 965d19e55a56d2daaed47711c01a8c27e29e592c parent 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 author Jeff Mahoney Wed, 06 Jul 2005 15:44:41 -0400 committer Linus Torvalds Wed, 06 Jul 2005 12:55:20 -0700 [PATCH] openfirmware: generate device table for userspace This converts the usage of struct of_match to struct of_device_id, similar to pci_device_id. This allows a device table to be generated, which can be parsed by depmod(8) to generate a map file for module loading. In order for hotplug to work with macio devices, patches to module-init-tools and hotplug must be applied. Those patches are available at: ftp://ftp.suse.com/pub/people/jeffm/linux/macio-hotplug/ Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit 184f6eb8c46afc2a4aa6cb7c51ebc423c36d9c9d tree e32c7dac4947a252f6e17e62db37ca0e4d5fdf9c parent b5bf5b6786ccfc9e0c8801291f463d92c8e0b423 author Jeff Mahoney Wed, 06 Jul 2005 15:45:09 -0400 committer Linus Torvalds Wed, 06 Jul 2005 12:55:20 -0700 [PATCH] openfirmware: implement hotplug for macio devices This adds the hotplug routine for generating hotplug events when devices are seen on the macio bus. It uses the attributed created by the sysfs nodes to generate the hotplug environment vars for userspace. Since the characters allowed inside the 'compatible' field are NUL terminated, they are exported as individual OF_COMPATIBLE_# variables, with OF_COMPATIBLE_N maintaining a count of how many there are. In order for hotplug to work with macio devices, patches to module-init-tools and hotplug must be applied. Those patches are available at: ftp://ftp.suse.com/pub/people/jeffm/linux/macio-hotplug/ Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 tree 70eef6f2d06a6f3ac36ef8ac8ea24445880986a0 parent 83b78bd2d31f12d7d9317d9802a1996a7bd8a6f2 author Dave Jones Wed, 06 Jul 2005 15:29:09 -0400 committer Linus Torvalds Wed, 06 Jul 2005 12:40:35 -0700 [PATCH] Fix bt87x.c build problem for real Just the declaration fix wasn't enough to fix things in bt78x.c Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 83b78bd2d31f12d7d9317d9802a1996a7bd8a6f2 tree 79468471ee42a327cad337d065a9498833d5bd24 parent b4634484815e1879512a23e4f59eef648135c30a author Christoph Lameter Wed, 06 Jul 2005 10:47:07 -0700 committer Linus Torvalds Wed, 06 Jul 2005 10:52:45 -0700 [PATCH] Fix broken kmalloc_node in rc1/rc2 This patch used to be in Andrew's tree before the NUMA slab allocator went in. Either this patch or the NUMA slab allocator is needed in order for kmalloc_node to work correctly. pcibus_to_node may be used to generate the node information passed to kmalloc_node. pcibus_to_node returns -1 if it was not able to determine on which node a pcibus is located. For that case kmalloc_node must work like kmalloc. Signed-off-by: Christoph Lameter Signed-off-by: Linus Torvalds commit b4634484815e1879512a23e4f59eef648135c30a tree 2fe5cb66de97b707e23d531578dc2a656855415e parent 3d3c2ae1101c1f2dff7e2f9d514769779dbd2737 author Greg KH Wed, 06 Jul 2005 08:51:03 -0700 committer Linus Torvalds Wed, 06 Jul 2005 09:34:23 -0700 [PATCH] Fix bt87x.c build problem Missing forward declaration Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3d3c2ae1101c1f2dff7e2f9d514769779dbd2737 tree 366f36bab03ca4471430021b5f2283993c19f4de parent a18bcb7450840f07a772a45229de4811d930f461 author Greg KH Wed, 06 Jul 2005 09:09:38 -0700 committer Linus Torvalds Wed, 06 Jul 2005 09:22:45 -0700 [PATCH] PCI: fix !CONFIG_HOTPLUG pci build problem Here's a patch to fix the build issue when CONFIG_HOTPLUG is not enabled in 2.6.13-rc2. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds