From: Sam Ravnborg <sam@ravnborg.org>
To: linux-kernel@vger.kernel.org
Cc: Sam Ravnborg <sam@mars (none)>, Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH 10/12] kbuild: cris use generic asm-offsets.h support
Date: Sat, 10 Sep 2005 00:41:46 +0200 [thread overview]
Message-ID: <11263057062257-git-send-email-sam@ravnborg.org> (raw)
In-Reply-To: <11263057061465-git-send-email-sam@ravnborg.org>
Cris has a dedicated asm-offsets.c file per subarchitecture.
So a symlink is created to put the desired asm-offsets.c file
in $(ARCH)/kernel
This is absolutely not good practice, but it was the trick
used in the rest of the cris code.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/cris/Makefile | 10 ++--------
arch/cris/arch-v10/kernel/entry.S | 2 +-
arch/cris/arch-v32/kernel/entry.S | 2 +-
3 files changed, 4 insertions(+), 10 deletions(-)
5a0773698c51fdcec7eb361b6b819669ed1d249e
diff --git a/arch/cris/Makefile b/arch/cris/Makefile
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -107,8 +107,7 @@ archclean:
rm -f timage vmlinux.bin decompress.bin rescue.bin cramfs.img
rm -rf $(LD_SCRIPT).tmp
-prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch \
- include/asm-$(ARCH)/$(SARCH)/offset.h
+prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch
# Create some links to make all tools happy
$(SRC_ARCH)/.links:
@@ -120,6 +119,7 @@ $(SRC_ARCH)/.links:
@ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib
@ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch
@ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
+ @ln -sfn $(SRC_ARCH)/$(SARCH)/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
@touch $@
# Create link to sub arch includes
@@ -128,9 +128,3 @@ $(srctree)/include/asm-$(ARCH)/.arch: $(
@rm -f include/asm-$(ARCH)/arch
@ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch
@touch $@
-
-arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
- include/config/MARKER
-
-include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s
- $(call filechk,gen-asm-offsets)
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S
--- a/arch/cris/arch-v10/kernel/entry.S
+++ b/arch/cris/arch-v10/kernel/entry.S
@@ -270,7 +270,7 @@
#include <asm/arch/sv_addr_ag.h>
#include <asm/errno.h>
#include <asm/thread_info.h>
-#include <asm/arch/offset.h>
+#include <asm/asm-offsets.h>
#include <asm/page.h>
#include <asm/pgtable.h>
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -23,7 +23,7 @@
#include <asm/unistd.h>
#include <asm/errno.h>
#include <asm/thread_info.h>
-#include <asm/arch/offset.h>
+#include <asm/asm-offsets.h>
#include <asm/arch/hwregs/asm/reg_map_asm.h>
#include <asm/arch/hwregs/asm/intr_vect_defs_asm.h>
next prev parent reply other threads:[~2005-09-09 22:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-09 22:41 [PATCH 1/12] kbuild: full dependency check on asm-offsets.h Sam Ravnborg
2005-09-09 22:41 ` [PATCH 2/12] kbuild: h8300,m68knommu,sh,sh64 use generic asm-offsets.h support Sam Ravnborg
2005-09-09 22:41 ` [PATCH 3/12] kbuild: arm26,sparc use generic asm-offset support Sam Ravnborg
2005-09-09 22:41 ` [PATCH 4/12] kbuild: m68k,parisc,ppc,ppc64,s390,xtensa use generic asm-offsets.h support Sam Ravnborg
2005-09-09 22:41 ` [PATCH 5/12] kbuild: arm - " Sam Ravnborg
2005-09-09 22:41 ` [PATCH 6/12] kbuild: alpha,x86_64 " Sam Ravnborg
2005-09-09 22:41 ` [PATCH 7/12] kbuild: v850 " Sam Ravnborg
2005-09-09 22:41 ` [PATCH 8/12] kbuild: ia64 " Sam Ravnborg
2005-09-09 22:41 ` [PATCH 9/12] kbuild: mips " Sam Ravnborg
2005-09-09 22:41 ` Sam Ravnborg [this message]
2005-09-09 22:41 ` [PATCH 11/12] kbuild: frv,m32r,sparc64 introduce fake asm-offsets.h file Sam Ravnborg
2005-09-09 22:41 ` [PATCH 12/12] kbuild: um fix so it compile with generic asm-offsets.h support Sam Ravnborg
2005-09-10 19:15 ` [PATCH 9/12] kbuild: mips use " Roman Zippel
2005-09-10 19:30 ` Sam Ravnborg
2005-09-10 20:26 ` Roman Zippel
2005-09-10 20:48 ` Sam Ravnborg
2005-09-10 21:09 ` Roman Zippel
2005-09-11 2:09 ` Yoichi Yuasa
[not found] <BFECAF9E178F144FAEF2BF4CE739C66803377FF8@exmail1.se.axis.com>
2005-09-12 5:57 ` [PATCH 10/12] kbuild: cris " Mikael Starvik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11263057062257-git-send-email-sam@ravnborg.org \
--to=sam@ravnborg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@mars \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox