Changeset d5a89a3 in mainline for kernel/arch/sparc64/include/arch/sun4u/cpu.h

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merging with upstream/master

File:

• kernel/arch/sparc64/include/arch/sun4u/cpu.h (modified) (1 diff)

kernel/arch/sparc64/include/arch/sun4u/cpu.h

@@ -76 +76 @@
  *
  */
-NO_TRACE static inline uint32_t read_mid(void)
+_NO_TRACE static inline uint32_t read_mid(void)
 {
         uint64_t icbus_config = asi_u64_read(ASI_ICBUS_CONFIG, 0);