Skip to main content

Browse the archive

Revision 5b129817aedb03d94fb960e7a34d0f5eaa20a2f2 authored by Linus Torvalds on 01 January 2023, 19:19:50 UTC, committed by Linus Torvalds on 01 January 2023, 19:19:50 UTC 
Merge tag 'x86_urgent_for_v6.2_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
 
Pull x86 fixes from Borislav Petkov:

 - Two fixes to correct how kprobes handles INT3 now that they're added
   by other functionality like the rethunks and not only kgdb

 - Remove __init section markings of two functions which are referenced
   by a function in the .text section

* tag 'x86_urgent_for_v6.2_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kprobes: Fix optprobe optimization check with CONFIG_RETHUNK
  x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK
  x86/calldepth: Fix incorrect init section references
2 parent s 95d248d + 63dc632
Raw File
Makefile 
# SPDX-License-Identifier: GPL-2.0
# Makefile for USB tools
include ../scripts/Makefile.include

bindir ?= /usr/bin

ifeq ($(srctree),)
srctree := $(patsubst %/,%,$(dir $(CURDIR)))
srctree := $(patsubst %/,%,$(dir $(srctree)))
endif

# Do not use make's built-in rules
# (this improves performance and avoids hard-to-debug behaviour);
MAKEFLAGS += -r

override CFLAGS += -O2 -Wall -Wextra -g -D_GNU_SOURCE -I$(OUTPUT)include -I$(srctree)/tools/include
override LDFLAGS += -lpthread

ALL_TARGETS := testusb ffs-test
ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))

all: $(ALL_PROGRAMS)

export srctree OUTPUT CC LD CFLAGS
include $(srctree)/tools/build/Makefile.include

TESTUSB_IN := $(OUTPUT)testusb-in.o
$(TESTUSB_IN): FORCE
	$(Q)$(MAKE) $(build)=testusb
$(OUTPUT)testusb: $(TESTUSB_IN)
	$(QUIET_LINK)$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)

FFS_TEST_IN := $(OUTPUT)ffs-test-in.o
$(FFS_TEST_IN): FORCE
	$(Q)$(MAKE) $(build)=ffs-test
$(OUTPUT)ffs-test: $(FFS_TEST_IN)
	$(QUIET_LINK)$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)

clean:
	rm -f $(ALL_PROGRAMS)
	find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.d' -delete -o -name '\.*.o.cmd' -delete

install: $(ALL_PROGRAMS)
	install -d -m 755 $(DESTDIR)$(bindir);		\
	for program in $(ALL_PROGRAMS); do		\
		install $$program $(DESTDIR)$(bindir);	\
	done

FORCE:

.PHONY: all install clean FORCE prepare
back to top