Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0365f707 authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

[CRIS] Merge asm-offsets.c for both arches into one file. 



Eliminates the link to arch specific asm-offsets.c from CRIS
architecture build system.

Resulting asm-offsets.s are identical before and after change
for both arch-v10 and arch-v32.

Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 556dcee7

arch/cris/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ ifdef CONFIG_ETRAX_ARCH_V32 
endif

	@rm -rf $(SRC_ARCH)/kernel/vmlinux.lds.S

	@ln -sfn ../$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S

	@rm -rf $(SRC_ARCH)/kernel/asm-offsets.c

	@ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c

	@touch $@



archclean:
@@ -116,8 +114,8 @@ MRPROPER_FILES += \ 
	$(SRC_ARCH)/boot \

	$(SRC_ARCH)/lib \

	$(SRC_ARCH)/arch \

	$(SRC_ARCH)/kernel/vmlinux.lds.S \

	$(SRC_ARCH)/kernel/asm-offsets.c

	$(SRC_ARCH)/kernel/vmlinux.lds.S





define archhelp

  echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'

arch/cris/arch-v10/kernel/asm-offsets.c

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
#include <linux/sched.h>

#include <asm/thread_info.h>



/*

 * Generate definitions needed by assembly language modules.

 * This code generates raw asm output which is post-processed to extract

 * and format the required data.

 */



#define DEFINE(sym, val) \

        asm volatile("\n->" #sym " %0 " #val : : "i" (val))



#define BLANK() asm volatile("\n->" : : )



int main(void)

{

#define ENTRY(entry) DEFINE(PT_ ## entry, offsetof(struct pt_regs, entry))

	ENTRY(orig_r10);

	ENTRY(r13); 

	ENTRY(r12); 

	ENTRY(r11);

        ENTRY(r10);

        ENTRY(r9);

        ENTRY(mof);

        ENTRY(dccr);

        ENTRY(srp);

	BLANK();

#undef ENTRY

#define ENTRY(entry) DEFINE(TI_ ## entry, offsetof(struct thread_info, entry))

        ENTRY(task);

        ENTRY(flags);

        ENTRY(preempt_count);

        BLANK();

#undef ENTRY

#define ENTRY(entry) DEFINE(THREAD_ ## entry, offsetof(struct thread_struct, entry))

	ENTRY(ksp);

        ENTRY(usp);

        ENTRY(dccr);

        BLANK();

#undef ENTRY

#define ENTRY(entry) DEFINE(TASK_ ## entry, offsetof(struct task_struct, entry))

        ENTRY(pid);

        BLANK();

        DEFINE(LCLONE_VM, CLONE_VM);

        DEFINE(LCLONE_UNTRACED, CLONE_UNTRACED);

        return 0;

}

arch/cris/arch-v32/kernel/asm-offsets.c→arch/cris/kernel/asm-offsets.c

+33 −18
Original line number Diff line number Diff line 
#include <linux/sched.h>

#include <asm/thread_info.h>

#include <linux/autoconf.h>



/*

 * Generate definitions needed by assembly language modules.
@@ -12,6 +13,10 @@ 


#define BLANK() asm volatile("\n->" : : )



#if !defined(CONFIG_ETRAX_ARCH_V10) && !defined(CONFIG_ETRAX_ARCH_V32)

#error One of ARCH v10 and ARCH v32 must be true!

#endif



int main(void)

{

#define ENTRY(entry) DEFINE(PT_ ## entry, offsetof(struct pt_regs, entry))
@@ -21,10 +26,16 @@ int main(void) 
	ENTRY(r11);

	ENTRY(r10);

	ENTRY(r9);

#ifdef CONFIG_ETRAX_ARCH_V32

	ENTRY(acr);

	ENTRY(srs);

#endif

	ENTRY(mof);

#ifdef CONFIG_ETRAX_ARCH_V10

	ENTRY(dccr);

#else

	ENTRY(ccs);

#endif

	ENTRY(srp);

	BLANK();

#undef ENTRY
@@ -37,7 +48,11 @@ int main(void) 
#define ENTRY(entry) DEFINE(THREAD_ ## entry, offsetof(struct thread_struct, entry))

	ENTRY(ksp);

	ENTRY(usp);

#ifdef CONFIG_ETRAX_ARCH_V10

	ENTRY(dccr);

#else

	ENTRY(ccs);

#endif

	BLANK();

#undef ENTRY

#define ENTRY(entry) DEFINE(TASK_ ## entry, offsetof(struct task_struct, entry))