diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-01 15:36:23 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-01 15:36:23 (GMT) |
| commit | df87f8c06c7f562ef9d93b9d674eebf2ffb96f6a (patch) | |
| tree | 3a08bcba2f61bb4ffaac8dc1127ec6c5815e0563 /arch/alpha/kernel/core_titan.c | |
| parent | 3350b2acdd39d23db52710045536b943fe38a35c (diff) | |
| parent | 8ab1221c20255f35d85664a046549bc6135122c2 (diff) | |
| download | linux-fsl-qoriq-df87f8c06c7f562ef9d93b9d674eebf2ffb96f6a.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fixup last users of irq_chip->typename
Alpha: Rearrange thread info flags fixing two regressions
arch/alpha/kernel: Add kmalloc NULL tests
arch/alpha/kernel/sys_ruffian.c: Use DIV_ROUND_CLOSEST
Diffstat (limited to 'arch/alpha/kernel/core_titan.c')
| -rw-r--r-- | arch/alpha/kernel/core_titan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c index 7668649..219bf27 100644 --- a/arch/alpha/kernel/core_titan.c +++ b/arch/alpha/kernel/core_titan.c @@ -757,6 +757,8 @@ titan_agp_info(void) * Allocate the info structure. */ agp = kmalloc(sizeof(*agp), GFP_KERNEL); + if (!agp) + return NULL; /* * Fill it in. |