Changeset 0b9ac3c in mainline for kernel/arch/sparc64/include/mm/frame.h

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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.

File:

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

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

@@ -36 +36 @@
 #define KERN_sparc64_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)
-
-/*
- * Page size exported to the generic memory management subsystems.
- * This page size is not directly supported by the MMU, but we can emulate
- * each 16K page with a pair of adjacent 8K pages.
- */
-#define FRAME_WIDTH             14      /* 16K */
-#define FRAME_SIZE              (1 << FRAME_WIDTH)
-
-#ifdef KERNEL
-#ifndef __ASM__
-
-#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;
-extern uintptr_t end_of_identity;
-
-extern void frame_arch_init(void);
-#define physmem_print()
-
-#endif
+#if defined (SUN4U)
+#include <arch/mm/sun4u/frame.h>
+#elif defined (SUN4V)
+#include <arch/mm/sun4v/frame.h>
 #endif