diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-04 07:49:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-04 07:49:35 +0100 |
| commit | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 (patch) | |
| tree | 79b2b4e060a97b1e7c60d58549f8c97cb15db5dd /arch/xtensa/platforms/iss/network.c | |
| parent | 0e73453e172aaa38fd59fd4d3fc589e8fc9b9a70 (diff) | |
| parent | 215432ed30393ed4a8f77db0a1fe34523c48cdba (diff) | |
Merge branch 'perf/urgent' into perf/core to fix conflicts
Conflicts:
tools/perf/bench/numa.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/xtensa/platforms/iss/network.c')
| -rw-r--r-- | arch/xtensa/platforms/iss/network.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c index 56f88b7afe2..e9e1aad8c27 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c @@ -737,7 +737,8 @@ static int __init iss_net_setup(char *str) return 1; } - if ((new = alloc_bootmem(sizeof new)) == NULL) { + new = alloc_bootmem(sizeof(*new)); + if (new == NULL) { printk("Alloc_bootmem failed\n"); return 1; } |