On Tue, 2013-01-22 at 23:44 +0100, John Kacur wrote: > From: Kees Cook <keesc...@chromium.org> > > commit c94082656dac74257f63e91f78d5d458ac781fa5 upstream > > The traps are referred to by their numbers and it can be difficult to > understand them while reading the code without context. This patch adds > enumeration of the trap numbers and replaces the numbers with the correct > enum for x86. > > Signed-off-by: Kees Cook <keesc...@chromium.org> > Link: http://lkml.kernel.org/r/20120310000710.ga32...@www.outflux.net > Signed-off-by: H. Peter Anvin <h...@zytor.com> > Cherry-picked-for: v2.3.37 > > This fixes the following build error > make O=/bld/v3.2.37 > make[2]: Nothing to be done for `relocs'. > Using /home/jkacur/linux-rt as source for kernel > GEN /bld/v3.2.37/Makefile > CHK include/linux/version.h > CHK include/generated/utsrelease.h > CALL /home/jkacur/linux-rt/scripts/checksyscalls.sh > CHK include/generated/compile.h > CHK kernel/config_data.h > CC [M] drivers/misc/sgi-xp/xpc_main.o > /home/jkacur/linux-rt/drivers/misc/sgi-xp/xpc_main.c: In function > ‘xpc_system_die’: > /home/jkacur/linux-rt/drivers/misc/sgi-xp/xpc_main.c:1208: error: > ‘X86_TRAP_DF’ undeclared (first use in this function) > /home/jkacur/linux-rt/drivers/misc/sgi-xp/xpc_main.c:1208: error: (Each > undeclared identifier is reported only once > /home/jkacur/linux-rt/drivers/misc/sgi-xp/xpc_main.c:1208: error: for each > function it appears in.) > /home/jkacur/linux-rt/drivers/misc/sgi-xp/xpc_main.c:1211: error: > ‘X86_TRAP_MF’ undeclared (first use in this function) > /home/jkacur/linux-rt/drivers/misc/sgi-xp/xpc_main.c:1212: error: > ‘X86_TRAP_XF’ undeclared (first use in this function) > make[4]: *** [drivers/misc/sgi-xp/xpc_main.o] Error 1 > make[3]: *** [drivers/misc/sgi-xp] Error 2 > make[2]: *** [drivers/misc] Error 2 > make[1]: *** [drivers] Error 2 > make: *** [sub-make] Error 2 [...]
Queued up for 3.2, thanks. I've also added X86_UV and SGI_XP to the
x86 .config I build.
Ben.
--
Ben Hutchings
Everything should be made as simple as possible, but not simpler.
- Albert Einstein
signature.asc
Description: This is a digitally signed message part
