diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 18:02:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 18:02:43 -0800 |
| commit | 5ee354a0295c34aa7da07be8490f86edee2c7883 (patch) | |
| tree | 9ceeba4179d48f0ca7b31a4d2b5a7f1d60df5ecb /arch/ia64/sn/pci/pcibr/pcibr_provider.c | |
| parent | c77417132c12af338a7d37956809b2b98d20413c (diff) | |
| parent | a4b1d1b3619ee2fac40cdf5ca86a4758e45b9358 (diff) | |
| download | linux-5ee354a0295c34aa7da07be8490f86edee2c7883.tar.bz2 | |
Merge branch 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: pcibr: Use kmemdup rather than duplicating its implementation
ia64: sn: Use kmemdup rather than duplicating its implementation
ia64: tioca: Use kmemdup rather than duplicating its implementation
[IA64] Merge overlapping reserved regions at boot
Diffstat (limited to 'arch/ia64/sn/pci/pcibr/pcibr_provider.c')
| -rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_provider.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c index 5698f29d5add..8886a0bc4a11 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c @@ -127,12 +127,11 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont * Allocate kernel bus soft and copy from prom. */ - soft = kmalloc(sizeof(struct pcibus_info), GFP_KERNEL); + soft = kmemdup(prom_bussoft, sizeof(struct pcibus_info), GFP_KERNEL); if (!soft) { return NULL; } - memcpy(soft, prom_bussoft, sizeof(struct pcibus_info)); soft->pbi_buscommon.bs_base = (unsigned long) ioremap(REGION_OFFSET(soft->pbi_buscommon.bs_base), sizeof(struct pic)); |