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

Commit 4b34f869 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM/ARM64: Introduce arch_read_hardware_id"

parents a68ab469 eab25833

arch/arm/include/asm/system_misc.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ extern void (*arm_pm_idle)(void); 
#define UDBG_BUS	(1 << 4)



extern unsigned int user_debug;

extern char* (*arch_read_hardware_id)(void);



#endif /* !__ASSEMBLY__ */

arch/arm/kernel/setup.c

+7 −1
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ EXPORT_SYMBOL(boot_reason); 
unsigned int cold_boot;

EXPORT_SYMBOL(cold_boot);



char* (*arch_read_hardware_id)(void);

EXPORT_SYMBOL(arch_read_hardware_id);



#ifdef MULTI_CPU

struct processor processor __read_mostly;

#endif
@@ -1012,7 +1015,10 @@ static int c_show(struct seq_file *m, void *v) 
		seq_printf(m, "CPU revision\t: %d\n\n", cpuid & 15);

	}



	if (!arch_read_hardware_id)

		seq_printf(m, "Hardware\t: %s\n", machine_name);

	else

		seq_printf(m, "Hardware\t: %s\n", arch_read_hardware_id());

	seq_printf(m, "Revision\t: %04x\n", system_rev);

	seq_printf(m, "Serial\t\t: %08x%08x\n",

		   system_serial_high, system_serial_low);

arch/arm64/include/asm/system_misc.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ extern void __show_regs(struct pt_regs *); 


void soft_restart(unsigned long);

extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);

extern char* (*arch_read_hardware_id)(void);



#define UDBG_UNDEFINED	(1 << 0)

#define UDBG_SYSCALL	(1 << 1)

arch/arm64/kernel/setup.c

+7 −1
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ EXPORT_SYMBOL(boot_reason); 
unsigned int cold_boot;

EXPORT_SYMBOL(cold_boot);



char* (*arch_read_hardware_id)(void);

EXPORT_SYMBOL(arch_read_hardware_id);



#ifdef CONFIG_COMPAT

#define COMPAT_ELF_HWCAP_DEFAULT	\

				(COMPAT_HWCAP_HALF|COMPAT_HWCAP_THUMB|\
@@ -437,7 +440,10 @@ static int c_show(struct seq_file *m, void *v) 


	seq_puts(m, "\n");



	if (!arch_read_hardware_id)

		seq_printf(m, "Hardware\t: %s\n", machine_name);

	else

		seq_printf(m, "Hardware\t: %s\n", arch_read_hardware_id());



	return 0;

}