diff options
| author | Paul Kocialkowski | 2015-05-06 16:23:56 +0200 |
|---|---|---|
| committer | Russell King | 2015-05-08 11:42:35 +0200 |
| commit | 3f599875e5202986b350618a617527ab441bf206 (patch) | |
| tree | 1f1fa09654defae4a3c42d6d010bdecf7d7427bc /arch/arm/include/asm | |
| parent | ARM: 8354/1: Documentation: devicetree: root node serial-number property docu... (diff) | |
| download | kernel-qcow2-linux-3f599875e5202986b350618a617527ab441bf206.tar.gz kernel-qcow2-linux-3f599875e5202986b350618a617527ab441bf206.tar.xz kernel-qcow2-linux-3f599875e5202986b350618a617527ab441bf206.zip | |
ARM: 8355/1: arch: Show the serial number from devicetree in cpuinfo
This grabs the serial number shown in cpuinfo from the serial-number device-tree
property in priority. When booting with ATAGs (and without device-tree), the
provided number is still shown instead.
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/system_info.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/system_info.h b/arch/arm/include/asm/system_info.h index 720ea0320a6d..3860cbd401ec 100644 --- a/arch/arm/include/asm/system_info.h +++ b/arch/arm/include/asm/system_info.h @@ -17,6 +17,7 @@ /* information about the system we're running on */ extern unsigned int system_rev; +extern const char *system_serial; extern unsigned int system_serial_low; extern unsigned int system_serial_high; extern unsigned int mem_fclk_21285; |