Changeset 6843a9c in mainline for kernel/arch/sparc64/include/mm/sun4u/frame.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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:

Merge mainline changes

Trivial conflicts.

File:

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

kernel/arch/sparc64/include/mm/sun4u/frame.h

@@ -72 +72 @@
 typedef union frame_address frame_address_t;
 
-extern uintptr_t last_frame;
 extern uintptr_t end_of_identity;
 
-extern void frame_arch_init(void);
+extern void frame_low_arch_init(void);
+extern void frame_high_arch_init(void);
 #define physmem_print()