Changeset 721d4e85 in mainline for kernel/arch/sparc64/include/mm/sun4v/frame.h

Timestamp:

2010-02-20T22:23:42Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

61001a9, af56e9b

Parents:

aa30c7f (diff), c2efbb4 (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 from lp:~rimskyp/helenos/sparc.

File:

• kernel/arch/sparc64/include/mm/sun4v/frame.h (modified) (2 diffs)

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

@@ -33 +33 @@
  */
 
-#ifndef KERN_sparc64_SUN4V_FRAME_H_
-#define KERN_sparc64_SUN4V_FRAME_H_
+#ifndef KERN_sparc64_sun4v_FRAME_H_
+#define KERN_sparc64_sun4v_FRAME_H_
 
-/*
- * Page size supported by the MMU.
- * For 8K there is the nasty illegal virtual aliasing problem.
- * Therefore, the kernel uses 8K only internally on the TLB and TSB levels.
- */
 #define MMU_FRAME_WIDTH         13      /* 8K */
 #define MMU_FRAME_SIZE          (1 << MMU_FRAME_WIDTH)
@@ -52 +47 @@
 #include <arch/types.h>
 
-union frame_address {
-        uintptr_t address;
-        struct {
-#if defined (US)
-                unsigned : 23;
-                uint64_t pfn : 28;              /**< Physical Frame Number. */
-#elif defined (US3)
-                unsigned : 21;
-                uint64_t pfn : 30;              /**< Physical Frame Number. */
-#endif
-                unsigned offset : 13;           /**< Offset. */
-        } __attribute__ ((packed));
-};
-
-typedef union frame_address frame_address_t;
-
 extern uintptr_t last_frame;
-//MH
-//extern uintptr_t end_of_identity;
-
 extern void frame_arch_init(void);
 #define physmem_print()