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

Commit 2eb9d315 authored by Uwe Zeisberger's avatar Uwe Zeisberger Committed by Russell King
Browse files

[ARM] 3496/1: more constants for asm-offsets.h 



Patch from Uwe Zeisberger

added the following constants:
- MACHINFO_TYPE
- MACHINFO_NAME
- MACHINFO_PHYSIO
- MACHINFO_PGOFFIO
- PROCINFO_INITFUNC
- PROCINFO_MMUFLAGS

and removed their definition from head.S and head-nommu.S

Signed-off-by: default avatarUwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ff10952a

arch/arm/kernel/asm-offsets.c

+6 −0
Original line number Diff line number Diff line
@@ -95,5 +95,11 @@ int main(void) 
  DEFINE(SYS_ERROR0,		0x9f0000);

  BLANK();

  DEFINE(SIZEOF_MACHINE_DESC,	sizeof(struct machine_desc));

  DEFINE(MACHINFO_TYPE,		offsetof(struct machine_desc, nr));

  DEFINE(MACHINFO_NAME,		offsetof(struct machine_desc, name));

  DEFINE(MACHINFO_PHYSIO,	offsetof(struct machine_desc, phys_io));

  DEFINE(MACHINFO_PGOFFIO,	offsetof(struct machine_desc, io_pg_offst));

  DEFINE(PROCINFO_INITFUNC,	offsetof(struct proc_info_list, __cpu_flush));

  DEFINE(PROCINFO_MMUFLAGS,	offsetof(struct proc_info_list, __cpu_mmu_flags));

  return 0; 

}

arch/arm/kernel/head-nommu.S

+1 −3
Original line number Diff line number Diff line
@@ -20,12 +20,10 @@ 
#include <asm/mach-types.h>

#include <asm/procinfo.h>

#include <asm/ptrace.h>

#include <asm/asm-offsets.h>

#include <asm/thread_info.h>

#include <asm/system.h>



#define PROCINFO_INITFUNC       12

#define MACHINFO_TYPE		0



/*

 * Kernel startup entry point.

 * ---------------------------

arch/arm/kernel/head.S

+0 −8
Original line number Diff line number Diff line
@@ -24,14 +24,6 @@ 
#include <asm/thread_info.h>

#include <asm/system.h>



#define PROCINFO_MMUFLAGS	8

#define PROCINFO_INITFUNC	12



#define MACHINFO_TYPE		0

#define MACHINFO_PHYSIO		4

#define MACHINFO_PGOFFIO	8

#define MACHINFO_NAME		12



#define KERNEL_RAM_ADDR	(PAGE_OFFSET + TEXT_OFFSET)



/*