Changeset 0b9ac3c in mainline for kernel/arch/sparc64/include/mm/as.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/as.h (modified) (1 diff)

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

@@ -36 +36 @@
 #define KERN_sparc64_AS_H_
 
-#include <arch/mm/tte.h>
-
-#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      1
-
-#define KERNEL_ADDRESS_SPACE_START_ARCH         (unsigned long) 0x0000000000000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH           (unsigned long) 0xffffffffffffffff
-#define USER_ADDRESS_SPACE_START_ARCH           (unsigned long) 0x0000000000000000
-#define USER_ADDRESS_SPACE_END_ARCH             (unsigned long) 0xffffffffffffffff
-
-#define USTACK_ADDRESS_ARCH     (0xffffffffffffffffULL - (PAGE_SIZE - 1))
-
-#ifdef CONFIG_TSB
-
-/** TSB Tag Target register. */
-typedef union tsb_tag_target {
-        uint64_t value;
-        struct {
-                unsigned invalid : 1;   /**< Invalidated by software. */
-                unsigned : 2;
-                unsigned context : 13;  /**< Software ASID. */
-                unsigned : 6;
-                uint64_t va_tag : 42;   /**< Virtual address bits <63:22>. */
-        } __attribute__ ((packed));
-} tsb_tag_target_t;
-
-/** TSB entry. */
-typedef struct tsb_entry {
-        tsb_tag_target_t tag;
-        tte_data_t data;
-} __attribute__ ((packed)) tsb_entry_t;
-
-typedef struct {
-        tsb_entry_t *itsb;
-        tsb_entry_t *dtsb;
-} as_arch_t;
-
-#else
-
-typedef struct {
-} as_arch_t;
-
-#endif /* CONFIG_TSB */
-
-#include <genarch/mm/as_ht.h>
-
-#ifdef CONFIG_TSB
-#include <arch/mm/tsb.h>
-#define as_invalidate_translation_cache(as, page, cnt) \
-        tsb_invalidate((as), (page), (cnt))
-#else
-#define as_invalidate_translation_cache(as, page, cnt)
+#if defined (SUN4U)
+#include <arch/mm/sun4u/as.h>
+#elif defined (SUN4V)
+#include <arch/mm/sun4v/as.h>
 #endif
-
-extern void as_arch_init(void);
 
 #endif