flowtop-libs = -lurcu \ -lnetfilter_conntrack \ $(shell pkg-config --libs ncurses 2> /dev/null \ || echo '-lncurses') \ $(shell pkg-config --libs tinfo 2> /dev/null ) \ -lpthread ifeq ($(CONFIG_GEOIP), 1) flowtop-libs += -lGeoIP \ -lz endif flowtop-objs = xmalloc.o \ oui.o \ str.o \ sig.o \ sock.o \ dev.o \ link.o \ hash.o \ lookup.o \ tprintf.o \ screen.o \ flowtop.o ifeq ($(CONFIG_GEOIP), 1) flowtop-objs += geoip.o \ ioops.o endif flowtop-eflags = $(shell pkg-config --cflags ncurses) flowtop-confs = tcp.conf \ udp.conf \ geoip.conf sitory'/>
summaryrefslogtreecommitdiff
path: root/mm/util.c
diff options
context:
space:
mode:
authorDave Hansen <dave.hansen@linux.intel.com>2016-03-10 14:12:13 -0800
committerIngo Molnar <mingo@kernel.org>2016-03-11 09:55:57 +0100
commit0d47638f80a02b15869f1fe1fc09e5bf996750fd (patch)
treeb9b2f2fdb837c4c58104906bf5a32f129cf377dd /mm/util.c
parent49cd53bf14aeb471c4a2682300dfc05ef2fd09f2 (diff)
x86/mm/pkeys: Fix mismerge of protection keys CPUID bits
Kirill Shutemov pointed this out to me. The tip tree currently has commit: dfb4a70f2 [x86/cpufeature, x86/mm/pkeys: Add protection keys related CPUID definitions] whioch added support for two new CPUID bits: X86_FEATURE_PKU and X86_FEATURE_OSPKE. But, those bits were mis-merged and put in cpufeature.h instead of cpufeatures.h. This didn't cause any breakage *except* it keeps the "ospke" and "pku" bits from showing up in cpuinfo. Now cpuinfo has the two new flags: flags : ... pku ospke BTW, is it really wise to have cpufeature.h and cpufeatures.h? It seems like they can only cause confusion and mahem with tab completion. Reported-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Acked-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: Dave Hansen <dave@sr71.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20160310221213.06F9DB53@viggo.jf.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/util.c')