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

kbuild: m68k,parisc,ppc,ppc64,s390,xtensa use generic asm-offsets.h support

Delete obsoleted parts form arch makefiles and rename to asm-offsets.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

+62 -112
-9
arch/m68k/Makefile
··· 113 113 bzip2 -1c vmlinux >vmlinux.bz2 114 114 endif 115 115 116 - prepare: include/asm-$(ARCH)/offsets.h 117 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h 118 - 119 - arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ 120 - include/config/MARKER 121 - 122 - include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s 123 - $(call filechk,gen-asm-offsets) 124 - 125 116 archclean: 126 117 rm -f vmlinux.gz vmlinux.bz2
+1 -1
arch/m68k/fpsp040/skeleton.S
··· 40 40 41 41 #include <linux/linkage.h> 42 42 #include <asm/entry.h> 43 - #include <asm/offsets.h> 43 + #include <asm/asm-offsets.h> 44 44 45 45 |SKELETON idnt 2,1 | Motorola 040 Floating Point Software Package 46 46
+1 -1
arch/m68k/ifpsp060/iskeleton.S
··· 36 36 37 37 #include <linux/linkage.h> 38 38 #include <asm/entry.h> 39 - #include <asm/offsets.h> 39 + #include <asm/asm-offsets.h> 40 40 41 41 42 42 |################################
+1 -1
arch/m68k/kernel/entry.S
··· 42 42 #include <asm/traps.h> 43 43 #include <asm/unistd.h> 44 44 45 - #include <asm/offsets.h> 45 + #include <asm/asm-offsets.h> 46 46 47 47 .globl system_call, buserr, trap 48 48 .globl resume, ret_from_exception
+1 -1
arch/m68k/kernel/head.S
··· 263 263 #include <asm/entry.h> 264 264 #include <asm/pgtable.h> 265 265 #include <asm/page.h> 266 - #include <asm/offsets.h> 266 + #include <asm/asm-offsets.h> 267 267 268 268 #ifdef CONFIG_MAC 269 269
+1 -1
arch/m68k/math-emu/fp_emu.h
··· 39 39 #define _FP_EMU_H 40 40 41 41 #ifdef __ASSEMBLY__ 42 - #include <asm/offsets.h> 42 + #include <asm/asm-offsets.h> 43 43 #endif 44 44 #include <asm/math-emu.h> 45 45
+1 -9
arch/parisc/Makefile
··· 100 100 101 101 install: kernel_install modules_install 102 102 103 - prepare: include/asm-parisc/offsets.h 104 - 105 - arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \ 106 - include/config/MARKER 107 - 108 - include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s 109 - $(call filechk,gen-asm-offsets) 110 - 111 - CLEAN_FILES += lifimage include/asm-parisc/offsets.h 103 + CLEAN_FILES += lifimage 112 104 MRPROPER_FILES += palo.conf 113 105 114 106 define archhelp
+1 -1
arch/parisc/hpux/gate.S
··· 9 9 */ 10 10 11 11 #include <asm/assembly.h> 12 - #include <asm/offsets.h> 12 + #include <asm/asm-offsets.h> 13 13 #include <asm/unistd.h> 14 14 #include <asm/errno.h> 15 15
+1 -1
arch/parisc/hpux/wrappers.S
··· 24 24 #warning PA64 support needs more work...did first cut 25 25 #endif 26 26 27 - #include <asm/offsets.h> 27 + #include <asm/asm-offsets.h> 28 28 #include <asm/assembly.h> 29 29 #include <asm/signal.h> 30 30
+1 -1
arch/parisc/kernel/entry.S
··· 23 23 */ 24 24 25 25 #include <linux/config.h> 26 - #include <asm/offsets.h> 26 + #include <asm/asm-offsets.h> 27 27 28 28 /* we have the following possibilities to act on an interruption: 29 29 * - handle in assembly and use shadowed registers only
+1 -1
arch/parisc/kernel/head.S
··· 14 14 15 15 #include <linux/autoconf.h> /* for CONFIG_SMP */ 16 16 17 - #include <asm/offsets.h> 17 + #include <asm/asm-offsets.h> 18 18 #include <asm/psw.h> 19 19 #include <asm/pdc.h> 20 20
+1 -1
arch/parisc/kernel/process.c
··· 47 47 #include <linux/kallsyms.h> 48 48 49 49 #include <asm/io.h> 50 - #include <asm/offsets.h> 50 + #include <asm/asm-offsets.h> 51 51 #include <asm/pdc.h> 52 52 #include <asm/pdc_chassis.h> 53 53 #include <asm/pgalloc.h>
+1 -1
arch/parisc/kernel/ptrace.c
··· 23 23 #include <asm/pgtable.h> 24 24 #include <asm/system.h> 25 25 #include <asm/processor.h> 26 - #include <asm/offsets.h> 26 + #include <asm/asm-offsets.h> 27 27 28 28 /* PSW bits we allow the debugger to modify */ 29 29 #define USER_PSW_BITS (PSW_N | PSW_V | PSW_CB)
+1 -1
arch/parisc/kernel/signal.c
··· 32 32 #include <asm/uaccess.h> 33 33 #include <asm/pgalloc.h> 34 34 #include <asm/cacheflush.h> 35 - #include <asm/offsets.h> 35 + #include <asm/asm-offsets.h> 36 36 37 37 #ifdef CONFIG_COMPAT 38 38 #include <linux/compat.h>
+1 -1
arch/parisc/kernel/syscall.S
··· 7 7 * sorry about the wall, puffin.. 8 8 */ 9 9 10 - #include <asm/offsets.h> 10 + #include <asm/asm-offsets.h> 11 11 #include <asm/unistd.h> 12 12 #include <asm/errno.h> 13 13 #include <asm/psw.h>
+1 -1
arch/parisc/lib/fixup.S
··· 20 20 * Fixup routines for kernel exception handling. 21 21 */ 22 22 #include <linux/config.h> 23 - #include <asm/offsets.h> 23 + #include <asm/asm-offsets.h> 24 24 #include <asm/assembly.h> 25 25 #include <asm/errno.h> 26 26
+2 -10
arch/ppc/Makefile
··· 105 105 $(Q)$(MAKE) $(clean)=arch/ppc/boot 106 106 $(Q)rm -rf include3 107 107 108 - prepare: include/asm-$(ARCH)/offsets.h checkbin 109 - 110 - arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ 111 - include/config/MARKER 112 - 113 - include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s 114 - $(call filechk,gen-asm-offsets) 108 + prepare: checkbin 115 109 116 110 # Temporary hack until we have migrated to asm-powerpc 117 111 include/asm: include3/asm ··· 137 143 false ; \ 138 144 fi 139 145 140 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h \ 141 - arch/$(ARCH)/kernel/asm-offsets.s \ 142 - $(TOUT) 146 + CLEAN_FILES += $(TOUT) 143 147
+1 -1
arch/ppc/kernel/cpu_setup_6xx.S
··· 15 15 #include <asm/ppc_asm.h> 16 16 #include <asm/cputable.h> 17 17 #include <asm/ppc_asm.h> 18 - #include <asm/offsets.h> 18 + #include <asm/asm-offsets.h> 19 19 #include <asm/cache.h> 20 20 21 21 _GLOBAL(__setup_cpu_601)
+1 -1
arch/ppc/kernel/cpu_setup_power4.S
··· 15 15 #include <asm/ppc_asm.h> 16 16 #include <asm/cputable.h> 17 17 #include <asm/ppc_asm.h> 18 - #include <asm/offsets.h> 18 + #include <asm/asm-offsets.h> 19 19 #include <asm/cache.h> 20 20 21 21 _GLOBAL(__970_cpu_preinit)
+1 -1
arch/ppc/kernel/entry.S
··· 29 29 #include <asm/cputable.h> 30 30 #include <asm/thread_info.h> 31 31 #include <asm/ppc_asm.h> 32 - #include <asm/offsets.h> 32 + #include <asm/asm-offsets.h> 33 33 #include <asm/unistd.h> 34 34 35 35 #undef SHOW_SYSCALLS
+1 -1
arch/ppc/kernel/fpu.S
··· 18 18 #include <asm/cache.h> 19 19 #include <asm/thread_info.h> 20 20 #include <asm/ppc_asm.h> 21 - #include <asm/offsets.h> 21 + #include <asm/asm-offsets.h> 22 22 23 23 /* 24 24 * This task wants to use the FPU now.
+1 -1
arch/ppc/kernel/head.S
··· 31 31 #include <asm/cache.h> 32 32 #include <asm/thread_info.h> 33 33 #include <asm/ppc_asm.h> 34 - #include <asm/offsets.h> 34 + #include <asm/asm-offsets.h> 35 35 36 36 #ifdef CONFIG_APUS 37 37 #include <asm/amigappc.h>
+1 -1
arch/ppc/kernel/head_44x.S
··· 40 40 #include <asm/cputable.h> 41 41 #include <asm/thread_info.h> 42 42 #include <asm/ppc_asm.h> 43 - #include <asm/offsets.h> 43 + #include <asm/asm-offsets.h> 44 44 #include "head_booke.h" 45 45 46 46
+1 -1
arch/ppc/kernel/head_4xx.S
··· 40 40 #include <asm/cputable.h> 41 41 #include <asm/thread_info.h> 42 42 #include <asm/ppc_asm.h> 43 - #include <asm/offsets.h> 43 + #include <asm/asm-offsets.h> 44 44 45 45 /* As with the other PowerPC ports, it is expected that when code 46 46 * execution begins here, the following registers contain valid, yet
+1 -1
arch/ppc/kernel/head_8xx.S
··· 30 30 #include <asm/cputable.h> 31 31 #include <asm/thread_info.h> 32 32 #include <asm/ppc_asm.h> 33 - #include <asm/offsets.h> 33 + #include <asm/asm-offsets.h> 34 34 35 35 /* Macro to make the code more readable. */ 36 36 #ifdef CONFIG_8xx_CPU6
+1 -1
arch/ppc/kernel/head_fsl_booke.S
··· 41 41 #include <asm/cputable.h> 42 42 #include <asm/thread_info.h> 43 43 #include <asm/ppc_asm.h> 44 - #include <asm/offsets.h> 44 + #include <asm/asm-offsets.h> 45 45 #include "head_booke.h" 46 46 47 47 /* As with the other PowerPC ports, it is expected that when code
+1 -1
arch/ppc/kernel/idle_6xx.S
··· 20 20 #include <asm/cputable.h> 21 21 #include <asm/thread_info.h> 22 22 #include <asm/ppc_asm.h> 23 - #include <asm/offsets.h> 23 + #include <asm/asm-offsets.h> 24 24 25 25 #undef DEBUG 26 26
+1 -1
arch/ppc/kernel/idle_power4.S
··· 20 20 #include <asm/cputable.h> 21 21 #include <asm/thread_info.h> 22 22 #include <asm/ppc_asm.h> 23 - #include <asm/offsets.h> 23 + #include <asm/asm-offsets.h> 24 24 25 25 #undef DEBUG 26 26
+1 -1
arch/ppc/kernel/misc.S
··· 23 23 #include <asm/mmu.h> 24 24 #include <asm/ppc_asm.h> 25 25 #include <asm/thread_info.h> 26 - #include <asm/offsets.h> 26 + #include <asm/asm-offsets.h> 27 27 28 28 .text 29 29
+1 -1
arch/ppc/kernel/swsusp.S
··· 5 5 #include <asm/cputable.h> 6 6 #include <asm/thread_info.h> 7 7 #include <asm/ppc_asm.h> 8 - #include <asm/offsets.h> 8 + #include <asm/asm-offsets.h> 9 9 10 10 11 11 /*
+1 -1
arch/ppc/mm/hashtable.S
··· 30 30 #include <asm/cputable.h> 31 31 #include <asm/ppc_asm.h> 32 32 #include <asm/thread_info.h> 33 - #include <asm/offsets.h> 33 + #include <asm/asm-offsets.h> 34 34 35 35 #ifdef CONFIG_SMP 36 36 .comm mmu_hash_lock,4
+1 -1
arch/ppc/platforms/pmac_sleep.S
··· 17 17 #include <asm/cputable.h> 18 18 #include <asm/cache.h> 19 19 #include <asm/thread_info.h> 20 - #include <asm/offsets.h> 20 + #include <asm/asm-offsets.h> 21 21 22 22 #define MAGIC 0x4c617273 /* 'Lars' */ 23 23
-9
arch/ppc64/Makefile
··· 116 116 $(Q)$(MAKE) $(clean)=$(boot) 117 117 $(Q)rm -rf include3 118 118 119 - prepare: include/asm-ppc64/offsets.h 120 - 121 - arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \ 122 - include/config/MARKER 123 - 124 - include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s 125 - $(call filechk,gen-asm-offsets) 126 119 127 120 # Temporary hack until we have migrated to asm-powerpc 128 121 include/asm: include3/asm ··· 129 136 echo ' sourced from arch/$(ARCH)/boot/ramdisk.image.gz' 130 137 echo ' (arch/$(ARCH)/boot/zImage.initrd)' 131 138 endef 132 - 133 - CLEAN_FILES += include/asm-ppc64/offsets.h
+1 -1
arch/ppc64/kernel/cpu_setup_power4.S
··· 15 15 #include <asm/ppc_asm.h> 16 16 #include <asm/cputable.h> 17 17 #include <asm/ppc_asm.h> 18 - #include <asm/offsets.h> 18 + #include <asm/asm-offsets.h> 19 19 #include <asm/cache.h> 20 20 21 21 _GLOBAL(__970_cpu_preinit)
+1 -1
arch/ppc64/kernel/entry.S
··· 28 28 #include <asm/mmu.h> 29 29 #include <asm/thread_info.h> 30 30 #include <asm/ppc_asm.h> 31 - #include <asm/offsets.h> 31 + #include <asm/asm-offsets.h> 32 32 #include <asm/cputable.h> 33 33 34 34 #ifdef CONFIG_PPC_ISERIES
+1 -1
arch/ppc64/kernel/head.S
··· 30 30 #include <asm/mmu.h> 31 31 #include <asm/systemcfg.h> 32 32 #include <asm/ppc_asm.h> 33 - #include <asm/offsets.h> 33 + #include <asm/asm-offsets.h> 34 34 #include <asm/bug.h> 35 35 #include <asm/cputable.h> 36 36 #include <asm/setup.h>
+1 -1
arch/ppc64/kernel/idle_power4.S
··· 20 20 #include <asm/cputable.h> 21 21 #include <asm/thread_info.h> 22 22 #include <asm/ppc_asm.h> 23 - #include <asm/offsets.h> 23 + #include <asm/asm-offsets.h> 24 24 25 25 #undef DEBUG 26 26
+1 -1
arch/ppc64/kernel/misc.S
··· 26 26 #include <asm/page.h> 27 27 #include <asm/cache.h> 28 28 #include <asm/ppc_asm.h> 29 - #include <asm/offsets.h> 29 + #include <asm/asm-offsets.h> 30 30 #include <asm/cputable.h> 31 31 32 32 .text
+1 -1
arch/ppc64/kernel/vdso32/cacheflush.S
··· 13 13 #include <asm/processor.h> 14 14 #include <asm/ppc_asm.h> 15 15 #include <asm/vdso.h> 16 - #include <asm/offsets.h> 16 + #include <asm/asm-offsets.h> 17 17 18 18 .text 19 19
+1 -1
arch/ppc64/kernel/vdso32/datapage.S
··· 12 12 #include <linux/config.h> 13 13 #include <asm/processor.h> 14 14 #include <asm/ppc_asm.h> 15 - #include <asm/offsets.h> 15 + #include <asm/asm-offsets.h> 16 16 #include <asm/unistd.h> 17 17 #include <asm/vdso.h> 18 18
+1 -1
arch/ppc64/kernel/vdso32/gettimeofday.S
··· 13 13 #include <asm/processor.h> 14 14 #include <asm/ppc_asm.h> 15 15 #include <asm/vdso.h> 16 - #include <asm/offsets.h> 16 + #include <asm/asm-offsets.h> 17 17 #include <asm/unistd.h> 18 18 19 19 .text
+1 -1
arch/ppc64/kernel/vdso64/cacheflush.S
··· 13 13 #include <asm/processor.h> 14 14 #include <asm/ppc_asm.h> 15 15 #include <asm/vdso.h> 16 - #include <asm/offsets.h> 16 + #include <asm/asm-offsets.h> 17 17 18 18 .text 19 19
+1 -1
arch/ppc64/kernel/vdso64/datapage.S
··· 12 12 #include <linux/config.h> 13 13 #include <asm/processor.h> 14 14 #include <asm/ppc_asm.h> 15 - #include <asm/offsets.h> 15 + #include <asm/asm-offsets.h> 16 16 #include <asm/unistd.h> 17 17 #include <asm/vdso.h> 18 18
+1 -1
arch/ppc64/kernel/vdso64/gettimeofday.S
··· 14 14 #include <asm/processor.h> 15 15 #include <asm/ppc_asm.h> 16 16 #include <asm/vdso.h> 17 - #include <asm/offsets.h> 17 + #include <asm/asm-offsets.h> 18 18 19 19 .text 20 20 /*
+1 -1
arch/ppc64/mm/hash_low.S
··· 16 16 #include <asm/page.h> 17 17 #include <asm/types.h> 18 18 #include <asm/ppc_asm.h> 19 - #include <asm/offsets.h> 19 + #include <asm/asm-offsets.h> 20 20 #include <asm/cputable.h> 21 21 22 22 .text
+1 -1
arch/ppc64/mm/slb_low.S
··· 21 21 #include <asm/page.h> 22 22 #include <asm/mmu.h> 23 23 #include <asm/ppc_asm.h> 24 - #include <asm/offsets.h> 24 + #include <asm/asm-offsets.h> 25 25 #include <asm/cputable.h> 26 26 27 27 /* void slb_allocate(unsigned long ea);
-10
arch/s390/Makefile
··· 100 100 archclean: 101 101 $(Q)$(MAKE) $(clean)=$(boot) 102 102 103 - prepare: include/asm-$(ARCH)/offsets.h 104 - 105 - arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ 106 - include/config/MARKER 107 - 108 - include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s 109 - $(call filechk,gen-asm-offsets) 110 - 111 - CLEAN_FILES += include/asm-$(ARCH)/offsets.h 112 - 113 103 # Don't use tabs in echo arguments 114 104 define archhelp 115 105 echo '* image - Kernel image for IPL ($(boot)/image)'
+1 -1
arch/s390/kernel/entry.S
··· 18 18 #include <asm/errno.h> 19 19 #include <asm/ptrace.h> 20 20 #include <asm/thread_info.h> 21 - #include <asm/offsets.h> 21 + #include <asm/asm-offsets.h> 22 22 #include <asm/unistd.h> 23 23 #include <asm/page.h> 24 24
+1 -1
arch/s390/kernel/entry64.S
··· 18 18 #include <asm/errno.h> 19 19 #include <asm/ptrace.h> 20 20 #include <asm/thread_info.h> 21 - #include <asm/offsets.h> 21 + #include <asm/asm-offsets.h> 22 22 #include <asm/unistd.h> 23 23 #include <asm/page.h> 24 24
+1 -1
arch/s390/kernel/head.S
··· 30 30 #include <linux/config.h> 31 31 #include <asm/setup.h> 32 32 #include <asm/lowcore.h> 33 - #include <asm/offsets.h> 33 + #include <asm/asm-offsets.h> 34 34 #include <asm/thread_info.h> 35 35 #include <asm/page.h> 36 36
+1 -1
arch/s390/kernel/head64.S
··· 30 30 #include <linux/config.h> 31 31 #include <asm/setup.h> 32 32 #include <asm/lowcore.h> 33 - #include <asm/offsets.h> 33 + #include <asm/asm-offsets.h> 34 34 #include <asm/thread_info.h> 35 35 #include <asm/page.h> 36 36
+1 -1
arch/s390/lib/uaccess.S
··· 11 11 12 12 #include <linux/errno.h> 13 13 #include <asm/lowcore.h> 14 - #include <asm/offsets.h> 14 + #include <asm/asm-offsets.h> 15 15 16 16 .text 17 17 .align 4
+1 -1
arch/s390/lib/uaccess64.S
··· 11 11 12 12 #include <linux/errno.h> 13 13 #include <asm/lowcore.h> 14 - #include <asm/offsets.h> 14 + #include <asm/asm-offsets.h> 15 15 16 16 .text 17 17 .align 4
+2 -8
arch/xtensa/Makefile
··· 66 66 67 67 archinc := include/asm-xtensa 68 68 69 - arch/xtensa/kernel/asm-offsets.s: \ 70 - arch/xtensa/kernel/asm-offsets.c $(archinc)/.platform 71 - 72 - include/asm-xtensa/offsets.h: arch/xtensa/kernel/asm-offsets.s 73 - $(call filechk,gen-asm-offsets) 74 - 75 - prepare: $(archinc)/.platform $(archinc)/offsets.h 69 + prepare: $(archinc)/.platform 76 70 77 71 # Update machine cpu and platform symlinks if something which affects 78 72 # them changed. ··· 88 94 zImage zImage.initrd: vmlinux 89 95 $(Q)$(MAKE) $(build)=$(boot) $@ 90 96 91 - CLEAN_FILES += arch/xtensa/vmlinux.lds $(archinc)/offset.h \ 97 + CLEAN_FILES += arch/xtensa/vmlinux.lds \ 92 98 $(archinc)/platform $(archinc)/xtensa/config \ 93 99 $(archinc)/.platform 94 100
+1 -1
arch/xtensa/kernel/align.S
··· 19 19 #include <asm/ptrace.h> 20 20 #include <asm/ptrace.h> 21 21 #include <asm/current.h> 22 - #include <asm/offsets.h> 22 + #include <asm/asm-offsets.h> 23 23 #include <asm/pgtable.h> 24 24 #include <asm/processor.h> 25 25 #include <asm/page.h>
+1 -1
arch/xtensa/kernel/entry.S
··· 14 14 */ 15 15 16 16 #include <linux/linkage.h> 17 - #include <asm/offsets.h> 17 + #include <asm/asm-offsets.h> 18 18 #include <asm/processor.h> 19 19 #include <asm/thread_info.h> 20 20 #include <asm/uaccess.h>
+1 -1
arch/xtensa/kernel/process.c
··· 43 43 #include <asm/mmu.h> 44 44 #include <asm/irq.h> 45 45 #include <asm/atomic.h> 46 - #include <asm/offsets.h> 46 + #include <asm/asm-offsets.h> 47 47 #include <asm/coprocessor.h> 48 48 49 49 extern void ret_from_fork(void);
+1 -1
arch/xtensa/kernel/vectors.S
··· 46 46 #include <asm/ptrace.h> 47 47 #include <asm/ptrace.h> 48 48 #include <asm/current.h> 49 - #include <asm/offsets.h> 49 + #include <asm/asm-offsets.h> 50 50 #include <asm/pgtable.h> 51 51 #include <asm/processor.h> 52 52 #include <asm/page.h>
+1 -1
include/asm-ia64/ptrace.h
··· 57 57 #include <linux/config.h> 58 58 59 59 #include <asm/fpu.h> 60 - #include <asm/offsets.h> 60 + #include <asm/asm-offsets.h> 61 61 62 62 /* 63 63 * Base-2 logarithm of number of pages to allocate per task structure
+1 -1
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 - #include <asm/offsets.h> 8 + #include <asm/asm-offsets.h> 9 9 #include <asm/processor.h> 10 10 #include <asm/ptrace.h> 11 11
+1 -1
include/asm-parisc/assembly.h
··· 63 63 .level 2.0w 64 64 #endif 65 65 66 - #include <asm/offsets.h> 66 + #include <asm/asm-offsets.h> 67 67 #include <asm/page.h> 68 68 69 69 #include <asm/asmregs.h>
+1 -1
include/asm-xtensa/ptrace.h
··· 127 127 #else /* __ASSEMBLY__ */ 128 128 129 129 #ifdef __KERNEL__ 130 - # include <asm/offsets.h> 130 + # include <asm/asm-offsets.h> 131 131 #define PT_REGS_OFFSET (KERNEL_STACK_SIZE - PT_USER_SIZE) 132 132 #endif 133 133
+1 -1
include/asm-xtensa/uaccess.h
··· 25 25 26 26 #define _ASMLANGUAGE 27 27 #include <asm/current.h> 28 - #include <asm/offsets.h> 28 + #include <asm/asm-offsets.h> 29 29 #include <asm/processor.h> 30 30 31 31 /*