From: Chen Gang Date: Thu, 28 Nov 2013 08:51:45 +0000 (+0800) Subject: arch: hexagon: include: asm: add prefix "hvm[ci]_" for all enum members in "hexagon_vm.h" X-Git-Tag: v3.15-rc1~83^2~14 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6becd400f8450062b891dee7e68b14f203e792a5;p=pandora-kernel.git arch: hexagon: include: asm: add prefix "hvm[ci]_" for all enum members in "hexagon_vm.h" Append "hvmc_" or "hvmi_" to all related enum members (which are too common to make conflict with another sub-systems). The related error with allmodconfig: CC [M] drivers/md/raid1.o drivers/md/raid1.c:1440:13: error: 'status' redeclared as different kind of symbol arch/hexagon/include/asm/hexagon_vm.h:76:2: note: previous definition of 'status' was here Also use 'affinity' instead of 'locdis' for __vmintop_affinity(). Signed-off-by: Chen Gang Signed-off-by: Richard Kuo --- Reading git-diff-tree failed