Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar: "A handful of cleanups: dma-ops cleanups, missing boot time kcalloc() check, a Sparse fix and use struct_size() to simplify a vzalloc() call" * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/pci: Clean up usage of X86_DEV_DMA_OPS x86/Kconfig: Remove the unused X86_DMA_REMAP KConfig symbol x86/kexec/crash: Use struct_size() in vzalloc() x86/mm/tlb: Define LOADED_MM_SWITCHING with pointer-sized number x86/platform/uv: Fix missing checks of kcalloc() return values
Tento commit je obsažen v:
@@ -2133,14 +2133,19 @@ static int __init summarize_uvhub_sockets(int nuvhubs,
|
||||
*/
|
||||
static int __init init_per_cpu(int nuvhubs, int base_part_pnode)
|
||||
{
|
||||
unsigned char *uvhub_mask;
|
||||
struct uvhub_desc *uvhub_descs;
|
||||
unsigned char *uvhub_mask = NULL;
|
||||
|
||||
if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub())
|
||||
timeout_us = calculate_destination_timeout();
|
||||
|
||||
uvhub_descs = kcalloc(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL);
|
||||
if (!uvhub_descs)
|
||||
goto fail;
|
||||
|
||||
uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);
|
||||
if (!uvhub_mask)
|
||||
goto fail;
|
||||
|
||||
if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask))
|
||||
goto fail;
|
||||
|
Odkázat v novém úkolu
Zablokovat Uživatele