Skip to content

Commit

Permalink
kbuild: um fix so it compile with generic asm-offsets.h support
Browse files Browse the repository at this point in the history
um has it own set of files for asm-offsets. So for now the
gen-asm-offset macro is just duplicated in the um Makefile.

This may well be the final solution since um is a bit special compared
to other architectures - time will tell.

Also added a dummy arch/um/kernel/asm-offsets.h file to keep kbuild happy.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  • Loading branch information
Sam Ravnborg committed Sep 9, 2005
1 parent 0037c78 commit f64a227
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
16 changes: 16 additions & 0 deletions arch/um/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,22 @@ define filechk_umlconfig
sed 's/ CONFIG/ UML_CONFIG/'
endef

define filechk_gen-asm-offsets
(set -e; \
echo "#ifndef __ASM_OFFSETS_H__"; \
echo "#define __ASM_OFFSETS_H__"; \
echo "/*"; \
echo " * DO NOT MODIFY."; \
echo " *"; \
echo " * This file was generated by arch/$(ARCH)/Makefile"; \
echo " *"; \
echo " */"; \
echo ""; \
sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
echo ""; \
echo "#endif" )
endef

$(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h
$(call filechk,umlconfig)

Expand Down
1 change: 1 addition & 0 deletions arch/um/kernel/asm-offsets.c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* Dummy file to make kbuild happy - unused! */

0 comments on commit f64a227

Please sign in to comment.