]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t
authorAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Wed, 5 Sep 2012 22:17:04 +0000 (22:17 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 6 Sep 2012 23:48:50 +0000 (09:48 +1000)
commit9023abe1cc96998892b53e54a41076484221f3b0
tree6a616228242a2caeca3ceff4f24c97b6f6053ce0
parentf658ce8b819d9ed13ef215be3de451aa8e205785
powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t

commit: 025dbe29a36fb8bb31d3bc25e7cc95473d5f19fe
[24/29] powerpc: Uprobes port to powerpc

Caused a clash with the fore200e driver:

In file included from drivers/atm/fore200e.c:70:0:
drivers/atm/fore200e.h:263:3: error: redefinition of typedef 'opcode_t' with different type
arch/powerpc/include/asm/probes.h:25:13: note: previous declaration of 'opcode_t' was here

Fix the namespace clash by making opcode_t in probes.h to ppc_opcode_t.

Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/kprobes.h
arch/powerpc/include/asm/probes.h
arch/powerpc/include/asm/uprobes.h