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

Commit 82f1b07b authored by Tony Luck's avatar Tony Luck
Browse files

[IA64] fix circular dependency on generation of asm-offsets.h 



Fix?  One ugly hack is replaced by a different ugly hack.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 2f4ba45a

arch/ia64/Makefile

+1 −11
Original line number Diff line number Diff line
@@ -82,17 +82,7 @@ unwcheck: vmlinux 
archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



archprepare:  include/asm-ia64/.offsets.h.stamp



include/asm-ia64/.offsets.h.stamp:

	mkdir -p include/asm-ia64

	[ -s include/asm-ia64/asm-offsets.h ] \

	|| echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/asm-offsets.h

	touch $@







CLEAN_FILES += vmlinux.gz bootloader include/asm-ia64/.offsets.h.stamp

CLEAN_FILES += vmlinux.gz bootloader



boot:	lib/lib.a vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@

arch/ia64/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * to extract and format the required data.

 */



#define ASM_OFFSETS_C 1

#include <linux/config.h>



#include <linux/sched.h>

include/asm-ia64/ptrace.h

+2 −0
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ 
#include <linux/config.h>



#include <asm/fpu.h>

#ifndef ASM_OFFSETS_C

#include <asm/asm-offsets.h>

#endif



/*

 * Base-2 logarithm of number of pages to allocate per task structure

include/asm-ia64/thread_info.h

+7 −0
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ 
#ifndef _ASM_IA64_THREAD_INFO_H

#define _ASM_IA64_THREAD_INFO_H



#ifndef ASM_OFFSETS_C

#include <asm/asm-offsets.h>

#endif

#include <asm/processor.h>

#include <asm/ptrace.h>
@@ -51,9 +53,14 @@ struct thread_info { 
	},					\

}



#ifndef ASM_OFFSETS_C

/* how to get the thread information struct from C */

#define current_thread_info()	((struct thread_info *) ((char *) current + IA64_TASK_SIZE))

#define alloc_thread_info(tsk)	((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))

#else

#define current_thread_info()	((struct thread_info *) 0)

#define alloc_thread_info(tsk)	((struct thread_info *) 0)

#endif

#define free_thread_info(ti)	/* nothing */



#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR