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

Commit a61ea932 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

[ARM] 3261/2: remove phys_ram from struct machine_desc (part 3) 



Patch from Nicolas Pitre

This field is redundent since it must be equal to PHYS_OFFSET anyway.

There is no reference to it anymore so remove it at last.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 71dccd0f

arch/arm/kernel/head.S

+3 −4
Original line number Original line Diff line number Diff line
@@ -28,10 +28,9 @@ 
#define PROCINFO_INITFUNC	12

#define PROCINFO_INITFUNC	12





#define MACHINFO_TYPE		0

#define MACHINFO_TYPE		0

#define MACHINFO_PHYSRAM	4

#define MACHINFO_PHYSIO		4

#define MACHINFO_PHYSIO		8

#define MACHINFO_PGOFFIO	8

#define MACHINFO_PGOFFIO	12

#define MACHINFO_NAME		12

#define MACHINFO_NAME		16





#define KERNEL_RAM_ADDR	(PAGE_OFFSET + TEXT_OFFSET)

#define KERNEL_RAM_ADDR	(PAGE_OFFSET + TEXT_OFFSET)

include/asm-arm/mach/arch.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -10,19 +10,16 @@ 




#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





#include <linux/compiler.h>



struct tag;

struct tag;

struct meminfo;

struct meminfo;

struct sys_timer;

struct sys_timer;





struct machine_desc {

struct machine_desc {

	/*

	/*

	 * Note! The first five elements are used

	 * Note! The first four elements are used

	 * by assembler code in head-armv.S

	 * by assembler code in head-armv.S

	 */

	 */

	unsigned int		nr;		/* architecture number	*/

	unsigned int		nr;		/* architecture number	*/

	unsigned int __deprecated phys_ram;	/* start of physical ram */

	unsigned int		phys_io;	/* start of physical io	*/

	unsigned int		phys_io;	/* start of physical io	*/

	unsigned int		io_pg_offst;	/* byte offset for io 

	unsigned int		io_pg_offst;	/* byte offset for io 

						 * page tabe entry	*/

						 * page tabe entry	*/