Changeset 69146b93 in mainline for kernel/arch/arm32/include/mm/page_fault.h

Timestamp:

2012-11-26T19:02:45Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

04552324

Parents:

5d230a30 (diff), 7462674 (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:

Merged mainline,1723.

File:

• kernel/arch/arm32/include/mm/page_fault.h (modified) (1 diff)

kernel/arch/arm32/include/mm/page_fault.h

@@ -40 +40 @@
 
 
-/** Decribes CP15 "fault status register" (FSR). */
-typedef struct {
-        unsigned status : 3;
-        unsigned domain : 4;
-        unsigned zero : 1;
-        unsigned should_be_zero : 24;
-} ATTRIBUTE_PACKED fault_status_t;
-
-
-/** Help union used for casting integer value into #fault_status_t. */
+/** Decribes CP15 "fault status register" (FSR).
+ *
+ * See ARM Architecture Reference Manual ch. B4.9.6 (pdf p.743).
+ */
 typedef union {
-        fault_status_t fs;
-        uint32_t dummy;
-} fault_status_union_t;
+        struct {
+                unsigned status : 4;
+                unsigned domain : 4;
+                unsigned zero : 1;
+                unsigned lpae : 1; /**< Needs LPAE support implemented */
+                unsigned fs : 1; /**< armv6+ mandated, earlier IPLM. DEFINED */
+                unsigned wr : 1; /**< armv6+ only */
+                unsigned ext : 1 ; /**< external abort */
+                unsigned cm : 1; /**< Cache maintenance, needs LPAE support */
+                unsigned should_be_zero : 18;
+        } data;
+        struct {
+                unsigned status : 4;
+                unsigned sbz0 : 6;
+                unsigned fs : 1;
+                unsigned should_be_zero : 21;
+        } inst;
+        uint32_t raw;
+} fault_status_t;