diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/alpha/kernel/core_marvel.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/alpha/kernel/core_marvel.c')
| -rw-r--r-- | arch/alpha/kernel/core_marvel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index 8e059e58b0a..53dd2f1a53a 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/arch/alpha/kernel/core_marvel.c | |||
| @@ -1103,6 +1103,8 @@ marvel_agp_info(void) | |||
| 1103 | * Allocate the info structure. | 1103 | * Allocate the info structure. |
| 1104 | */ | 1104 | */ |
| 1105 | agp = kmalloc(sizeof(*agp), GFP_KERNEL); | 1105 | agp = kmalloc(sizeof(*agp), GFP_KERNEL); |
| 1106 | if (!agp) | ||
| 1107 | return NULL; | ||
| 1106 | 1108 | ||
| 1107 | /* | 1109 | /* |
| 1108 | * Fill it in. | 1110 | * Fill it in. |