diff --git a/[refs] b/[refs] index ff1481dad5bd..2d06d90e9cda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2262d8a231e92742651859a10c9a4430a5e899a +refs/heads/master: 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 diff --git a/trunk/arch/tile/kernel/hardwall.c b/trunk/arch/tile/kernel/hardwall.c index 7bf0627b733d..584b965dc824 100644 --- a/trunk/arch/tile/kernel/hardwall.c +++ b/trunk/arch/tile/kernel/hardwall.c @@ -364,6 +364,8 @@ static struct hardwall_info *hardwall_create( /* Allocate a new rectangle optimistically. */ rect = kmalloc(sizeof(struct hardwall_info), GFP_KERNEL | __GFP_ZERO); + if (rect == NULL) + return ERR_PTR(-ENOMEM); INIT_LIST_HEAD(&rect->task_head); /* Compute the rectangle size and validate that it's plausible. */