Skip to content

Commit

Permalink
Merge tag 'acpi-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Create the output directory for the ACPI tools during build if it has
  not been present before and prevent the compilation from failing in
  that case (Chen Yu)"

* tag 'acpi-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: tools: Fix compilation when output directory is not present
  • Loading branch information
torvalds committed Dec 10, 2021
2 parents d46bca6 + 11f8cb8 commit 9e65da1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions tools/power/acpi/Makefile.config
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ KERNEL_INCLUDE := $(OUTPUT)include
ACPICA_INCLUDE := $(srctree)/../../../drivers/acpi/acpica
CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)
CFLAGS += $(WARNINGS)
MKDIR = mkdir

ifeq ($(strip $(V)),false)
QUIET=@
Expand Down
1 change: 1 addition & 0 deletions tools/power/acpi/Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ $(KERNEL_INCLUDE):

$(objdir)%.o: %.c $(KERNEL_INCLUDE)
$(ECHO) " CC " $(subst $(OUTPUT),,$@)
$(QUIET) $(MKDIR) -p $(objdir) 2>/dev/null
$(QUIET) $(CC) -c $(CFLAGS) -o $@ $<

all: $(OUTPUT)$(TOOL)
Expand Down

0 comments on commit 9e65da1

Please sign in to comment.