tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
CRIS: don't make asm/elf.h depend on asm/user.h
We're going to export asm/elf.h; remove its dependencies on the
non-exported asm/user.h and the unused asm/system.h include.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
authored by
Rabin Vincent
and committed by
Jesper Nilsson
3a79a075
835e4177
+7
-8
+3
-2
arch/cris/include/arch-v10/arch/elf.h
+3
-2
arch/cris/include/arch-v10/arch/elf.h
···
1
1
#ifndef __ASMCRIS_ARCH_ELF_H
2
2
#define __ASMCRIS_ARCH_ELF_H
3
3
4
-
#include <arch/system.h>
5
-
6
4
#define ELF_MACH EF_CRIS_VARIANT_ANY_V0_V10
5
+
6
+
/* Matches struct user_regs_struct */
7
+
#define ELF_NGREG 35
7
8
8
9
/*
9
10
* This is used to ensure we don't load something for the wrong architecture.
+3
-2
arch/cris/include/arch-v32/arch/elf.h
+3
-2
arch/cris/include/arch-v32/arch/elf.h
···
1
1
#ifndef _ASM_CRIS_ELF_H
2
2
#define _ASM_CRIS_ELF_H
3
3
4
-
#include <arch/system.h>
5
-
6
4
#define ELF_CORE_EFLAGS EF_CRIS_VARIANT_V32
5
+
6
+
/* Matches struct user_regs_struct */
7
+
#define ELF_NGREG 32
7
8
8
9
/*
9
10
* This is used to ensure we don't load something for the wrong architecture.
+1
-4
arch/cris/include/asm/elf.h
+1
-4
arch/cris/include/asm/elf.h
···
5
5
* ELF register definitions..
6
6
*/
7
7
8
-
#include <asm/user.h>
8
+
#include <arch/elf.h>
9
9
10
10
#define R_CRIS_NONE 0
11
11
#define R_CRIS_8 1
···
32
32
33
33
/* Note that NGREG is defined to ELF_NGREG in include/linux/elfcore.h, and is
34
34
thus exposed to user-space. */
35
-
#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t))
36
35
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
37
36
38
37
/* A placeholder; CRIS does not have any fp regs. */
···
43
44
#define ELF_CLASS ELFCLASS32
44
45
#define ELF_DATA ELFDATA2LSB
45
46
#define ELF_ARCH EM_CRIS
46
-
47
-
#include <arch/elf.h>
48
47
49
48
/* The master for these definitions is {binutils}/include/elf/cris.h: */
50
49
/* User symbols in this file have a leading underscore. */