tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Pull fix-offsets-h into release branch

Tony Luck deb75f3c 5a23f347

+11 -11
unified split
+1 -11
arch/ia64/Makefile
··· 82 82 archclean: 83 83 $(Q)$(MAKE) $(clean)=$(boot) 84 84 85 - archprepare: include/asm-ia64/.offsets.h.stamp 86 - 87 - include/asm-ia64/.offsets.h.stamp: 88 - mkdir -p include/asm-ia64 89 - [ -s include/asm-ia64/asm-offsets.h ] \ 90 - || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/asm-offsets.h 91 - touch $@ 92 - 93 - 94 - 95 - CLEAN_FILES += vmlinux.gz bootloader include/asm-ia64/.offsets.h.stamp 85 + CLEAN_FILES += vmlinux.gz bootloader 96 86 97 87 boot: lib/lib.a vmlinux 98 88 $(Q)$(MAKE) $(build)=$(boot) $@
+1
arch/ia64/kernel/asm-offsets.c
··· 4 4 * to extract and format the required data. 5 5 */ 6 6 7 + #define ASM_OFFSETS_C 1 7 8 #include <linux/config.h> 8 9 9 10 #include <linux/sched.h>
+2
include/asm-ia64/ptrace.h
··· 57 57 #include <linux/config.h> 58 58 59 59 #include <asm/fpu.h> 60 + #ifndef ASM_OFFSETS_C 60 61 #include <asm/asm-offsets.h> 62 + #endif 61 63 62 64 /* 63 65 * Base-2 logarithm of number of pages to allocate per task structure
+7
include/asm-ia64/thread_info.h
··· 5 5 #ifndef _ASM_IA64_THREAD_INFO_H 6 6 #define _ASM_IA64_THREAD_INFO_H 7 7 8 + #ifndef ASM_OFFSETS_C 8 9 #include <asm/asm-offsets.h> 10 + #endif 9 11 #include <asm/processor.h> 10 12 #include <asm/ptrace.h> 11 13 ··· 53 51 }, \ 54 52 } 55 53 54 + #ifndef ASM_OFFSETS_C 56 55 /* how to get the thread information struct from C */ 57 56 #define current_thread_info() ((struct thread_info *) ((char *) current + IA64_TASK_SIZE)) 58 57 #define alloc_thread_info(tsk) ((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE)) 58 + #else 59 + #define current_thread_info() ((struct thread_info *) 0) 60 + #define alloc_thread_info(tsk) ((struct thread_info *) 0) 61 + #endif 59 62 #define free_thread_info(ti) /* nothing */ 60 63 61 64 #define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR